Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | don't overwrite keys if rename was done by a stream copy | Bjoern Schiessle | 2014-02-24 | 1 | -0/+2 |
| | |||||
* | Merge pull request #6962 from owncloud/quota-space-root | Thomas Müller | 2014-02-20 | 1 | -1/+7 |
|\ | | | | | Allow passing a root folder to get the used space from in the quota wrapper | ||||
| * | Merge branch 'master' into quota-space-root | Robin Appelman | 2014-02-10 | 1 | -1/+2 |
| |\ | |||||
| * | | Actually rename the variable | Robin Appelman | 2014-01-27 | 1 | -2/+2 |
| | | | |||||
| * | | Fix phpdoc | Robin Appelman | 2014-01-27 | 1 | -1/+1 |
| | | | |||||
| * | | Allow passing a root folder to get the used space from in the quota wrapper | Robin Appelman | 2014-01-27 | 1 | -1/+7 |
| | | | |||||
* | | | Merge pull request #6999 from kofemann/mount-config | Lukas Reschke | 2014-02-20 | 1 | -5/+5 |
|\ \ \ | | | | | | | | | mount: make location of mount.json configurable | ||||
| * | | | mount: make location of mount.json configurable | Tigran Mkrtchyan | 2014-01-29 | 1 | -5/+5 |
| |/ / | | | | | | | | | | | | | | | | do not share users data with config files Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> | ||||
* | | | Merge pull request #7274 from owncloud/scrutinizer-patch-1 | Morris Jobke | 2014-02-19 | 9 | -6/+19 |
|\ \ \ | | | | | | | | | Scrutinizer Auto-Fixes | ||||
| * | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2014-02-19 | 9 | -6/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch was automatically generated as part of the following inspection: https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720 Enabled analysis tools: - PHP Analyzer - JSHint - PHP Copy/Paste Detector - PHP PDepend | ||||
* | | | | Merge pull request #7260 from owncloud/watcher-policy | icewind1991 | 2014-02-19 | 1 | -13/+33 |
|\ \ \ \ | | | | | | | | | | | Allow setting the frequency of which the file watcher checks for updates | ||||
| * | | | | Allow setting the frequency of which the file watcher checks for updates | Robin Appelman | 2014-02-18 | 1 | -13/+33 |
| | | | | | |||||
* | | | | | Merge pull request #7257 from owncloud/filelist-fileinfo | Vincent Petry | 2014-02-19 | 1 | -8/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | use a FileInfo object of the directory when generting the filelist | ||||
| * | | | | use a FileInfo object of the directory when generting the filelist | Robin Appelman | 2014-02-18 | 1 | -8/+1 |
| |/ / / | |||||
* | | | | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-14 | 7 | -19/+254 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/appconfig.php | ||||
| * | | | remove the JsonSerializable interface from \OC\Files\FileInfo | Robin Appelman | 2014-02-14 | 1 | -5/+1 |
| | | | | |||||
| * | | | Merge pull request #6748 from owncloud/fileinfo | icewind1991 | 2014-02-14 | 2 | -18/+213 |
| |\ \ \ | | | | | | | | | | | Add a FileInfo class which holds all info of a file ... | ||||
| | * | | | merge master into fileinfo | Robin Appelman | 2014-01-29 | 3 | -5/+8 |
| | |\| | | |||||
| | * | | | Add isReadable, isUpdateable, isDeletable, isShareable | Robin Appelman | 2014-01-24 | 1 | -1/+37 |
| | | | | | |||||
| | * | | | Merge branch 'master' into fileinfo | Robin Appelman | 2014-01-17 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/lib/files/cache/cache.php | ||||
| | * \ \ \ | Merge branch 'master' into fileinfo | Robin Appelman | 2014-01-14 | 1 | -5/+17 |
| | |\ \ \ \ | |||||
| | * | | | | | add Support for passing a FileInfo instance to View->putFileInfo | Robin Appelman | 2014-01-13 | 2 | -1/+8 |
| | | | | | | | |||||
| | * | | | | | remove ArrayAccess, JsonSerializable from the public part of FileInfo | Robin Appelman | 2014-01-13 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Add a FileInfo class which holds all info of a file and return that from ↵ | Robin Appelman | 2014-01-13 | 2 | -17/+169 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | getFileInfo, getDirectoryContent and search | ||||
| * | | | | | | Merge pull request #7075 from owncloud/quota-storagexsendfile | Vincent Petry | 2014-02-11 | 3 | -0/+24 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Added isLocal() method to storage, used for xsendfile | ||||
| | * | | | | | | Added isLocal() method to storage, used for xsendfile | Vincent Petry | 2014-02-06 | 3 | -0/+24 |
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added isLocal() method to Storage to find out whether the storage is local or not. This method is used for the x-sendfile logic to find out whether to add the headers. | ||||
| * | | | | | | Merge branch 'master' into remove-user-storage-entry | Robin Appelman | 2014-02-10 | 1 | -1/+2 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | close statement in MimeType detection is executed [#7069] | Jens-Christian Fischer | 2014-02-04 | 1 | -1/+2 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | close statement was never executed due to it being after a return statement. | ||||
| * | | | | | Also clean up the filecache table when deleting a storage entry | Robin Appelman | 2014-02-03 | 1 | -0/+6 |
| | | | | | | |||||
| * | | | | | Also remove the user's home storage from the storage table when deleting a user | Robin Appelman | 2014-01-21 | 1 | -0/+13 |
| |/ / / / | |||||
* | | | | | Fix more documentation failes | Joas Schilling | 2014-02-08 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | Issue #7111 | ||||
* | | | | | polish documentation based on scrutinizer patches | Jörn Friedrich Dreyer | 2014-02-06 | 20 | -11/+97 |
|/ / / / | |||||
* | | | | Reuse the data retrieved from the cache in checkUpdate | Robin Appelman | 2014-01-20 | 2 | -4/+7 |
| | | | | |||||
* | | | | Fixed quota wrapper to not wrap failed fopen streams | Vincent Petry | 2014-01-19 | 1 | -1/+1 |
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling fopen() on some storage types, these return false instead of throwing an exception. This fix makes sure that in case the stream wasn't opened (for example when a file doesn't exist any more) the stream isn't wrapped. Also added 'rb' as another case that doesn't need to be wrapped. Fixes #6832 | ||||
* | | | Merge pull request #6768 from owncloud/scanner-use-storage-mtime | Vincent Petry | 2014-01-15 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Use storage_mtime when determining if we can reuse cached data while scanning | ||||
| * | | Use storage_mtime when determining if we can reuse cached data while scanning | Robin Appelman | 2014-01-14 | 1 | -1/+1 |
| |/ | |||||
* / | Fix calculated folder size to use unencrypted size | Vincent Petry | 2014-01-09 | 1 | -5/+17 |
|/ | | | | | | The encrypted size was used when calculating folder sizes. This fix now also sums up the unencrypted size and shows that one when available. | ||||
* | Prevent deleting storage root | Vincent Petry | 2014-01-08 | 1 | -0/+13 |
| | | | | | | | | Storage mount points are not deletable, so make sure that the unlink operation and its hooks aren't run in such cases. Note that some storages might recursively delete their contents when calling unlink on their root. This fix prevents that as well. | ||||
* | Now also preventing to override "files" dir size with -1 | Vincent Petry | 2014-01-07 | 1 | -1/+1 |
| | | | | Fixes #6526 | ||||
* | Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free ↵ | Robin Appelman | 2014-01-02 | 1 | -1/+1 |
| | | | | space on a local storage | ||||
* | Merge pull request #6201 from owncloud/backgroundscan-reuse-etag | Vincent Petry | 2013-12-06 | 1 | -1/+1 |
|\ | | | | | reuse etags when doing a background scan | ||||
| * | reuse etags when doing a background scan | Robin Appelman | 2013-12-05 | 1 | -1/+1 |
| | | |||||
* | | Users of getFolderContent are mostly interested in the unecrypted file size | Bart Visscher | 2013-12-06 | 1 | -0/+4 |
|/ | |||||
* | Merge pull request #6168 from owncloud/extstorage-testtestmethod | Frank Karlitschek | 2013-12-03 | 1 | -0/+8 |
|\ | | | | | Added unit test for the test() method of ext storage | ||||
| * | Added unit test for the test() method | Vincent Petry | 2013-12-03 | 1 | -0/+8 |
| | | | | | | | | This is to make sure that method isn't broken | ||||
* | | check if a directory exists before we try to remove it | Robin Appelman | 2013-12-02 | 1 | -2/+6 |
|/ | |||||
* | Merge pull request #6099 from owncloud/fix_source_not_found_warnings | Morris Jobke | 2013-11-28 | 1 | -1/+5 |
|\ | | | | | make sure that we don't try to access an already deleted files | ||||
| * | correctFolder() already resolves the dirname internally | Bjoern Schiessle | 2013-11-28 | 1 | -1/+1 |
| | | |||||
| * | make sure that we don't try to access an already deleted files, fixes some ↵ | Bjoern Schiessle | 2013-11-28 | 1 | -2/+6 |
| | | | | | | | | file source not found warnings | ||||
* | | Redetect mime type whenever extension is renamed | Vincent Petry | 2013-11-27 | 1 | -0/+6 |
|/ |