summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4472 from nextcloud/downstream-27714Roeland Jago Douma2017-04-241-0/+1
|\ | | | | Allow apps to register plugins for the user management
| * Allow apps to register plugins for the user managementJoas Schilling2017-04-241-0/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4477 from danxuliu/acceptance-macos-nitpickingRoeland Jago Douma2017-04-241-27/+32
|\ \ | | | | | | Fix minor code style issues in acceptance test runner
| * | Fix minor code style issues (also known as nitpicking)Daniel Calviño Sánchez2017-04-221-27/+32
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #4473 from nextcloud/downstream-27488Roeland Jago Douma2017-04-241-0/+24
|\ \ \ | | | | | | | | Add unit tests for mounts of delete users
| * | | Add unit tests for mounts of delete usersJoas Schilling2017-04-241-0/+24
| | |/ | |/| | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #4321 from nextcloud/improve-sharing-tooltipMorris Jobke2017-04-241-43/+38
|\ \ \ | | | | | | | | change sharing tooltip with a more general description of all available share options
| * | | simplify share placeholderBjoern Schiessle2017-04-181-20/+7
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | change sharing tooltip with a more general description of all available ↵Bjoern Schiessle2017-04-121-23/+31
| | | | | | | | | | | | | | | | | | | | | | | | share options Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #4465 from nextcloud/fix-test-mailMorris Jobke2017-04-241-4/+0
|\ \ \ \ | |_|/ / |/| | | Don't send the test mail twice
| * | | Don't send the test mail twiceJoas Schilling2017-04-241-4/+0
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #4457 from nextcloud/fix-storage-info-with-wrong-casingMorris Jobke2017-04-242-84/+92
|\ \ \ \ | | | | | | | | | | Fix storage info with wrong casing
| * | | | Remove dead argumentsJoas Schilling2017-04-242-45/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix similar issues with the group idJoas Schilling2017-04-242-4/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix the storage info and other checks when the user has wrong casingJoas Schilling2017-04-242-35/+83
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #4468 from nextcloud/fix_link_passwordChristoph Wurst2017-04-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix link password toggle
| * | | | | Fix link password toggleRoeland Jago Douma2017-04-241-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge pull request #4463 from ↵Roeland Jago Douma2017-04-242-4/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | danxuliu/fix-working-icon-placement-on-password-save Fix working icon placement on password save
| * | | | | Fix working icon placement on password saveDaniel Calviño Sánchez2017-04-242-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | Merge pull request #4458 from nextcloud/fix/sinon-stub-deprecation-warningsRoeland Jago Douma2017-04-245-7/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix sinon.stub deprecation warnings
| * | | | | Fix sinon.stub deprecation warningsChristoph Wurst2017-04-245-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | Merge pull request #1023 from GitHubUser4234/ldap_password_renew_prblizzz2017-04-2436-175/+974
|\ \ \ \ \ \ | | | | | | | | | | | | | | Handle password expiry in user_ldap
| * | | | | | unit test adjustmentRoger Szabo2017-04-073-23/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | | | lower case for attributesRoger Szabo2017-04-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | | | blizzz comments 03.04.2017 with cachingRoger Szabo2017-04-061-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | | | blizzz comments 03.04.2017Roger Szabo2017-04-065-22/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | | | usertest adjustmentRoger Szabo2017-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | | | usertest adjustmentRoger Szabo2017-03-311-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | | | remove redundant tabsRoger Szabo2017-03-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | | | restore ldap_password_renew_prRoger Szabo2017-03-3134-163/+941
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
* | | | | | | Merge pull request #4443 from nextcloud/cleanup-unused-importsJoas Schilling2017-04-2496-164/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Remove unused use statements
| * | | | | | Remove unused use statementsMorris Jobke2017-04-2296-164/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #4434 from ↵Lukas Reschke2017-04-241-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/add-rate-limiting-to-solve-challenge-controller Add rate limit to TOTP solve challenge controller
| * | | | | | | Add rate limit to TOTP solve challenge controllerLukas Reschke2017-04-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/2626 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | | Merge pull request #4401 from nextcloud/caldav-carddav-nc-owner-displaynameRoeland Jago Douma2017-04-246-12/+77
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | add owner-displayname property to calendars and addressbooks
| * | | | | | | add owner-displayname property to calendars and addressbooksGeorg Ehrke2017-04-236-12/+77
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | | Merge pull request #4444 from nextcloud/remove-unused-variablesRoeland Jago Douma2017-04-242-2/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unused variables
| * | | | | | | Remove unused variablesMorris Jobke2017-04-222-2/+0
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-04-2436-4/+108
| |/ / / / / |/| | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-04-2362-236/+730
| | | | | |
* | | | | | Merge pull request #4435 from ↵Lukas Reschke2017-04-222-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/allow-at-maximum-10-reset-mails-requests-per-5-minutes Add at most 10 password reset requests per 5 minutes and IP range
| * | | | | | Add at most 10 password reset requests per 5 minutes and IP rangeLukas Reschke2017-04-222-1/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #4432 from nextcloud/fix-grammarLukas Reschke2017-04-221-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix grammar
| * | | | | Fix grammarMorris Jobke2017-04-211-4/+4
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-2290-142/+418
| | | | |
* | | | | Merge pull request #4431 from nextcloud/acceptance-macosMorris Jobke2017-04-211-4/+30
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | Run acceptance tests on macOS
| * | | Run acceptance tests on macOSMorris Jobke2017-04-211-4/+30
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4208 from danxuliu/add-basic-acceptance-test-systemRoeland Jago Douma2017-04-2124-0/+2135
|\ \ \ | | | | | | | | Add basic acceptance test system
| * | | Make test passwords valid for the password_policy appDaniel Calviño Sánchez2017-04-213-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As requested by Morris Jobke, the passwords in the acceptance tests were modified to make them valid both for a clean Nextcloud server and one with the password_policy app enabled. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Move acceptance tests from build/acceptance to tests/acceptanceDaniel Calviño Sánchez2017-04-2124-6/+7
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>