Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1188 from nextcloud/2fa-redirect-default-app | Lukas Reschke | 2016-08-31 | 1 | -15/+11 |
|\ | | | | | redirect to default app after solving the 2FA challenge | ||||
| * | check same URL in unit tests | Christoph Wurst | 2016-08-30 | 1 | -11/+12 |
| | | |||||
| * | redirect to default app after solving the 2FA challenge | Christoph Wurst | 2016-08-30 | 1 | -6/+1 |
| | | |||||
* | | Merge pull request #797 from nextcloud/only-match-for-auth-cookie | Joas Schilling | 2016-08-31 | 1 | -1/+77 |
|\ \ | | | | | | | Match only for actual session cookie | ||||
| * | | Match only for actual session cookie | Lukas Reschke | 2016-08-09 | 1 | -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-improvement | Joas Schilling | 2016-08-31 | 1 | -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 Schiessle | 2016-07-27 | 1 | -3/+14 |
| | | | | | | | | | | | | | | | | shouldn't touch files owned by a different user. | ||||
* | | | | Merge pull request #1087 from nextcloud/get-delay-twice | Lukas Reschke | 2016-08-30 | 1 | -6/+6 |
|\ \ \ \ | |_|_|/ |/| | | | dont get bruteforce delay twice | ||||
| * | | | dont get bruteforce delay twice | Robin Appelman | 2016-08-29 | 1 | -6/+6 |
| | | | | |||||
* | | | | Merge pull request #1172 from nextcloud/core_cleanup | Morris Jobke | 2016-08-30 | 2 | -10/+12 |
|\ \ \ \ | | | | | | | | | | | Core controller cleanup | ||||
| * | | | | AvatarController use proper JSONResponse | Roeland Jago Douma | 2016-08-29 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Do not rely on DataResponse magic. We want JSON so use JSON * Fix tests | ||||
| * | | | | Minor cleanup in core Controllers | Roeland Jago Douma | 2016-08-29 | 1 | -7/+9 |
| | | | | | |||||
* | | | | | Merge pull request #891 from nextcloud/us_25810 | Morris Jobke | 2016-08-30 | 1 | -43/+168 |
|\ \ \ \ \ | | | | | | | | | | | | | [OC] Fix unmerged shares repair targetdecision | ||||
| * | | | | | Improve regexp to detect duplicate folders when repairing unmerged shares | Vincent Petry | 2016-08-17 | 1 | -34/+68 |
| | | | | | | |||||
| * | | | | | Fix unmerged shares repair with mixed group and direct shares | Vincent Petry | 2016-08-17 | 1 | -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 shares | Vincent Petry | 2016-08-17 | 1 | -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 user | Christoph Wurst | 2016-08-29 | 1 | -1/+75 |
| |/ / / / |/| | | | | |||||
* | | | | | always return numeric storage id as int, also check type equality in test ↵ | Jörn Friedrich Dreyer | 2016-08-29 | 1 | -29/+15 |
| |/ / / |/| | | | | | | | | | | | asserts | ||||
* | | | | Merge pull request #1054 from nextcloud/less-cache-hits | Lukas Reschke | 2016-08-27 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Reduce the number of cache operations for dav operations | ||||
| * | | | | cache user folders | Robin Appelman | 2016-08-25 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1058 from nextcloud/avatarController_cleanup | Lukas Reschke | 2016-08-27 | 1 | -62/+83 |
|\ \ \ \ \ | | | | | | | | | | | | | Avatar controller cleanup | ||||
| * | | | | | AvatarController cleanup | Roeland Jago Douma | 2016-08-25 | 1 | -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-loop | Joas Schilling | 2016-08-26 | 2 | -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 pass | Christoph Wurst | 2016-08-24 | 2 | -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_nodb | Joas Schilling | 2016-08-25 | 2 | -8/+16 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | L10N tests do not require DB | ||||
| * | | | | | | L10N tests do not require DB | Roeland Jago Douma | 2016-08-25 | 2 | -8/+16 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | * Makes CI a bit more efficient * Cleanup getMock warning | ||||
* / | | | | | CappedMemoryCacheTest does not require DB | Roeland Jago Douma | 2016-08-25 | 1 | -2/+0 |
|/ / / / / | | | | | | | | | | | | | | | | Makes CI a bit more efficient | ||||
* | | | | | Merge pull request #1024 from ↵ | Lukas Reschke | 2016-08-24 | 2 | -18/+38 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | nextcloud/remove-password-reset-link-after-successful-login Remove "password reset token" after successful login | ||||
| * | | | | Move the reset token to core app | Joas Schilling | 2016-08-23 | 2 | -21/+21 |
| | | | | | |||||
| * | | | | Remove "password reset token" after successful login | Joas Schilling | 2016-08-23 | 1 | -0/+20 |
| | | | | | |||||
* | | | | | Merge pull request #1007 from nextcloud/shared-storage-non-recursive | Lukas Reschke | 2016-08-23 | 1 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix shared storage recursive setup | ||||
| * | | | | | prevent infinite recursion while getting storage from mount | Robin Appelman | 2016-08-23 | 1 | -4/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #995 from nextcloud/workflow-section | Lukas Reschke | 2016-08-23 | 1 | -3/+16 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Workflow section + hidden empty sections | ||||
| * | | | | | adjust test | Arthur Schiwon | 2016-08-22 | 1 | -11/+6 |
| | | | | | | |||||
| * | | | | | enlist only registered sections that also have settings registered to | Arthur Schiwon | 2016-08-22 | 1 | -3/+21 |
| |/ / / / | |||||
* / / / / | add test | Arthur Schiwon | 2016-08-22 | 1 | -0/+16 |
|/ / / / | |||||
* | | | | Remove reading PATH_INFO from server variable | Lukas Reschke | 2016-08-19 | 1 | -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 ThemingDefaults | Julius Haertl | 2016-08-19 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #867 from nextcloud/notification-primary-action-always-first | Roeland Jago Douma | 2016-08-17 | 1 | -0/+29 |
|\ \ \ \ | |/ / / |/| | | | Make sure the primary action is always the first one | ||||
| * | | | Make sure the primary action is always the first one | Joas Schilling | 2016-08-15 | 1 | -0/+29 |
| | | | | |||||
* | | | | Merge pull request #868 from nextcloud/changepasswordcontroller | Roeland Jago Douma | 2016-08-17 | 1 | -0/+161 |
|\ \ \ \ | | | | | | | | | | | Make ChangePassword a real Controller | ||||
| * | | | | Add tests for ChangePasswordController | Roeland Jago Douma | 2016-08-17 | 1 | -0/+161 |
| | | | | | |||||
* | | | | | Merge pull request #846 from nextcloud/provisioning_api_ocs | Joas Schilling | 2016-08-17 | 1 | -6/+70 |
|\ \ \ \ \ | |/ / / / |/| | | | | Move Provisioning API to the AppFramework | ||||
| * | | | | Add tests | Roeland Jago Douma | 2016-08-14 | 1 | -6/+70 |
| |/ / / | |||||
* | | | | Merge pull request #893 from nextcloud/ie8_be_gone | Marius Blüm | 2016-08-17 | 1 | -6/+6 |
|\ \ \ \ | | | | | | | | | | | IE8 be gone! | ||||
| * | | | | Remove IE8 support in CertificateController | Roeland Jago Douma | 2016-08-16 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | * Also fix getMock warnings in tests | ||||
* | | | | | adjust tests to latest changes | Arthur Schiwon | 2016-08-16 | 2 | -20/+118 |
| | | | | | |||||
* | | | | | Merge branch 'master' into implement_712 | Arthur Schiwon | 2016-08-16 | 1 | -26/+45 |
|\| | | | | |||||
| * | | | | Merge pull request #886 from nextcloud/capabilities_error_proof | Björn Schießle | 2016-08-16 | 1 | -26/+45 |
| |\ \ \ \ | | | | | | | | | | | | | Make the capabilities manager more error proof | ||||
| | * | | | | Make the capabilities manager more error proof | Roeland Jago Douma | 2016-08-15 | 1 | -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 |