aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ | | | | | | Token login validation
| | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial web executor * Fix PHPDoc Fix broken integration test OccControllerTests do not require database access - moch them all! Kill unused sprintf
| * | 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
| |\ | | | | | | Optimize isSharingDisabledForUser
| | * 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 folder
| | * | Remove shares of the root folderRoeland Jago Douma2016-06-131-0/+194
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #23265 (A possibly costly) repair job to remove cyclic shares.
| * | | Merge pull request #25093 from ↵Vincent Petry2016-06-151-3/+25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/issue-12816-clean-tags-from-deleted-users Clean up tags of deleted users
| | * | | 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
| |\ | | | | | | Propagator batching for the file scanner
| | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22978 On some older installations the permissions for the userRoot and the avatars are not correct. This breaks since we now use the Node API in the avatar code. This repair job makes sure that the permissions are set correctly. * Unit tests added
| * | Merge pull request #25025 from owncloud/clear_old_calendar_sharesVincent Petry2016-06-101-0/+160
| |\ \ | | | | | | | | Add repair step to clean old calendar shares
| | * | Add repair step to clean old calendar/contact sharesRoeland Jago Douma2016-06-091-0/+160
| | | | | | | | | | | | | | | | fixes #21889
| * | | 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" option
| * | | add hide file list optionBjoern Schiessle2016-06-091-1/+0
| | | |
* | | | Downstream 2016-06-09Arthur Schiwon2016-06-099-56/+317
|\ \ \ \ | | |/ / | |/| | | | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
| * | | 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 …
| | * | | When creating a session token, make sure it's the login password and not a ↵Christoph Wurst2016-06-081-24/+135
| | | | | | | | | | | | | | | | | | | | device token
| * | | | Merge pull request #24826 from owncloud/cors-client-loginVincent Petry2016-06-091-5/+6
| |\ \ \ \ | | | | | | | | | | | | use client login method on CORS routes
| | * | | | 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
| |/ / / | | | | | | | | | | | | | | | | | | | | * Make the filtering better readable * Add some more methods to the sensitive list
| * | | Merge pull request #25011 from owncloud/issue-24745-allow-to-cancel-2faVincent Petry2016-06-081-4/+17
| |\ \ \ | | | | | | | | | | Allow to cancel 2FA after login
| | * | | 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
| |\ \ \ \ | | | | | | | | | | | | dissalow symlinks in local storages that point outside the datadir
| | * | | | dissalow symlinks in local storages that point outside the datadirRobin Appelman2016-06-071-0/+31
| | |/ / /
| * | | | Merge pull request #24983 from ↵Vincent Petry2016-06-081-0/+19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-23776-do-not-allow-boolean-user-config Do not allow to store boolean configs, they behave unexpected on postgres
| | * | | | Do not allow to store boolean configs, they behave unexpected on postgresJoas Schilling2016-06-061-0/+19
| | | | | |
| * | | | | Merge pull request #24991 from owncloud/2fa-do-not-generate-tokenVincent Petry2016-06-081-7/+33
| |\ \ \ \ \ | | | | | | | | | | | | | | do not generate device token if 2FA is enable for user
| | * | | | | do not generate device token if 2FA is enable for userChristoph Wurst2016-06-071-7/+33
| | |/ / / /
| * | | | | Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-onlyVincent Petry2016-06-081-12/+23
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Allow to decrypt user '0' files only
| | * | | | Allow to decrypt user '0' files onlyJoas Schilling2016-06-071-12/+23
| | |/ / /
| * / / / allow deleting "ghost files" trough the View and Node apiRobin Appelman2016-06-031-1/+50
| |/ / /