Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into home-storage | Thomas Müller | 2013-10-30 | 3 | -14/+69 |
|\ | |||||
| * | Merge branch 'master' into update-parent-storage-mtime | Robin Appelman | 2013-10-30 | 3 | -14/+49 |
| |\ | | | | | | | | | | | | | Conflicts: lib/private/files/cache/updater.php | ||||
| | * | Merge branch 'master' into fix_file_cache_updater_master | Bjoern Schiessle | 2013-10-29 | 2 | -2/+10 |
| | |\ | |||||
| | | * | Map empty mimetypes to octet-stream for Oracle DBMS. | Andreas Fischer | 2013-10-29 | 1 | -0/+4 |
| | | | | |||||
| | | * | Return early if fileinfo is there. | Andreas Fischer | 2013-10-29 | 1 | -0/+1 |
| | | | | |||||
| | | * | Reset mimetype to application/octet-stream on empty reply from file command. | Andreas Fischer | 2013-10-29 | 1 | -0/+4 |
| | | | | |||||
| | | * | Do not calculate $isWrapped if not needed. | Andreas Fischer | 2013-10-29 | 1 | -2/+1 |
| | | | | |||||
| | * | | make sure that also the storage etag gets changed | Bjoern Schiessle | 2013-10-29 | 1 | -4/+7 |
| | | | | |||||
| | * | | make getUidAndFilename() private | Bjoern Schiessle | 2013-10-29 | 1 | -1/+1 |
| | | | | |||||
| | * | | backport of https://github.com/owncloud/core/pull/5513 | Bjoern Schiessle | 2013-10-29 | 1 | -12/+36 |
| | |/ | |||||
| * / | Update the parent folders storage_mtime on write and delete to prevent rescans | Robin Appelman | 2013-10-29 | 1 | -1/+21 |
| |/ | |||||
* | | dont use the home storage for non-existing users | Robin Appelman | 2013-10-29 | 1 | -2/+2 |
| | | |||||
* | | use the new home storage backend when no existing local storage backend ↵ | Robin Appelman | 2013-10-29 | 2 | -2/+21 |
| | | | | | | | | exists for the user's home | ||||
* | | add specialized storage backend for home folders | Robin Appelman | 2013-10-29 | 1 | -0/+31 |
|/ | |||||
* | Added comment for clarification about fseek() call in quota.php | Vincent Petry | 2013-10-25 | 1 | -0/+2 |
| | |||||
* | Fixed quota stream to not wrap read-only fopen calls | Vincent Petry | 2013-10-25 | 1 | -1/+1 |
| | |||||
* | Fixed quota stream's fseek method | Vincent Petry | 2013-10-25 | 1 | -2/+12 |
| | | | | | | - Added missing return statement - Added missing support for SEEK_END - Fixes #5524 | ||||
* | Catch duplicate insertion errors while scanning files | Vincent Petry | 2013-10-23 | 2 | -14/+38 |
| | | | | | | | | | | | | | | | | When two scanning processed run at the same time, for example when scan.php and list.php were called at the same time on an external storage mountpoint, duplicate insertion errors can occurs. These errors are now logged and ignored. Since both scans are running in parallel transactions, they don't see each other's changes directly in the DB which can cause duplicate insertion errors for mime types as well, but those mime types can't be selected yet. The solution to this is to force-reload the mimetypes list after the transaction is finished. Fixes #5199 | ||||
* | Prevent renaming/deleting mount points | Vincent Petry | 2013-10-15 | 1 | -1/+2 |
| | | | | | | | Fixed permissions returned for mount points to not include update and delete permissions. Fixes #5291 | ||||
* | Merge pull request #5263 from owncloud/fixing-5255-master | VicDeo | 2013-10-10 | 1 | -1/+3 |
|\ | | | | | Proper behavior of resolvePath() | ||||
| * | the path need to be normalized before putting it into resolvePath() | Thomas Müller | 2013-10-10 | 1 | -1/+3 |
| | | | | | | | | otherwise the returned internalPath will not match followup calls to e.g. Cache::getID() | ||||
* | | merge master into hooks-view-same-start | Robin Appelman | 2013-10-10 | 2 | -280/+2 |
|\| | |||||
| * | Merge pull request #5221 from owncloud/fixing-5217-master | VicDeo | 2013-10-10 | 1 | -279/+0 |
| |\ | | | | | | | fixing php 5.3 compatibility | ||||
| | * | php 5.3 compatibility for \OC\Files\Storage | Thomas Müller | 2013-10-08 | 1 | -279/+0 |
| | | | |||||
| * | | don't trigger the create hooks when if the file already exists for ↵ | Robin Appelman | 2013-10-09 | 1 | -1/+2 |
| |/ | | | | | | | file_put_contents | ||||
* / | ensure the view's root is a subfolder of the the default root, not only ↵ | Robin Appelman | 2013-10-09 | 1 | -1/+4 |
|/ | | | | starting the same | ||||
* | Check result only once | Victor Dubiniuk | 2013-10-04 | 1 | -3/+5 |
| | |||||
* | Make mimetypes static. Jenkis will be happy | Victor Dubiniuk | 2013-10-04 | 1 | -11/+11 |
| | |||||
* | Load all mimetypes in one go | Victor Dubiniuk | 2013-10-04 | 1 | -17/+20 |
| | |||||
* | only perform files upgrade in case there are actually entries in the old ↵ | Thomas Müller | 2013-10-02 | 1 | -1/+9 |
| | | | | fscache table | ||||
* | move the private namespace OC into lib/private - OCP will stay in lib/public | Thomas Müller | 2013-09-30 | 37 | -0/+8317 |
Conflicts: lib/private/vcategories.php |