Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #17932 from owncloud/fix_move_files | Thomas Müller | 2015-08-11 | 1 | -2/+7 |
|\ | |||||
| * | make sure that we emit the hooks if a file gets moved from a subfolder to the... | Bjoern Schiessle | 2015-07-29 | 1 | -2/+7 |
* | | Merge pull request #16528 from owncloud/activity-302-improve-settings | Joas Schilling | 2015-08-11 | 2 | -2/+15 |
|\ \ | |||||
| * | | Allow types to be method specific | Joas Schilling | 2015-07-22 | 2 | -2/+15 |
* | | | Merge pull request #17830 from owncloud/issue-17825-dont-silently-ignore-inva... | Joas Schilling | 2015-08-11 | 1 | -92/+104 |
|\ \ \ | |||||
| * | | | 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 | 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 | 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 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use DI | Roeland Jago Douma | 2015-08-10 | 6 | -58/+25 |
| * | | | | | | | 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 |
| |/ / / / / / | |||||
* | | | | | | | 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 | 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 | 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 | 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 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix mounting wrapped storages resulting in many-layered wrapping | Robin McCorkell | 2015-07-20 | 1 | -1/+6 |
| * | | | | | | | | | Store storage availability in database | Robin McCorkell | 2015-07-20 | 6 | -10/+565 |
* | | | | | | | | | | Adding header support to class OC_OCS_Result | Thomas Müller | 2015-08-07 | 2 | -1/+48 |
| |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #18091 from owncloud/add-backbonejs | blizzz | 2015-08-07 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | load backbone universally | Arthur Schiwon | 2015-08-06 | 3 | -6/+2 |
| * | | | | | | | | make available as OC.Backbone to avoid conflicts | Arthur Schiwon | 2015-08-06 | 1 | -0/+5 |
| * | | | | | | | | files and sharing will require backbonejs | Arthur Schiwon | 2015-08-06 | 1 | -0/+1 |
* | | | | | | | | | Merge pull request #18030 from owncloud/dav-upload-updater | Vincent Petry | 2015-08-06 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | go trough the updater when uploading over webdav | Robin Appelman | 2015-08-03 | 1 | -2/+1 |
* | | | | | | | | | Following the spec: | Thomas Müller | 2015-08-05 | 1 | -5/+1 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #18035 from owncloud/ocs-2.0 | Bernhard Posselt | 2015-08-05 | 5 | -196/+135 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Return 200 not null - we should return consistent types | Thomas Müller | 2015-08-05 | 1 | -1/+2 |
| * | | | | | | | | Fix unit test within OCSController | Thomas Müller | 2015-08-03 | 1 | -2/+1 |
| * | | | | | | | | Remove duplicate and unused code | Thomas Müller | 2015-08-03 | 4 | -172/+40 |
| * | | | | | | | | Fix authors | Thomas Müller | 2015-08-03 | 1 | -7/+1 |
| * | | | | | | | | Reduce duplicate code | Thomas Müller | 2015-08-03 | 2 | -15/+44 |
| * | | | | | | | | Adding ocs/v2.php with status code mapper | Thomas Müller | 2015-08-03 | 1 | -8/+56 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #17961 from owncloud/make_knowledgebase_configurable | Thomas Müller | 2015-08-05 | 2 | -1/+21 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | make knowledge base url configurable | Bjoern Schiessle | 2015-07-29 | 2 | -1/+21 |
* | | | | | | | | Remove "use" statement | Lukas Reschke | 2015-08-05 | 2 | -4/+6 |
* | | | | | | | | Use StringUtils::equals on CSRF token and add unit tests | Lukas Reschke | 2015-08-04 | 1 | -5/+4 |
* | | | | | | | | Merge pull request #18024 from owncloud/phpseclib-2.0 | Thomas Müller | 2015-08-04 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update phpseclib to 2.0 | Andreas Fischer | 2015-08-03 | 1 | -5/+5 |
* | | | | | | | | | [PHP 7] Change type hint to also accept Errors | Lukas Reschke | 2015-08-04 | 1 | -2/+2 |