wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
38463 commits 157 branches 562 tags 714 MiB
Commit graph

1954 commits

Author SHA1 Message Date
Christoph Wurst
2317d7bb49
Fix sinon.stub deprecation warnings 
Calls to `sinon.stub(obj, 'meth', fn)` are deprecated and therefore
replaced by `sinon.stub(obj, 'meth).callsFake(fn)` as instructed by
the deprecation warning.

This makes the js unit testing output readable again.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-24 10:39:37 +02:00
Lukas Reschke
d0d34d308a
Add at most 10 password reset requests per 5 minutes and IP range 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-22 08:12:54 +02:00
Morris Jobke
9536cbf739 Merge pull request #4409 from nextcloud/socialharing_mail 
Allow social sharing to specify if a new window is opened
 2017-04-20 17:59:55 -05:00
Bjoern Schiessle
f0651cb066
allow to set a password for shares which where created without a password before the admin started to enforce the password 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:26 +02:00
Bjoern Schiessle
d8dcd72118
allow admin to enforce password on mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:26 +02:00
Roeland Jago Douma
48fd0ee9f0
Allow social sharing to specify if a new window is opened 
For example mail shares should not open a new window because it looks
weird.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-20 16:32:46 +02:00
Joas Schilling
1c0bffe87f
Fix translations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-18 16:40:53 -05:00
Morris Jobke
ec034757fa Merge pull request #4337 from nextcloud/fix-adblock-share-icon 
Fix AdBlock blocking share icon, ref #866
 2017-04-13 12:10:37 -05:00
Roeland Jago Douma
3eb6f88019
Move to handlebars.min.js 
core.js is now below 1mb!

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-12 22:22:38 +02:00
Roeland Jago Douma
abe887cd48
Moved to jquery-ui.custom.min.js 
Shaves off about 200kb of the default loaded js libs

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-12 20:03:00 +02:00
Jan-Christoph Borchardt
37145a275f Fix AdBlock blocking share icon, ref #866 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-12 15:04:12 +02:00
Morris Jobke
c2686be8da Merge pull request #4285 from nextcloud/bump-md5 
[js] Bump blueimp-md5
 2017-04-11 12:07:02 -05:00
Roeland Jago Douma
58f959864a
Show 'shared via' in share list for reshares 
Fixes #1330

userA shares a file to userB
userB shares that file to userC

userA can see both userB and userC.
Now they can also see that userB shared it to user C

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-11 13:56:03 +02:00
Roeland Jago Douma
7d1745d1e7
[js] Bump blueimp-md5 
* bumped to latest
* moved to min

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-10 20:37:07 +02:00
Morris Jobke
ca9d25169d Merge pull request #4136 from nextcloud/expire-date-for-all-shares 
Unified sharing options
 2017-04-07 17:14:05 -05:00
Roeland Jago Douma
bf30090be5
Parse date trough moment 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-07 22:16:29 +02:00
Bjoern Schiessle
0dc13d098f
reset password field properties before we hide it 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:44:00 +02:00
Bjoern Schiessle
c7b1a48da7
add datepicker to the popover 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:44:00 +02:00
Bjoern Schiessle
3bce6a7a6f
allow to edit single files shared by mail. This is useful for collaborative editing documents 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:44:00 +02:00
Bjoern Schiessle
3323d01db1
update unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:43:59 +02:00
Roeland Jago Douma
efb21a948e Merge pull request #4093 from nextcloud/endorse-password-protection 
Endorse password protection
 2017-04-04 11:04:21 +02:00
Roeland Jago Douma
7d72ae3011
Move to autosize.min.js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-03 13:42:33 +02:00
Timo Benk
868500eda4
let the user set an empty password for share link 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:58:19 +02:00
Timo Benk
0d7801b6ce
endorseLinkPassword changed to enableLinkPasswordByDefault 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:58:11 +02:00
Timo Benk
cbfe5f3c1f
feature endorse password for share links 
works like "enforce password protection", but let the
user optionally remove the password protection after the
password is set.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:58:03 +02:00
Bjoern Schiessle
5540def5e3
change permission order 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:29:33 +02:00
Bjoern Schiessle
99ebdc1111
make sure that variables are defined correctly 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:29:33 +02:00
Bjoern Schiessle
cfbabf8f2f
fix typo and capitalize cruds 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:29:32 +02:00
Bjoern Schiessle
b84fd7c361
set expire date for all share types 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:29:32 +02:00
Bjoern Schiessle
3cc0d15f92
add secure drop functionallity to mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:29:32 +02:00
Bjoern Schiessle
c191173d59
allow password protected mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:29:32 +02:00
Bjoern Schiessle
0d5147bd49
add new password column to the share table in order to set passwords for share by mails 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:20:49 +02:00
Bjoern Schiessle
d0eefd17d3
allow the user to set a expire date for all shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:20:47 +02:00
Roeland Jago Douma
2950bcbc70
Do not show social menu when there is no link share 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-31 17:29:41 +02:00
Joas Schilling
0fb7c631ce Merge pull request #4128 from nextcloud/updateclipboard 
Update clipboard.js
 2017-03-30 14:37:03 +02:00
Roeland Jago Douma
0da04fd284
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-29 22:54:08 +02:00
Roeland Jago Douma
54c68519ce
Allow avatars for full numeric users 
Fixes #4087

Because of fancy javascript if a full numeric uid was used javascript
would convert this to an int. Now we just convert everything to a string
first.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-29 13:39:48 +02:00
Roeland Jago Douma
b052addaca
Use minified clipboard.js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-29 00:27:50 +02:00
Robin Appelman
dc5ba95469 Merge pull request #4027 from nextcloud/better-spreed-call-urls 
Better spreed call urls
 2017-03-27 16:21:24 +02:00
Roeland Jago Douma
f4c9e44403 Merge pull request #4073 from nextcloud/secure-drop 
Rename File drop to Secure drop
 2017-03-27 14:39:32 +02:00
Roeland Jago Douma
16b02a0fa9 Merge pull request #4064 from nextcloud/update-moment 
Update momentjs
 2017-03-27 14:10:54 +02:00
Olivier Paroz
5a6c7877f6
Rename File drop to Secure drop 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-26 16:13:35 -06:00
Lukas Reschke
3c1d76c282
Cleanup code as suggested by @icewind1991 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-26 19:45:36 +02:00
Lukas Reschke
fea2108710
Make async 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-26 15:26:10 +02:00
Lukas Reschke
980ef89dbf
Fix callback 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-26 14:17:01 +02:00
Lukas Reschke
12a019d328
Use eval instead of $.script 
Fixes https://github.com/nextcloud/server/issues/4067

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-26 14:12:44 +02:00
Roeland Jago Douma
62827dd1da
use moments.js min in core.js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-26 10:25:15 +02:00
Morris Jobke
2f7669179e Merge pull request #4043 from nextcloud/merge-js-for-template-prepend 
Merge JS for template prepend
 2017-03-24 15:42:08 -06:00
Lukas Reschke
6a4fde11e6
Merge login JS 
Removes 2 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-24 21:18:24 +01:00
Lukas Reschke
4f73911bab Merge pull request #4041 from nextcloud/merge-systemtags-js 
Merge systemtags JS
 2017-03-24 21:12:42 +01:00