summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-273-18/+117
|\
| * Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadpermsVincent Petry2016-06-272-18/+87
| |\
| | * Repair step to adjust link share delete permissionsVincent Petry2016-06-241-0/+87
| | * Add explicit delete permission to link sharesVincent Petry2016-06-241-18/+0
| * | check login name when authenticating with client tokenChristoph Wurst2016-06-241-0/+30
| |/
* | verify user password on changeBjoern Schiessle2016-06-271-1/+46
* | remove old hook, no longer neededBjoern Schiessle2016-06-271-19/+16
* | check password for link sharesBjoern Schiessle2016-06-271-6/+14
* | Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-264-107/+338
|\|
| * Merge pull request #25172 from owncloud/token-login-validationVincent Petry2016-06-223-107/+97
| |\
| | * fix unit test warning/errorsChristoph Wurst2016-06-201-15/+16
| | * fix DefaultTokenMapperTestChristoph Wurst2016-06-201-0/+4
| | * fix default token provider testsChristoph Wurst2016-06-201-26/+0
| | * fix user session testsChristoph Wurst2016-06-201-73/+73
| | * use token last_activity instead of session valueChristoph Wurst2016-06-171-1/+12
| * | occ web executor (#24957)VicDeo2016-06-221-0/+143
| * | update session token password on user password changeChristoph Wurst2016-06-212-0/+98
* | | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-216-7/+313
|\| |
| * | add PasswordLoginForbiddenExceptionChristoph Wurst2016-06-172-2/+33
| |/
| * assert app is loaded in unit testsChristoph Wurst2016-06-161-0/+7
| * load 2FA provider apps before querying classesChristoph Wurst2016-06-161-1/+4
| * Merge pull request #24415 from owncloud/optimize_sharingdisabled_for_userVincent Petry2016-06-161-0/+7
| |\
| | * Fix unit testsRoeland Jago Douma2016-06-141-0/+7
| * | Merge pull request #25075 from owncloud/fix_23265Vincent Petry2016-06-161-0/+194
| |\ \
| | * | Remove shares of the root folderRoeland Jago Douma2016-06-131-0/+194
| * | | Merge pull request #25093 from owncloud/issue-12816-clean-tags-from-deleted-u...Vincent Petry2016-06-151-3/+25
| |\ \ \
| | * | | Clean up tags of deleted usersJoas Schilling2016-06-141-3/+25
| | | |/ | | |/|
| * / | create session token only for clients that support cookiesChristoph Wurst2016-06-131-3/+45
| |/ /
* | | fix unit testsMorris Jobke2016-06-201-3/+3
* | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160614Arthur Schiwon2016-06-141-3/+24
|\| |
| * | fail hard if 2fa provider can not be loaded (#25061)Christoph Wurst2016-06-131-3/+24
| |/
* | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611Arthur Schiwon2016-06-114-8/+514
|\|
| * Merge pull request #24863 from owncloud/propagator-batchingVincent Petry2016-06-101-0/+125
| |\
| | * add tests for propagator batchingRobin Appelman2016-06-021-0/+125
| * | Add not-null columns for oracleJoas Schilling2016-06-101-0/+9
| * | Repair job to fix permissions for avatarsRoeland Jago Douma2016-06-101-0/+180
| * | Merge pull request #25025 from owncloud/clear_old_calendar_sharesVincent Petry2016-06-101-0/+160
| |\ \
| | * | Add repair step to clean old calendar/contact sharesRoeland Jago Douma2016-06-091-0/+160
| * | | Do not leak the login name - fixes #25047Thomas Müller2016-06-091-8/+40
| |/ /
* | | Merge pull request #19 from nextcloud/files-dropLukas Reschke2016-06-101-1/+0
|\ \ \
| * | | add hide file list optionBjoern Schiessle2016-06-091-1/+0
* | | | Downstream 2016-06-09Arthur Schiwon2016-06-099-56/+317
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #24973 from owncloud/token-password-session-tokenVincent Petry2016-06-091-24/+135
| |\ \ \
| | * | | When creating a session token, make sure it's the login password and not a de...Christoph Wurst2016-06-081-24/+135
| * | | | Merge pull request #24826 from owncloud/cors-client-loginVincent Petry2016-06-091-5/+6
| |\ \ \ \
| | * | | | use client login method on CORS routesChristoph Wurst2016-06-081-5/+6
| | |/ / /
| * / / / Do not log token or challenge with exception stacktrace (#25026)Joas Schilling2016-06-081-3/+3
| |/ / /
| * | | Merge pull request #25011 from owncloud/issue-24745-allow-to-cancel-2faVincent Petry2016-06-081-4/+17
| |\ \ \
| | * | | Allow to cancel 2FA after loginJoas Schilling2016-06-071-4/+17
| * | | | Merge pull request #24899 from owncloud/local-storage-symlinksVincent Petry2016-06-081-0/+31
| |\ \ \ \