summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Deprecate getEditionString()Joas Schilling2016-09-063-16/+4
|
* Merge pull request #1275 from nextcloud/OCS_forward_headers_cleanupMorris Jobke2016-09-062-28/+85
|\ | | | | Internal OCS Controller cleanup
| * Split OCS version handlingRoeland Jago Douma2016-09-062-28/+85
| | | | | | | | | | | | This cleans up a bit the OCSController/Middleware. Since the 2 versions of OCS differ a bit. Moved a lot of stuff internal since it is of no concern to the outside.
* | Fix getMock shareRoeland Jago Douma2016-09-062-206/+219
| |
* | Fix getMock AvatarRoeland Jago Douma2016-09-061-13/+17
| |
* | Fix getMock AuthenticationRoeland Jago Douma2016-09-063-16/+22
| |
* | Fix getMock TwoFactorMiddlewareTestRoeland Jago Douma2016-09-061-8/+14
|/
* Add FileDisplayResponseRoeland Jago Douma2016-09-051-0/+109
| | | | | A lazy implementation of the DisplayResponse that only hits the filesystem if the etag and mtime do not match.
* Merge pull request #1158 from nextcloud/cache_avatarsLukas Reschke2016-09-052-14/+35
|\ | | | | Cache avatars
| * Fix testsRoeland Jago Douma2016-08-302-14/+35
| |
* | Merge pull request #1259 from nextcloud/language_orderJoas Schilling2016-09-051-13/+97
|\ \ | | | | | | ACCEPT_LANGUAGE goes before default_langauge
| * | ACCEPT_LANGUAGE goes before default_langaugeRoeland Jago Douma2016-09-041-13/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/nextcloud/server/issues/970 Before we had 1. Users settings in personal settings 2. Admins default language settings 3. Accept-Language settings of the browser However this is not in line with https://www.w3.org/International/questions/qa-lang-priorities So this changes the order to 1. Users settings in personal settings 3. Accept-Language settings of the browser 2. Admins default language settings
* | | Fix AppTest and intergration testRoeland Jago Douma2016-09-051-2/+7
| | |
* | | increase core version number to trigger db ugprade and fix app manager testsChristoph Wurst2016-09-051-2/+14
| | |
* | | add 2fa backup codes appChristoph Wurst2016-09-052-12/+91
|/ / | | | | | | | | * add backup codes app unit tests * add integration tests for the backup codes app
* | Merge pull request #1221 from nextcloud/proper_204_304_responseMorris Jobke2016-09-011-1/+28
|\ \ | | | | | | No body or content-length for 204 and 304 responses
| * | No body or content-length for 204 and 304 responsesRoeland Jago Douma2016-08-311-1/+28
| | | | | | | | | | | | See: https://tools.ietf.org/html/rfc7230#section-3.3
* | | Merge pull request #1227 from nextcloud/improve-testsJoas Schilling2016-09-011-15/+0
|\ \ \ | | | | | | | | Improve tests
| * | | Remove unneeded Windows logicMorris Jobke2016-09-011-15/+0
| |/ /
* / / Fix depreccated getMock in Core/Command testsRoeland Jago Douma2016-09-0122-90/+167
|/ /
* | 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
| | | | |