summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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-147-38/+196
|\
| * Add unit tests for JobListRobin Appelman2014-02-121-1/+1
| * Additional phpdocRobin Appelman2014-02-123-6/+31
| * Remove internal methods from the public interfaceRobin Appelman2014-02-121-7/+1
| * Merge branch 'master' into backgroundjob-publicRobin Appelman2014-02-125-1/+36
| |\
| * | Add the background job list to the public server containerRobin Appelman2014-02-117-36/+175
* | | 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-144-19/+352
|\ \ \ \ | |/ / / |/| | |
| * | | merge master into fileinfoRobin Appelman2014-01-2920-84/+235
| |\ \ \
| * | | | Add isReadable, isUpdateable, isDeletable, isShareableRobin Appelman2014-01-242-1/+65
| * | | | Merge branch 'master' into fileinfoRobin Appelman2014-01-173-22/+32
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into fileinfoRobin Appelman2014-01-143-18/+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-132-17/+7
| * | | | | | Extends phpdoc for \OCP\File\FileInfoRobin Appelman2014-01-131-4/+37
| * | | | | | Add a FileInfo class which holds all info of a file and return that from getF...Robin Appelman2014-01-134-18/+257
* | | | | | | suppress error msg caused by php bugGeorg Ehrke2014-02-144-4/+4
* | | | | | | Merge pull request #4624 from owncloud/convert-oc_appconfigThomas Müller2014-02-136-91/+339
|\ \ \ \ \ \ \
| * | | | | | | Add explicit sortingRobin Appelman2014-02-111-2/+4
| * | | | | | | Merge branch 'master' into convert-oc_appconfigRobin Appelman2014-02-1113-22/+118
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Add caching to appconfigRobin Appelman2014-02-072-16/+48
| * | | | | | | use the 'new' server container for appconfigRobin Appelman2014-02-07287-3246/+6972
| |\ \ \ \ \ \ \
| * | | | | | | | Move legacy file to correct locationBart Visscher2013-10-021-0/+0
| * | | | | | | | Merge branch 'master' into convert-oc_appconfigBart Visscher2013-10-02340-1200/+6325
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Style fixesBart Visscher2013-09-191-21/+25
| * | | | | | | | | check for valid appinfo in installerBart Visscher2013-09-191-0/+3
| * | | | | | | | | Convert OC_Appconfig to object interfaceBart Visscher2013-09-192-67/+201
* | | | | | | | | | Merge pull request #6964 from owncloud/storagestatistics-reuseicewind19912014-02-122-9/+14
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into storagestatistics-reuseRobin Appelman2014-02-1012-19/+33
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ merge master into storagestatistics-reuseRobin Appelman2014-02-0518-145/+297
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Reuse the calculated free_space in buildFileStorageStatisticsRobin Appelman2014-01-272-6/+10
* | | | | | | | | | | | Merge pull request #7075 from owncloud/quota-storagexsendfileVincent Petry2014-02-115-1/+36
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Added isLocal() method to storage, used for xsendfileVincent Petry2014-02-065-1/+36
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | fix DIArthur Schiwon2014-02-111-4/+6
* | | | | | | | | | | Inject loggerArthur Schiwon2014-02-111-3/+6
* | | | | | | | | | | wrong tldArthur Schiwon2014-02-111-1/+1
* | | | | | | | | | | sort following entries in alphabetical orderArthur Schiwon2014-02-111-3/+4
* | | | | | | | | | | move sorter into a classArthur Schiwon2014-02-111-0/+53
* | | | | | | | | | | Merge pull request #6881 from owncloud/remove-user-storage-entryVincent Petry2014-02-102-0/+22
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into remove-user-storage-entryRobin Appelman2014-02-1030-161/+335
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Also clean up the filecache table when deleting a storage entryRobin Appelman2014-02-031-0/+6
| * | | | | | | | | | | Revert "Use Cache->clear to cleanup the filecache for removed users"Robin Appelman2014-02-031-10/+5
| * | | | | | | | | | | Use Cache->clear to cleanup the filecache for removed usersRobin Appelman2014-01-221-5/+10
| * | | | | | | | | | | Also remove the user's home storage from the storage table when deleting a userRobin Appelman2014-01-212-0/+16
* | | | | | | | | | | | Merge pull request #6988 from owncloud/oc_api_fix_warinigsTom Needham2014-02-101-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |