summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21735 from owncloud/files-external-checkbox-settingsThomas Müller2016-01-152-5/+15
|\
| * Consolidate user mounting check codeRobin McCorkell2016-01-142-5/+15
* | Merge pull request #20898 from owncloud/cache-interfacesThomas Müller2016-01-1537-142/+1495
|\ \
| * | remove unneeded public cache methodsRobin Appelman2016-01-141-19/+0
| * | only trigger locking on lockingstoragesRobin Appelman2016-01-143-24/+49
| * | split locking related methods to their own interfaceRobin Appelman2016-01-143-28/+62
| * | Add IStorage interface for consistent namingRobin Appelman2016-01-145-50/+523
| * | fix object store storageRobin Appelman2016-01-141-1/+7
| * | fix quota wrapperRobin Appelman2016-01-142-2/+6
| * | fix testsRobin Appelman2016-01-142-2/+4
| * | add since tagsRobin Appelman2016-01-147-0/+69
| * | fix phpdocRobin Appelman2016-01-141-1/+1
| * | add watcher interfaceRobin Appelman2016-01-144-8/+88
| * | Add updater interface and expose cache interfaces from storageRobin Appelman2016-01-143-6/+101
| * | add scanner interfaceRobin Appelman2016-01-144-11/+79
| * | Return a class from cache operations instead of an arrayRobin Appelman2016-01-1411-86/+63
| * | Safe teardownsRobin Appelman2016-01-146-16/+28
| * | add cache entry interfaceRobin Appelman2016-01-142-0/+228
| * | propagator interfaceRobin Appelman2016-01-142-2/+38
| * | Add public cache interfaceRobin Appelman2016-01-142-1/+264
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-1528-2/+120
| |/ |/|
* | Merge pull request #21727 from owncloud/adddispatchtousersettingsThomas Müller2016-01-141-0/+2
|\ \
| * | allow apps to load additional scripts on the user settings page via the event...Jörn Friedrich Dreyer2016-01-141-0/+2
| |/
* | Merge pull request #21623 from owncloud/stricter_defaultproviderThomas Müller2016-01-142-9/+28
|\ \
| * | Only select elements from the database that we supportRoeland Jago Douma2016-01-141-1/+26
| * | Use namedparameterRoeland Jago Douma2016-01-142-9/+3
* | | Merge pull request #21714 from owncloud/groups-insertifnotexistsThomas Müller2016-01-141-34/+5
|\ \ \
| * | | Use IDbConnectin::insertIfNotExistThomas Müller2016-01-141-2/+1
| * | | Use insertIfNotExists() when creating a groupJoas Schilling2016-01-141-33/+5
| | |/ | |/|
* | | Merge pull request #21718 from owncloud/groupanduserinterfaceMorris Jobke2016-01-148-129/+153
|\ \ \ | |/ / |/| |
| * | add TODOs with the actual interface nameJörn Friedrich Dreyer2016-01-142-2/+2
| * | move methods to correct interface, deprecate private interfaceJörn Friedrich Dreyer2016-01-148-127/+151
|/ /
* | Merge pull request #21679 from owncloud/bump-sabre-3.0.7Thomas Müller2016-01-142-7/+7
|\ \ | |/ |/|
| * Fix carddav unit testsRoeland Jago Douma2016-01-131-7/+7
| * [3rdparty] Bump sabre to 3.0.7 (PHP7 support)Roeland Jago Douma2016-01-131-0/+0
* | Merge pull request #21704 from owncloud/fix-namespace-issueThomas Müller2016-01-141-1/+1
|\ \
| * | Fix usage of PHP method within namespaceMorris Jobke2016-01-141-1/+1
* | | Merge pull request #21703 from owncloud/fix_share_create_hooksThomas Müller2016-01-143-3/+26
|\ \ \ | |/ / |/| |
| * | Fix integration testsRoeland Jago Douma2016-01-131-2/+2
| * | [Share 2.0] Fix pre_share and post_share hooksRoeland Jago Douma2016-01-132-1/+24
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-1434-6/+136
|/ /
* | Merge pull request #21692 from owncloud/external-add-globalThomas Müller2016-01-131-2/+2
|\ \
| * | Fix adding global applicable when removing all other applicablesRobin Appelman2016-01-131-2/+2
| |/
* | Merge pull request #20497 from owncloud/bubble_up_hint_exceptionThomas Müller2016-01-132-33/+36
|\ \
| * | Simply use logException() to log the exception - no need for custom codeThomas Müller2016-01-131-22/+11
| * | Fix PHPDocThomas Müller2016-01-131-12/+23
| * | Bubble up hint exceptions in hooks, so the user can see the hintJörn Friedrich Dreyer2016-01-131-0/+3
* | | Merge pull request #21552 from owncloud/share2.0_register_providersThomas Müller2016-01-1315-186/+449
|\ \ \
| * | | [Share 2.0] Let the factory do the factory stuffRoeland Jago Douma2016-01-136-315/+94
| * | | [Share 2.0] Use full share id (providerId:shareId)Roeland Jago Douma2016-01-139-83/+186