summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #17932 from owncloud/fix_move_filesThomas Müller2015-08-111-2/+7
|\
| * make sure that we emit the hooks if a file gets moved from a subfolder to the...Bjoern Schiessle2015-07-291-2/+7
* | Merge pull request #16528 from owncloud/activity-302-improve-settingsJoas Schilling2015-08-112-2/+15
|\ \
| * | Allow types to be method specificJoas Schilling2015-07-222-2/+15
* | | Merge pull request #17830 from owncloud/issue-17825-dont-silently-ignore-inva...Joas Schilling2015-08-111-92/+104
|\ \ \
| * | | Throw a InvalidArgumentException when a consumer/extension is invalidJoas Schilling2015-07-231-92/+104
* | | | Merge pull request #18096 from sualko/patch-1Morris Jobke2015-08-101-0/+1
|\ \ \ \
| * | | | add data: to allowed image domainssualko2015-08-051-0/+1
* | | | | Merge pull request #18109 from owncloud/fix-router-app-loadedThomas Müller2015-08-102-0/+16
|\ \ \ \ \
| * | | | | Only load app routes if the app has already been loadedRobin McCorkell2015-08-062-0/+16
* | | | | | Merge pull request #18175 from owncloud/automatic-db-prefix-query-builderThomas Müller2015-08-105-17/+52
|\ \ \ \ \ \
| * | | | | | Remove unnecessary DB prefixes from existing query builder usagesJoas Schilling2015-08-103-9/+9
| * | | | | | Automatically prefix table names with *PREFIX* unless specifiedJoas Schilling2015-08-102-8/+43
* | | | | | | Merge pull request #15093 from rullzer/capabilities_managerRoeland Douma2015-08-108-6/+208
|\ \ \ \ \ \ \
| * | | | | | | Use DIRoeland Jago Douma2015-08-106-58/+25
| * | | | | | | Move core capabilities to new classRoeland Jago Douma2015-08-103-11/+65
| * | | | | | | Added Capabilities ManagerRoeland Jago Douma2015-08-106-2/+183
| |/ / / / / /
* | | | | | | Update installer.phpmichag862015-08-101-0/+1
* | | | | | | Check if archive contains a directory named like appidmichag862015-08-101-0/+3
|/ / / / / /
* | | | | | Merge pull request #14779 from owncloud/use-iterator-directoryRobin McCorkell2015-08-073-7/+4
|\ \ \ \ \ \
| * | | | | | Use the new IteratorDirectory instead of the fakedir wrapperRobin Appelman2015-07-153-7/+4
* | | | | | | Merge pull request #18124 from owncloud/share-permwrongvarMorris Jobke2015-08-071-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix removal of share permissions when share disabled for userVincent Petry2015-08-071-1/+1
* | | | | | | | Merge pull request #18120 from owncloud/appframework-isessioLukas Reschke2015-08-071-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Add \OCP\ISession to AppFrameworkRobin McCorkell2015-08-071-0/+4
* | | | | | | | | Merge pull request #13641 from owncloud/cache-storage-statusVincent Petry2015-08-077-11/+571
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix mounting wrapped storages resulting in many-layered wrappingRobin McCorkell2015-07-201-1/+6
| * | | | | | | | | Store storage availability in databaseRobin McCorkell2015-07-206-10/+565
* | | | | | | | | | Adding header support to class OC_OCS_ResultThomas Müller2015-08-072-1/+48
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #18091 from owncloud/add-backbonejsblizzz2015-08-071-0/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | load backbone universallyArthur Schiwon2015-08-063-6/+2
| * | | | | | | | make available as OC.Backbone to avoid conflictsArthur Schiwon2015-08-061-0/+5
| * | | | | | | | files and sharing will require backbonejsArthur Schiwon2015-08-061-0/+1
* | | | | | | | | Merge pull request #18030 from owncloud/dav-upload-updaterVincent Petry2015-08-061-2/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | go trough the updater when uploading over webdavRobin Appelman2015-08-031-2/+1
* | | | | | | | | Following the spec:Thomas Müller2015-08-051-5/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #18035 from owncloud/ocs-2.0Bernhard Posselt2015-08-055-196/+135
|\ \ \ \ \ \ \ \
| * | | | | | | | Return 200 not null - we should return consistent typesThomas Müller2015-08-051-1/+2
| * | | | | | | | Fix unit test within OCSControllerThomas Müller2015-08-031-2/+1
| * | | | | | | | Remove duplicate and unused codeThomas Müller2015-08-034-172/+40
| * | | | | | | | Fix authorsThomas Müller2015-08-031-7/+1
| * | | | | | | | Reduce duplicate codeThomas Müller2015-08-032-15/+44
| * | | | | | | | Adding ocs/v2.php with status code mapperThomas Müller2015-08-031-8/+56
| |/ / / / / / /
* | | | | | | | Merge pull request #17961 from owncloud/make_knowledgebase_configurableThomas Müller2015-08-052-1/+21
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | make knowledge base url configurableBjoern Schiessle2015-07-292-1/+21
* | | | | | | | Remove "use" statementLukas Reschke2015-08-052-4/+6
* | | | | | | | Use StringUtils::equals on CSRF token and add unit testsLukas Reschke2015-08-041-5/+4
* | | | | | | | Merge pull request #18024 from owncloud/phpseclib-2.0Thomas Müller2015-08-041-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Update phpseclib to 2.0Andreas Fischer2015-08-031-5/+5
* | | | | | | | | [PHP 7] Change type hint to also accept ErrorsLukas Reschke2015-08-041-2/+2