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

38513 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
dd5dbe3ebd
Fix JS unit failure because of Jasmine 2.6 and the phantomjs launcher 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-25 10:26:46 -03:00
Roeland Jago Douma
82c9eb1c56 Merge pull request #4462 from danxuliu/fix-sharing-password-protected-link 
Fix sharing a password protected link
 2017-04-25 14:12:44 +02:00
blizzz
026070a2fc Merge pull request #4484 from nextcloud/fix/logincontroller-redirect-url-failed-login 
Fix remember redirect_url on failed login attempts
 2017-04-25 13:15:53 +02:00
Christoph Wurst
bb1d191f82
Fix remember redirect_url on failed login attempts 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 09:38:19 +02:00
Nextcloud bot
133f3fdc9a
[tx-robot] updated from transifex 2017-04-25 00:07:30 +00:00
Daniel Calviño Sánchez
58cc1251be Use "complete" callback in onPasswordEntered 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 22:18:52 +02:00
Daniel Calviño Sánchez
e0b0115f99 Extract common ajax call for addShare and updateShare 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 22:07:08 +02:00
Daniel Calviño Sánchez
3ab2958930 Document options parameter in saveLinkShare 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 22:05:34 +02:00
Daniel Calviño Sánchez
6e9f49f397 Add "complete" callback support for addShare 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 21:31:53 +02:00
Daniel Calviño Sánchez
488020cf2e Add "complete" callback support for updateShare 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 21:24:30 +02:00
Daniel Calviño Sánchez
726c6c73f4 Add missing unit test cases and conditions 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 21:24:05 +02:00
Roeland Jago Douma
d01832ff64 Merge pull request #4472 from nextcloud/downstream-27714 
Allow apps to register plugins for the user management
 2017-04-24 19:44:57 +02:00
Roeland Jago Douma
41f492ada7 Merge pull request #4477 from danxuliu/acceptance-macos-nitpicking 
Fix minor code style issues in acceptance test runner
 2017-04-24 19:30:03 +02:00
Roeland Jago Douma
3551d38027 Merge pull request #4473 from nextcloud/downstream-27488 
Add unit tests for mounts of delete users
 2017-04-24 19:29:23 +02:00
Joas Schilling
6300be160a
Add unit tests for mounts of delete users 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-24 16:43:25 +02:00
Morris Jobke
fd7257332d Merge pull request #4321 from nextcloud/improve-sharing-tooltip 
change sharing tooltip with a more general description of all available share options
 2017-04-24 11:12:41 -03:00
Joas Schilling
77b202ce80
Allow apps to register plugins for the user management 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-24 16:07:02 +02:00
Morris Jobke
f3fdc35dc2 Merge pull request #4465 from nextcloud/fix-test-mail 
Don't send the test mail twice
 2017-04-24 10:49:29 -03:00
Morris Jobke
b156117cbd Merge pull request #4457 from nextcloud/fix-storage-info-with-wrong-casing 
Fix storage info with wrong casing
 2017-04-24 10:41:16 -03:00
Christoph Wurst
363c289d25 Merge pull request #4468 from nextcloud/fix_link_password 
Fix link password toggle
 2017-04-24 15:26:52 +02:00
Roeland Jago Douma
7a81d46fcb
Fix link password toggle 
We took the wrong field from the share api response. So the password was
never shown as set.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-24 14:41:41 +02:00
Roeland Jago Douma
c5617f4e8a Merge pull request #4463 from danxuliu/fix-working-icon-placement-on-password-save 
Fix working icon placement on password save
 2017-04-24 14:34:56 +02:00
Roeland Jago Douma
97c27395aa Merge pull request #4458 from nextcloud/fix/sinon-stub-deprecation-warnings 
Fix sinon.stub deprecation warnings
 2017-04-24 13:47:46 +02:00
Daniel Calviño Sánchez
faea890b87 Extract updateSharePasswordIfNeeded function 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 13:38:36 +02:00
Daniel Calviño Sánchez
51e658da2a Join if block to preceding if chain 
If getShareType() returns "email" it can not also return "user", "group"
nor "link", so the if block can be added to the preceding if chain.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 13:17:46 +02:00
Joas Schilling
e938663329
Don't send the test mail twice 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-24 12:50:29 +02:00
blizzz
42e805f057 Merge pull request #1023 from GitHubUser4234/ldap_password_renew_pr 
Handle password expiry in user_ldap
 2017-04-24 12:17:04 +02:00
