Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #18374 from owncloud/router-apps | Morris Jobke | 2015-08-19 | 2 | -0/+16 |
|\ | | | | | Only load app routes if the app has already been loaded [re-merge] | ||||
| * | Only load app routes if the app has already been loaded | Robin McCorkell | 2015-08-18 | 2 | -0/+16 |
| | | |||||
* | | Merge pull request #14314 from owncloud/clean-up-ocs-code | Bernhard Posselt | 2015-08-18 | 3 | -64/+6 |
|\ \ | |/ |/| | Cleanup OCS code | ||||
| * | Cleanup OCS code | Lukas Reschke | 2015-08-14 | 3 | -64/+6 |
| | | | | | | | | This removes unused code from `OC_OCS` which nobody understood what it really was for anyways. | ||||
* | | Merge pull request #17182 from owncloud/user_ini_upload_size | Robin McCorkell | 2015-08-17 | 1 | -34/+57 |
|\ \ | | | | | | | Update .user.ini when setting upload size limit | ||||
| * | | Unit test OC_Files::setUploadLimit() | Robin McCorkell | 2015-07-20 | 1 | -14/+11 |
| | | | | | | | | | | | | | | | | | | | | | There was also a bug with checking the upper limit on the passed upload size. PHP does funny things with integer vs float comparisons, so our check didn't work. Now the check is much simpler, and ensures the value is sane. | ||||
| * | | Update .user.ini when setting upload size limit | Robin McCorkell | 2015-07-20 | 1 | -22/+48 |
| | | | |||||
* | | | Degrade log message about missing app in appstore to debug | Morris Jobke | 2015-08-17 | 1 | -1/+1 |
| | | | | | | | | | | | | * fixes #18154 | ||||
* | | | Adding EventDispatcher to IServerContainer | Thomas Müller | 2015-08-14 | 2 | -2/+24 |
| |/ |/| | |||||
* | | With V2 we should ensure that the status codes are kept in sync | Thomas Müller | 2015-08-13 | 3 | -7/+9 |
| | | |||||
* | | Merge pull request #17982 from owncloud/appframework-sanitize-name | Thomas Müller | 2015-08-12 | 1 | -0/+10 |
|\ \ | | | | | | | Sanitize class names before registerService/query | ||||
| * | | Sanitize class names before registerService/query | Robin McCorkell | 2015-07-30 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | Leading backslashes are removed, so a `registerService('\\OC\\Foo')` can still be resolved with `query('OC\\Foo')`. | ||||
* | | | Merge pull request #18127 from owncloud/dav-request-tests | Thomas Müller | 2015-08-12 | 4 | -5/+112 |
|\ \ \ | | | | | | | | | add test framework for doing full request webdav tests | ||||
| * | | | handle single file dav endpoints | Robin Appelman | 2015-08-11 | 1 | -2/+6 |
| | | | | |||||
| * | | | only add tags plugin when loggedin | Robin Appelman | 2015-08-11 | 1 | -2/+2 |
| | | | | |||||
| * | | | split out creating the sabre dav server to it's own factory | Robin Appelman | 2015-08-11 | 2 | -3/+106 |
| | | | | |||||
| * | | | add test framework for doing full request webdav tests | Robin Appelman | 2015-08-11 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #18202 from owncloud/revert-route-breaking-changes | Robin McCorkell | 2015-08-11 | 3 | -37/+1 |
|\ \ \ \ | | | | | | | | | | | Revert route breaking changes | ||||
| * | | | | Revert "make knowledge base url configurable" | Joas Schilling | 2015-08-11 | 2 | -21/+1 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 8fb89056bd2f99b1df7dc7a3970fc293272c8ab6. | ||||
| * | | | | Revert "Only load app routes if the app has already been loaded" | Joas Schilling | 2015-08-11 | 2 | -16/+0 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 50ebea41f60f2864a565ea9985c5462c2df5f09e. | ||||
* | | | | | Merge pull request #17852 from owncloud/register-alias-factory | Robin McCorkell | 2015-08-11 | 3 | -1/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add test for factories | ||||
| * | | | | add test for factories | Bernhard Posselt | 2015-07-25 | 3 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use ref for factory test use a factory for registerAlias Ensure we construct SimpleContainer Use single instance of DIContainer in routing tests | ||||
* | | | | | Merge pull request #17868 from owncloud/x-forwarded-for | Thomas Müller | 2015-08-11 | 1 | -1/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Set default 'forwarded for' headers for reverse proxy | ||||
| * | | | | | Set default `forwarded_for_headers` to 'HTTP_X_FORWARDED_FOR' | Robin McCorkell | 2015-08-10 | 1 | -1/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #17932 from owncloud/fix_move_files | Thomas Müller | 2015-08-11 | 1 | -2/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | make sure that hooks are emitted properly on file move operation | ||||
| * | | | | | | make sure that we emit the hooks if a file gets moved from a subfolder to ↵ | Bjoern Schiessle | 2015-07-29 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | the root folder with the nodes API | ||||
* | | | | | | | Merge pull request #16528 from owncloud/activity-302-improve-settings | Joas Schilling | 2015-08-11 | 2 | -2/+15 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Activity 302 improve settings | ||||
| * | | | | | | | Allow types to be method specific | Joas Schilling | 2015-07-22 | 2 | -2/+15 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #17830 from ↵ | Joas Schilling | 2015-08-11 | 1 | -92/+104 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-17825-dont-silently-ignore-invalid-consumers-extensions Throw a InvalidArgumentException when a consumer/extension is invalid | ||||
| * | | | | | | | | Throw a InvalidArgumentException when a consumer/extension is invalid | Joas Schilling | 2015-07-23 | 1 | -92/+104 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #18096 from sualko/patch-1 | Morris Jobke | 2015-08-10 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | add data: to allowed image domains | ||||
| * | | | | | | | | add data: to allowed image domains | sualko | 2015-08-05 | 1 | -0/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #18109 from owncloud/fix-router-app-loaded | Thomas Müller | 2015-08-10 | 2 | -0/+16 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Only load app routes if the app has already been loaded | ||||
| * | | | | | | | | | Only load app routes if the app has already been loaded | Robin McCorkell | 2015-08-06 | 2 | -0/+16 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #18175 from owncloud/automatic-db-prefix-query-builder | Thomas Müller | 2015-08-10 | 5 | -17/+52 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Automatic db prefix query builder | ||||
| * | | | | | | | | | | Remove unnecessary DB prefixes from existing query builder usages | Joas Schilling | 2015-08-10 | 3 | -9/+9 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Automatically prefix table names with *PREFIX* unless specified | Joas Schilling | 2015-08-10 | 2 | -8/+43 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #15093 from rullzer/capabilities_manager | Roeland Douma | 2015-08-10 | 8 | -6/+208 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | Capabilities manager | ||||
| * | | | | | | | | | | Use DI | Roeland Jago Douma | 2015-08-10 | 6 | -58/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Register OCP\Capability\IManager at DIContainer * Add register capabilities to appframework * Register capabilities in DI way * Make unit test pass again * Remove CapabiltiesManager from OCP | ||||
| * | | | | | | | | | | Move core capabilities to new class | Roeland Jago Douma | 2015-08-10 | 3 | -11/+65 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Added Capabilities Manager | Roeland Jago Douma | 2015-08-10 | 6 | -2/+183 |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This should allow the capabilities to be intergrated into the appframework * Unit tests * Throw exception if closure does not return ICapability instance | ||||
* | | | | | | | | | | Update installer.php | michag86 | 2015-08-10 | 1 | -0/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Check if archive contains a directory named like appid | michag86 | 2015-08-10 | 1 | -0/+3 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #14779 from owncloud/use-iterator-directory | Robin McCorkell | 2015-08-07 | 3 | -7/+4 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use the new IteratorDirectory instead of the fakedir wrapper | ||||
| * | | | | | | | | | Use the new IteratorDirectory instead of the fakedir wrapper | Robin Appelman | 2015-07-15 | 3 | -7/+4 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #18124 from owncloud/share-permwrongvar | Morris Jobke | 2015-08-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix removal of share permissions when share disabled for user | ||||
| * | | | | | | | | | | Fix removal of share permissions when share disabled for user | Vincent Petry | 2015-08-07 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #18120 from owncloud/appframework-isessio | Lukas Reschke | 2015-08-07 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add \OCP\ISession to AppFramework | ||||
| * | | | | | | | | | | | Add \OCP\ISession to AppFramework | Robin McCorkell | 2015-08-07 | 1 | -0/+4 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #13641 from owncloud/cache-storage-status | Vincent Petry | 2015-08-07 | 7 | -11/+571 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Store storage availability in database |