summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-04-2582-1500/+594
* Merge pull request #4472 from nextcloud/downstream-27714Roeland Jago Douma2017-04-241-0/+1
|\
| * Allow apps to register plugins for the user managementJoas Schilling2017-04-241-0/+1
* | Merge pull request #4477 from danxuliu/acceptance-macos-nitpickingRoeland Jago Douma2017-04-241-27/+32
|\ \
| * | Fix minor code style issues (also known as nitpicking)Daniel Calviño Sánchez2017-04-221-27/+32
* | | Merge pull request #4473 from nextcloud/downstream-27488Roeland Jago Douma2017-04-241-0/+24
|\ \ \
| * | | Add unit tests for mounts of delete usersJoas Schilling2017-04-241-0/+24
| | |/ | |/|
* | | Merge pull request #4321 from nextcloud/improve-sharing-tooltipMorris Jobke2017-04-241-43/+38
|\ \ \
| * | | simplify share placeholderBjoern Schiessle2017-04-181-20/+7
| * | | change sharing tooltip with a more general description of all available share...Bjoern Schiessle2017-04-121-23/+31
* | | | Merge pull request #4465 from nextcloud/fix-test-mailMorris Jobke2017-04-241-4/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Don't send the test mail twiceJoas Schilling2017-04-241-4/+0
* | | | Merge pull request #4457 from nextcloud/fix-storage-info-with-wrong-casingMorris Jobke2017-04-242-84/+92
|\ \ \ \
| * | | | Remove dead argumentsJoas Schilling2017-04-242-45/+1
| * | | | Fix similar issues with the group idJoas Schilling2017-04-242-4/+8
| * | | | Fix the storage info and other checks when the user has wrong casingJoas Schilling2017-04-242-35/+83
* | | | | Merge pull request #4468 from nextcloud/fix_link_passwordChristoph Wurst2017-04-241-1/+1
|\ \ \ \ \
| * | | | | Fix link password toggleRoeland Jago Douma2017-04-241-1/+1
|/ / / / /
* | | | | Merge pull request #4463 from danxuliu/fix-working-icon-placement-on-password...Roeland Jago Douma2017-04-242-4/+5
|\ \ \ \ \
| * | | | | Fix working icon placement on password saveDaniel Calviño Sánchez2017-04-242-4/+5
* | | | | | Merge pull request #4458 from nextcloud/fix/sinon-stub-deprecation-warningsRoeland Jago Douma2017-04-245-7/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix sinon.stub deprecation warningsChristoph Wurst2017-04-245-7/+9
* | | | | | Merge pull request #1023 from GitHubUser4234/ldap_password_renew_prblizzz2017-04-2436-175/+974
|\ \ \ \ \ \
| * | | | | | unit test adjustmentRoger Szabo2017-04-073-23/+35
| * | | | | | lower case for attributesRoger Szabo2017-04-061-7/+7
| * | | | | | blizzz comments 03.04.2017 with cachingRoger Szabo2017-04-061-2/+7
| * | | | | | blizzz comments 03.04.2017Roger Szabo2017-04-065-22/+26
| * | | | | | usertest adjustmentRoger Szabo2017-03-311-1/+1
| * | | | | | usertest adjustmentRoger Szabo2017-03-311-11/+11
| * | | | | | remove redundant tabsRoger Szabo2017-03-311-4/+4
| * | | | | | restore ldap_password_renew_prRoger Szabo2017-03-3134-163/+941
* | | | | | | Merge pull request #4443 from nextcloud/cleanup-unused-importsJoas Schilling2017-04-2496-164/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Remove unused use statementsMorris Jobke2017-04-2296-164/+1
* | | | | | | Merge pull request #4434 from nextcloud/add-rate-limiting-to-solve-challenge-...Lukas Reschke2017-04-241-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Add rate limit to TOTP solve challenge controllerLukas Reschke2017-04-221-0/+2
* | | | | | | | Merge pull request #4401 from nextcloud/caldav-carddav-nc-owner-displaynameRoeland Jago Douma2017-04-246-12/+77
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | add owner-displayname property to calendars and addressbooksGeorg Ehrke2017-04-236-12/+77
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #4444 from nextcloud/remove-unused-variablesRoeland Jago Douma2017-04-242-2/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove unused variablesMorris Jobke2017-04-222-2/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | [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 nextcloud/allow-at-maximum-10-reset-mails-reque...Lukas Reschke2017-04-222-1/+4
|\ \ \ \ \ \
| * | | | | | Add at most 10 password reset requests per 5 minutes and IP rangeLukas Reschke2017-04-222-1/+4
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4432 from nextcloud/fix-grammarLukas Reschke2017-04-221-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix grammarMorris Jobke2017-04-211-4/+4
| |/ / / /
* | | | | [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 macOSMorris Jobke2017-04-211-4/+30
|/ / /
* | | Merge pull request #4208 from danxuliu/add-basic-acceptance-test-systemRoeland Jago Douma2017-04-2124-0/+2135
|\ \ \
| * | | Make test passwords valid for the password_policy appDaniel Calviño Sánchez2017-04-213-7/+7