Daniel Calviño Sánchez
36f55b5867 Fix working icon placement on password save 
Before, the icon appeared below the text input for the password. Now, it
appears inside the text input, to the right end.

The CSS was adjusted based on other icons shown in that position for
other text inputs in the Share tab view, like the information icon or
the clipboard icon.

Fixes #4135

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 11:50:06 +02:00
Joas Schilling
3d671cc536 Merge pull request #4443 from nextcloud/cleanup-unused-imports 
Remove unused use statements
 2017-04-24 11:47:37 +02:00
Daniel Calviño Sánchez
a56fb75e69 Add missing unit test for updateShare with email share 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 11:33:07 +02:00
Daniel Calviño Sánchez
de6b05a911 Add missing hook check 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 11:33:07 +02:00
Daniel Calviño Sánchez
dcc8cce28b Fix double hashing of shared link passwords 
The plain text password for a shared links was hashed and, then, the
hashed password was hashed again and set as the final password. Due to
this the password introduced in the "Authenticate" page for the shared
link was always a wrong password, and thus the file could not be
accessed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 11:33:07 +02:00
Daniel Calviño Sánchez
153d053ee7 Fix working icon not hidden when successfully setting a password 
When a request to set the password of a shared link is sent a working
icon is shown. However, as there was no "success" callback, the icon was
never hidden again after successfully setting the password (it worked
fine if there was an error, though).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 11:33:07 +02:00
Daniel Calviño Sánchez
316710bcb1 Add acceptance tests for sharing password protected links 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 11:33:07 +02:00
Daniel Calviño Sánchez
13c84f6629 Add system to share data between acceptance test steps 
The data storage (the "notebook") is shared between all the actors, so
the data can be stored and retrieved between different steps by any
actor in the same scenario.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 11:33:07 +02:00
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
Joas Schilling
7a87fedac3
Remove dead arguments 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-24 10:18:14 +02:00
Joas Schilling
e19126425b
Fix similar issues with the group id 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-24 10:15:03 +02:00
Joas Schilling
992c48c89b
Fix the storage info and other checks when the user has wrong casing 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-24 10:10:50 +02:00
Lukas Reschke
8a1d3c7e87 Merge pull request #4434 from nextcloud/add-rate-limiting-to-solve-challenge-controller 
Add rate limit to TOTP solve challenge controller
 2017-04-24 10:03:19 +02:00
Roeland Jago Douma
d842b29c5b Merge pull request #4401 from nextcloud/caldav-carddav-nc-owner-displayname 
add owner-displayname property to calendars and addressbooks
 2017-04-24 09:17:55 +02:00
Roeland Jago Douma
1c2cdc9d3a Merge pull request #4444 from nextcloud/remove-unused-variables 
Remove unused variables
 2017-04-24 08:09:01 +02:00
Nextcloud bot
a01f946c56
[tx-robot] updated from transifex 2017-04-24 00:07:28 +00:00
Georg Ehrke
c89e057d27
add owner-displayname property to calendars and addressbooks 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-23 11:26:49 +02:00
Morris Jobke
c54a59d51e
Remove unused use statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-22 19:23:31 -05:00
Nextcloud bot
11c7953888
[tx-robot] updated from transifex 2017-04-23 00:07:31 +00:00
Morris Jobke
2b6f6dac00
Remove unused variables 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-22 18:20:51 -05:00
Daniel Calviño Sánchez
b0b32eff1f Fix minor code style issues (also known as nitpicking) 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-22 17:50:37 +02:00
Lukas Reschke
1bd3bd33f9 Merge pull request #4435 from nextcloud/allow-at-maximum-10-reset-mails-requests-per-5-minutes 
Add at most 10 password reset requests per 5 minutes and IP range
 2017-04-22 11:17:54 +02:00
Lukas Reschke
7acdc2a096 Merge pull request #4432 from nextcloud/fix-grammar 
Fix grammar
 2017-04-22 08:15:46 +02:00