Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | | | Merge branch 'master' into implement_712 | Lukas Reschke | 2016-08-15 | 6 | -102/+163 |
|\| | | |||||
| * | | We have to mock the is_uploaded_file in the OC\Core\Controller namespace | Roeland Jago Douma | 2016-08-15 | 1 | -8/+10 |
| | | | |||||
| * | | Fix mock call in AvatarControllerTest | Roeland Jago Douma | 2016-08-15 | 1 | -12/+12 |
| | | | |||||
| * | | Use generated URL | Lukas Reschke | 2016-08-15 | 1 | -1/+1 |
| | | | |||||
| * | | Fix CheckSetupController tests | Lukas Reschke | 2016-08-15 | 1 | -60/+26 |
| | | | |||||
| * | | Fix template test | Lukas Reschke | 2016-08-15 | 1 | -1/+1 |
| | | | |||||
| * | | Fix tests for LoginController | Lukas Reschke | 2016-08-15 | 1 | -5/+4 |
| | | | |||||
| * | | Add reference to current user | Lukas Reschke | 2016-08-15 | 1 | -0/+1 |
| | | | |||||
| * | | Add new dependency | Lukas Reschke | 2016-08-15 | 1 | -1/+7 |
| | | | |||||
| * | | Don't use create mock | Lukas Reschke | 2016-08-15 | 1 | -14/+14 |
| | | | | | | | | | | | | Not compatible with this PHPunit version | ||||
| * | | Use proper casing | Lukas Reschke | 2016-08-15 | 2 | -6/+4 |
| |/ | |||||
| * | Use createMock instead of deprecated getMock | Lukas Reschke | 2016-08-11 | 1 | -12/+12 |
| | | |||||
| * | Redirect users when already logged-in on login form | Lukas Reschke | 2016-08-11 | 1 | -0/+95 |
| | | |||||
* | | Use MockBuilder instead of createMock | Lukas Reschke | 2016-08-15 | 9 | -33/+33 |
| | | | | | | | | CI uses an older PHPUnit | ||||
* | | Add unit tests | Lukas Reschke | 2016-08-15 | 11 | -3/+1082 |
|/ | |||||
* | OCSController requires DataResponse | Roeland Jago Douma | 2016-08-10 | 1 | -52/+5 |
| | | | | | | The OCS Controller requires a DataResponse object to be returned. This means that all error handling will have to be done via exceptions thrown and handling in the middleware. | ||||
* | Merge pull request #529 from nextcloud/vendor-maintenance-downgrade | Lukas Reschke | 2016-08-10 | 1 | -1/+12 |
|\ | | | | | Allow downgrades of maintenance accross vendors | ||||
| * | Allow downgrades of maintenance accross vendors | Joas Schilling | 2016-07-22 | 1 | -1/+12 |
| | |