aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1188 from nextcloud/2fa-redirect-default-appLukas Reschke2016-08-311-15/+11
|\ | | | | redirect to default app after solving the 2FA challenge
| * check same URL in unit testsChristoph Wurst2016-08-301-11/+12
| |
| * redirect to default app after solving the 2FA challengeChristoph Wurst2016-08-301-6/+1
| |
* | Merge pull request #797 from nextcloud/only-match-for-auth-cookieJoas Schilling2016-08-311-1/+77
|\ \ | | | | | | Match only for actual session cookie
| * | Match only for actual session cookieLukas Reschke2016-08-091-1/+77
| | | | | | | | | | | | OVH has implemented load balancing in a very questionable way where the reverse proxy actually internally adds some cookies which would trigger a security exception. To work around this, this change only checks for the session cookie.
* | | Merge pull request #608 from nextcloud/small-encryption-improvementJoas Schilling2016-08-311-3/+14
|\ \ \ | | | | | | | | skip shared files, if files get decrypted only for a specific user we…
| * | | skip shared files, if files get decrypted only for a specific user we ↵Bjoern Schiessle2016-07-271-3/+14
| | | | | | | | | | | | | | | | shouldn't touch files owned by a different user.
* | | | Merge pull request #1087 from nextcloud/get-delay-twiceLukas Reschke2016-08-301-6/+6
|\ \ \ \ | |_|_|/ |/| | | dont get bruteforce delay twice
| * | | dont get bruteforce delay twiceRobin Appelman2016-08-291-6/+6
| | | |
* | | | Merge pull request #1172 from nextcloud/core_cleanupMorris Jobke2016-08-302-10/+12
|\ \ \ \ | | | | | | | | | | Core controller cleanup
| * | | | AvatarController use proper JSONResponseRoeland Jago Douma2016-08-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | * Do not rely on DataResponse magic. We want JSON so use JSON * Fix tests
| * | | | Minor cleanup in core ControllersRoeland Jago Douma2016-08-291-7/+9
| | | | |
* | | | | Merge pull request #891 from nextcloud/us_25810Morris Jobke2016-08-301-43/+168
|\ \ \ \ \ | | | | | | | | | | | | [OC] Fix unmerged shares repair targetdecision
| * | | | | Improve regexp to detect duplicate folders when repairing unmerged sharesVincent Petry2016-08-171-34/+68
| | | | | |
| * | | | | Fix unmerged shares repair with mixed group and direct sharesVincent Petry2016-08-171-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a group share is created after a direct share, the stime order needs to be properly considered in the repair routine, considering that the direct user share is appended to the $subShares array and breaking its order.
| * | | | | Improve file_target finding logic when repairing unmerged sharesVincent Petry2016-08-171-9/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pick the most recent subshare that has no parenthesis from duplication which should match whichever name the user picked last. If all subshares have duplicate parenthesis names, use the least recent group share's target instead.
* | | | | | redirect to 2fa provider if there's only one active for the userChristoph Wurst2016-08-291-1/+75
| |/ / / / |/| | | |
* | | | | always return numeric storage id as int, also check type equality in test ↵Jörn Friedrich Dreyer2016-08-291-29/+15
| |/ / / |/| | | | | | | | | | | asserts
* | | | Merge pull request #1054 from nextcloud/less-cache-hitsLukas Reschke2016-08-271-0/+1
|\ \ \ \ | | | | | | | | | | Reduce the number of cache operations for dav operations
| * | | | cache user foldersRobin Appelman2016-08-251-0/+1
| | | | |
* | | | | Merge pull request #1058 from nextcloud/avatarController_cleanupLukas Reschke2016-08-271-62/+83
|\ \ \ \ \ | | | | | | | | | | | | Avatar controller cleanup
| * | | | | AvatarController cleanupRoeland Jago Douma2016-08-251-62/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use all DI components * Let the AppFramework resolve the AvatarController * Update unit tests * Unit tests no longer require DB
* | | | | | Merge pull request #1031 from nextcloud/2fa-infinite-redirect-loopJoas Schilling2016-08-262-4/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | prevent infinite redirect loops if the there is no 2fa provider to pass
| * | | | | | prevent infinite redirect loops if the there is no 2fa provider to passChristoph Wurst2016-08-242-4/+43
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes infinite loops that are caused whenever a user is about to solve a 2FA challenge, but the provider app is disabled at the same time. Since the session value usually indicates that the challenge needs to be solved before we grant access we have to remove that value instead in this special case.
* | | | | | Merge pull request #1069 from nextcloud/l10ntest_nodbJoas Schilling2016-08-252-8/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | L10N tests do not require DB
| * | | | | | L10N tests do not require DBRoeland Jago Douma2016-08-252-8/+16
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | * Makes CI a bit more efficient * Cleanup getMock warning
* / | | | | CappedMemoryCacheTest does not require DBRoeland Jago Douma2016-08-251-2/+0
|/ / / / / | | | | | | | | | | | | | | | Makes CI a bit more efficient
* | | | | Merge pull request #1024 from ↵Lukas Reschke2016-08-242-18/+38
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | nextcloud/remove-password-reset-link-after-successful-login Remove "password reset token" after successful login
| * | | | Move the reset token to core appJoas Schilling2016-08-232-21/+21
| | | | |
| * | | | Remove "password reset token" after successful loginJoas Schilling2016-08-231-0/+20
| | | | |
* | | | | Merge pull request #1007 from nextcloud/shared-storage-non-recursiveLukas Reschke2016-08-231-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix shared storage recursive setup
| * | | | | prevent infinite recursion while getting storage from mountRobin Appelman2016-08-231-4/+4
| | | | | |
* | | | | | Merge pull request #995 from nextcloud/workflow-sectionLukas Reschke2016-08-231-3/+16
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Workflow section + hidden empty sections
| * | | | | adjust testArthur Schiwon2016-08-221-11/+6
| | | | | |
| * | | | | enlist only registered sections that also have settings registered toArthur Schiwon2016-08-221-3/+21
| |/ / / /
* / / / / add testArthur Schiwon2016-08-221-0/+16
|/ / / /
* | | | Remove reading PATH_INFO from server variableLukas Reschke2016-08-191-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | Having two code paths for this is unreliable and can lead to bugs. Also, in some cases Apache isn't setting the PATH_INFO variable when mod_rewrite is used. Fixes https://github.com/nextcloud/server/issues/983
* | | | Fix loading of ThemingDefaultsJulius Haertl2016-08-191-0/+1
| | | |
* | | | Merge pull request #867 from nextcloud/notification-primary-action-always-firstRoeland Jago Douma2016-08-171-0/+29
|\ \ \ \ | |/ / / |/| | | Make sure the primary action is always the first one
| * | | Make sure the primary action is always the first oneJoas Schilling2016-08-151-0/+29
| | | |
* | | | Merge pull request #868 from nextcloud/changepasswordcontrollerRoeland Jago Douma2016-08-171-0/+161
|\ \ \ \ | | | | | | | | | | Make ChangePassword a real Controller
| * | | | Add tests for ChangePasswordControllerRoeland Jago Douma2016-08-171-0/+161
| | | | |
* | | | | Merge pull request #846 from nextcloud/provisioning_api_ocsJoas Schilling2016-08-171-6/+70
|\ \ \ \ \ | |/ / / / |/| | | | Move Provisioning API to the AppFramework
| * | | | Add testsRoeland Jago Douma2016-08-141-6/+70
| |/ / /
* | | | Merge pull request #893 from nextcloud/ie8_be_goneMarius Blüm2016-08-171-6/+6
|\ \ \ \ | | | | | | | | | | IE8 be gone!
| * | | | Remove IE8 support in CertificateControllerRoeland Jago Douma2016-08-161-6/+6
| | | | | | | | | | | | | | | | | | | | * Also fix getMock warnings in tests
* | | | | adjust tests to latest changesArthur Schiwon2016-08-162-20/+118
| | | | |
* | | | | Merge branch 'master' into implement_712Arthur Schiwon2016-08-161-26/+45
|\| | | |
| * | | | Merge pull request #886 from nextcloud/capabilities_error_proofBjörn Schießle2016-08-161-26/+45
| |\ \ \ \ | | | | | | | | | | | | Make the capabilities manager more error proof
| | * | | | Make the capabilities manager more error proofRoeland Jago Douma2016-08-151-26/+45
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an app registers an invalid capabilty we should not crash hard. Instead we should catch the exception. Log it (error) and carry on. * Added tests