summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-1815-158/+135
|\
| * Merge pull request #6796 from owncloud/statementwrapper-bindparamThomas Müller2014-02-181-0/+14
| |\
| | * Add bindParam to statement wrapperRobin Appelman2014-01-161-0/+14
| * | Merge pull request #7190 from owncloud/appconfig-legacy-appsThomas Müller2014-02-183-8/+11
| |\ \
| | * | Remove usage of legacy OC_AppconfigRobin Appelman2014-02-133-8/+11
| * | | Merge pull request #6650 from owncloud/migration_unit_testsTom Needham2014-02-183-112/+31
| |\ \ \
| | * | | Remove unused variablestomneedham2014-02-181-4/+0
| | * | | Merge branch 'master' into migration_unit_teststomneedham2014-02-1719-159/+617
| | |\ \ \
| | * \ \ \ Merge branch 'master' into migration_unit_testsBart Visscher2014-02-1048-228/+537
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'fix-5388-master' into migration_unit_teststomneedham2014-01-073-108/+31
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' into fix-5388-mastertomneedham2014-01-0425-136/+276
| | | |\ \ \ \ \
| | | * | | | | | Fix migration import of user filesBart Visscher2013-12-201-1/+1
| | | * | | | | | Wrap the import/export db in a wrapper to make it compatible with the old styleBart Visscher2013-12-202-0/+4
| | | * | | | | | Merge branch 'master' into fix-5388-masterBart Visscher2013-12-164-67/+111
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' into fix-5388-mastertomneedham2013-12-1129-83/+327
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' into fix-5388-masterThomas Mueller2013-11-245-19/+32
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'master' into fix-5388-masterThomas Müller2013-11-226-23/+78
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Change OC_Migrate from MDB2 to DoctrineBart Visscher2013-11-223-107/+26
| * | | | | | | | | | | | Merge pull request #7176 from owncloud/styleLukas Reschke2014-02-183-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | $default of OC_Config::[gs]etValue can have more then string as typeBart Visscher2014-02-122-4/+4
| | * | | | | | | | | | | | Style fixesBart Visscher2014-02-121-1/+2
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #7239 from owncloud/cbr-filetype-iconThomas Müller2014-02-181-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | add cbr/cbz file type icon, fix #6953Jan-Christoph Borchardt2014-02-171-0/+7
| | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| * / | | | | | | | | | | use file icon as fallback instead of application icon, fix #7237Jan-Christoph Borchardt2014-02-171-0/+1
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #7156 from owncloud/backgroundjob-publicThomas Müller2014-02-143-31/+63
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add unit tests for JobListRobin Appelman2014-02-121-1/+1
| | * | | | | | | | | | | Additional phpdocRobin Appelman2014-02-121-2/+4
| | * | | | | | | | | | | Merge branch 'master' into backgroundjob-publicRobin Appelman2014-02-124-1/+25
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add the background job list to the public server containerRobin Appelman2014-02-113-29/+59
* | | | | | | | | | | | | | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-1427-151/+616
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #7207 from owncloud/fileinfo-serializableMorris Jobke2014-02-141-5/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | remove the JsonSerializable interface from \OC\Files\FileInfoRobin Appelman2014-02-141-5/+1
| * | | | | | | | | | | | | | Merge pull request #7204 from owncloud/groupexists-duplicateThomas Müller2014-02-141-8/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Fix test cases for group managerRobin Appelman2014-02-141-2/+2
| | * | | | | | | | | | | | | remove duplicate call to groupExistsRobin Appelman2014-02-141-6/+4
| * | | | | | | | | | | | | | Merge pull request #6748 from owncloud/fileinfoicewind19912014-02-142-18/+213
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | merge master into fileinfoRobin Appelman2014-01-2916-75/+160
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Add isReadable, isUpdateable, isDeletable, isShareableRobin Appelman2014-01-241-1/+37
| | * | | | | | | | | | | | | | Merge branch 'master' into fileinfoRobin Appelman2014-01-172-21/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'master' into fileinfoRobin Appelman2014-01-142-6/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | add Support for passing a FileInfo instance to View->putFileInfoRobin Appelman2014-01-132-1/+8
| | * | | | | | | | | | | | | | | remove ArrayAccess, JsonSerializable from the public part of FileInfoRobin Appelman2014-01-131-2/+2
| | * | | | | | | | | | | | | | | Add a FileInfo class which holds all info of a file and return that from getF...Robin Appelman2014-01-132-17/+169
| * | | | | | | | | | | | | | | | suppress error msg caused by php bugGeorg Ehrke2014-02-144-4/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #4624 from owncloud/convert-oc_appconfigThomas Müller2014-02-134-91/+241
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Add explicit sortingRobin Appelman2014-02-111-2/+4
| | * | | | | | | | | | | | | | | Merge branch 'master' into convert-oc_appconfigRobin Appelman2014-02-1112-21/+117
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Add caching to appconfigRobin Appelman2014-02-072-16/+48
| | * | | | | | | | | | | | | | | use the 'new' server container for appconfigRobin Appelman2014-02-07214-5212/+3653
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Move legacy file to correct locationBart Visscher2013-10-021-0/+120