summaryrefslogtreecommitdiffstats
path: root/lib/private/files
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7650 from owncloud/quota-totalspaceVincent Petry2014-03-111-0/+7
|\
| * Fixed total space display when data size exceeds quotaVincent Petry2014-03-101-0/+7
* | Merge pull request #7398 from owncloud/trash_dont_rely_on_dbVincent Petry2014-03-101-1/+1
|\ \
| * | get trash size from file cacheBjoern Schiessle2014-03-101-1/+1
* | | Merge pull request #7624 from owncloud/enc-encryptedusedspacefixVincent Petry2014-03-102-2/+12
|\ \ \
| * | | Return unencrypted_size of folder when queriedVincent Petry2014-03-071-0/+5
| * | | Propagate unencrypted_size up to the file cache rootVincent Petry2014-03-071-2/+7
* | | | Merge pull request #7628 from owncloud/fileinfo-typeThomas Tanghus2014-03-091-3/+13
|\ \ \ \ | |_|_|/ |/| | |
| * | | Check if value exists before returningRobin Appelman2014-03-071-2/+5
| * | | Fix FileInfo->getType errorsRobin Appelman2014-03-071-1/+8
| |/ /
* / / Add caching for getLocalFile on remote storagesRobin Appelman2014-03-041-2/+22
|/ /
* | Update rawlist to work with new fileinfo objectRobin Appelman2014-02-271-1/+1
* | Merge pull request #7279 from owncloud/folderid-reuseicewind19912014-02-262-2/+13
|\ \
| * | Remove fileid parameter for getFolderContentRobin Appelman2014-02-211-5/+2
| * | Split getFolderContentByIdRobin Appelman2014-02-211-0/+10
| * | Merge branch 'master' into folderid-reuseRobin Appelman2014-02-2111-25/+64
| |\ \
| * | | Reuse the folder id in View->getFolderContentsRobin Appelman2014-02-192-4/+8
* | | | Merge pull request #7335 from owncloud/fix-7333Vincent Petry2014-02-251-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix path to the mount fileLukas Reschke2014-02-201-1/+2
| | |/ | |/|
* | | Merge pull request #7371 from owncloud/core-storagemovedeleteallVincent Petry2014-02-252-38/+1
|\ \ \
| * | | Removed unused deleteAll method on Common storage classVincent Petry2014-02-241-37/+0
| * | | Replace deleteAll call with unlink callVincent Petry2014-02-241-1/+1
| |/ /
* / / don't overwrite keys if rename was done by a stream copyBjoern Schiessle2014-02-241-0/+2
|/ /
* | Merge pull request #6962 from owncloud/quota-space-rootThomas Müller2014-02-201-1/+7
|\ \
| * \ Merge branch 'master' into quota-space-rootRobin Appelman2014-02-101-1/+2
| |\ \
| * | | Actually rename the variableRobin Appelman2014-01-271-2/+2
| * | | Fix phpdocRobin Appelman2014-01-271-1/+1
| * | | Allow passing a root folder to get the used space from in the quota wrapperRobin Appelman2014-01-271-1/+7
* | | | Merge pull request #6999 from kofemann/mount-configLukas Reschke2014-02-201-5/+5
|\ \ \ \
| * | | | mount: make location of mount.json configurableTigran Mkrtchyan2014-01-291-5/+5
| |/ / /
* | | | Merge pull request #7274 from owncloud/scrutinizer-patch-1Morris Jobke2014-02-199-6/+19
|\ \ \ \
| * | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2014-02-199-6/+19
* | | | | Merge pull request #7260 from owncloud/watcher-policyicewind19912014-02-191-13/+33
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Allow setting the frequency of which the file watcher checks for updatesRobin Appelman2014-02-181-13/+33
* | | | | Merge pull request #7257 from owncloud/filelist-fileinfoVincent Petry2014-02-191-8/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | use a FileInfo object of the directory when generting the filelistRobin Appelman2014-02-181-8/+1
| |/ / /
* | | | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-147-19/+254
|\| | |
| * | | remove the JsonSerializable interface from \OC\Files\FileInfoRobin Appelman2014-02-141-5/+1
| * | | Merge pull request #6748 from owncloud/fileinfoicewind19912014-02-142-18/+213
| |\ \ \
| | * | | merge master into fileinfoRobin Appelman2014-01-293-5/+8
| | |\| |
| | * | | Add isReadable, isUpdateable, isDeletable, isShareableRobin Appelman2014-01-241-1/+37
| | * | | Merge branch 'master' into fileinfoRobin Appelman2014-01-171-1/+1
| | |\ \ \
| | * \ \ \ Merge branch 'master' into fileinfoRobin Appelman2014-01-141-5/+17
| | |\ \ \ \
| | * | | | | 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
| * | | | | | Merge pull request #7075 from owncloud/quota-storagexsendfileVincent Petry2014-02-113-0/+24
| |\ \ \ \ \ \
| | * | | | | | Added isLocal() method to storage, used for xsendfileVincent Petry2014-02-063-0/+24
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'master' into remove-user-storage-entryRobin Appelman2014-02-101-1/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | close statement in MimeType detection is executed [#7069]Jens-Christian Fischer2014-02-041-1/+2
| | |/ / / /