Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | move the private namespace OC into lib/private - OCP will stay in lib/public | Thomas Müller | 2013-09-30 | 37 | -8317/+0 |
| | | | | | Conflicts: lib/private/vcategories.php | ||||
* | Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData). | Andreas Fischer | 2013-09-24 | 1 | -27/+27 |
| | |||||
* | clear permissions cache when scanning a file | Robin Appelman | 2013-09-24 | 1 | -3/+12 |
| | |||||
* | Merge remote-tracking branch 'owncloud/master' into fixing-4866-master | Andreas Fischer | 2013-09-23 | 2 | -6/+10 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * owncloud/master: (98 commits) [tx-robot] updated from transifex files: when filtering search results, ensure results are children of the fakeroot not just path starting the same setting a default on filecache column unencrypted_size [tx-robot] updated from transifex remove unneccessary lib in namespace namespaces use upcasefirst parts when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app its magic! initialize variable calculate correct permissions while toggle the password protection make sure that both $permissions and $oldPermissions have the same type Add copyright, remove starting blank line update inherit docs comment Fix insert/update/delete helper functions for oracle Add missing return true statements to legacy preferences functions Add missing static Convert OC_Preference to object interface fix race condition in lazy preview loading use {count} instead of 'One' for more versatile translation fix double translation of error message use n to translate title fixing typos and l10n ... Conflicts: tests/lib/files/cache/scanner.php | ||||
| * | Merge pull request #4327 from owncloud/scanfile-remove | Thomas Müller | 2013-09-22 | 1 | -0/+2 |
| |\ | | | | | | | remove deleted files while scanning | ||||
| | * | remove deleted files while scanning | Robin Appelman | 2013-08-06 | 1 | -0/+2 |
| | | | |||||
| * | | files: when filtering search results, ensure results are children of the ↵ | Robin Appelman | 2013-09-22 | 1 | -6/+8 |
| | | | | | | | | | | | | fakeroot not just path starting the same | ||||
* | | | Move bool to int conversion to buildParts(), so it also happens for update(). | Andreas Fischer | 2013-09-21 | 1 | -1/+3 |
| | | | |||||
* | | | Only update the etag. Do not re-submit any other unchanged data. | Andreas Fischer | 2013-09-20 | 1 | -2/+3 |
| | | | |||||
* | | | Use update() instead of put(). | Andreas Fischer | 2013-09-20 | 1 | -3/+1 |
| | | | |||||
* | | | when storing back the data field 'encrypted' it is necessary to cast the ↵ | Thomas Müller | 2013-09-20 | 1 | -0/+2 |
| | | | | | | | | | | | | boolean to an integer to make pg happy | ||||
* | | | etag changes are now propagated up the file tree | Thomas Müller | 2013-09-16 | 1 | -0/+14 |
| | | | |||||
* | | | recreate an etag within the scanner if the cache contains an empty etag | Thomas Müller | 2013-09-16 | 1 | -1/+7 |
|/ / | |||||
* | | adding null check on a mount's storage | Thomas Müller | 2013-09-15 | 1 | -0/+6 |
| | | |||||
* | | Merge pull request #4712 from owncloud/fileapi-foreward | Thomas Müller | 2013-09-13 | 8 | -2/+1323 |
|\ \ | | | | | | | Provide an implementation of the fileapi for oc6 build on top of the old api | ||||
| * \ | Merge branch 'master' into fileapi-foreward | Robin Appelman | 2013-09-12 | 1 | -33/+58 |
| |\ \ | |||||
| * | | | add storage backend interface to public namespace | Robin Appelman | 2013-09-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | improve phpdoc for the public files interface | Robin Appelman | 2013-09-10 | 1 | -21/+0 |
| | | | | |||||
| * | | | move filesystem expceptions to global namespace | Robin Appelman | 2013-09-10 | 6 | -57/+55 |
| | | | | |||||
| * | | | extract interfaces from fileapi for public namespace | Robin Appelman | 2013-09-06 | 3 | -3/+3 |
| | | | | |||||
| * | | | use === | Robin Appelman | 2013-09-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Provide an implementation of the fileapi for oc6 build on top of the old api | Robin Appelman | 2013-09-01 | 8 | -1/+1345 |
| | | | | |||||
* | | | | Merge pull request #4719 from owncloud/port_4701_master | Thomas Müller | 2013-09-12 | 4 | -33/+42 |
|\ \ \ \ | |_|/ / |/| | | | Always check variable type before using readdir to avoid surprises | ||||
| * | | | more is_resource checks before readdir | Arthur Schiwon | 2013-09-05 | 1 | -8/+10 |
| | | | | |||||
| * | | | Always check variable type before using readdir to avoid surprises | Arthur Schiwon | 2013-09-04 | 3 | -25/+32 |
| |/ / | |||||
* | | | change View->deleteAll to an alias of View->rmdir since rmdir works recursive | Robin Appelman | 2013-09-07 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #4477 from owncloud/hooks-view | Bernhard Posselt | 2013-09-04 | 1 | -32/+57 |
|\ \ \ | |/ / |/| | | also emit hooks for views that are a subfolder of the user folder | ||||
| * | | also emit hooks for views that are a subfolder of the user folder | Robin Appelman | 2013-08-17 | 1 | -32/+57 |
| | | | |||||
* | | | also emmit create hook when creating new files using touch() | Robin Appelman | 2013-08-29 | 1 | -0/+1 |
| | | | |||||
* | | | additional readdir check in mappedlocal | Thomas Müller | 2013-08-22 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into readdir-strict-equals | Georg Ehrke | 2013-08-19 | 8 | -5/+264 |
|\ \ \ | |||||
| * \ \ | Merge pull request #4467 from owncloud/storage-wrapper-quota | icewind1991 | 2013-08-19 | 8 | -5/+264 |
| |\ \ \ | | | | | | | | | | | Move quota logic from filesystem proxy to storage wrapper | ||||
| | * \ \ | merge master in storage-wrapper-quota | Robin Appelman | 2013-08-18 | 5 | -34/+203 |
| | |\ \ \ | |||||
| | * | | | | fix quota wrapper reporting negative free_space, breaking user interface | Robin Appelman | 2013-08-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | return 0 instead | ||||
| | * | | | | add conveince function to wrap all storages | Robin Appelman | 2013-07-25 | 1 | -0/+12 |
| | | | | | | |||||
| | * | | | | add option to wrap existing mounts | Robin Appelman | 2013-07-25 | 2 | -0/+14 |
| | | | | | | |||||
| | * | | | | fix getPermissionsCache for storage wrapper | Robin Appelman | 2013-07-25 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | add quota storage wrapper | Robin Appelman | 2013-07-25 | 1 | -0/+104 |
| | | | | | | |||||
| | * | | | | add quota streamwrapper that limits the amount of data that can be written ↵ | Robin Appelman | 2013-07-25 | 1 | -0/+128 |
| | | | | | | | | | | | | | | | | | | | | | | | | to a stream | ||||
| | * | | | | rename constants | Robin Appelman | 2013-07-25 | 3 | -4/+5 |
| | | | | | | |||||
* | | | | | | use strict equals in readdir loops to prevent issues with '0' files | Robin Appelman | 2013-08-19 | 3 | -5/+5 |
|/ / / / / | |||||
* | / / / | Add _many_ newlines at the end of files | kondou | 2013-08-18 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | Merge branch 'master' into mimetype-defaults | Thomas Müller | 2013-08-16 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: apps/files/ajax/newfile.php | ||||
| * | | | Scanner: correctly pass trough reuse options when doing a recursive scan | Robin Appelman | 2013-08-12 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | use === | Robin Appelman | 2013-08-07 | 1 | -4/+4 |
| | | | |||||
* | | | add the option to have templates for newly created files | Robin Appelman | 2013-08-07 | 1 | -0/+46 |
| | | | |||||
* | | | split of mimetype detection code from OC_Helper, adding the option for apps ↵ | Robin Appelman | 2013-08-07 | 1 | -0/+121 |
|/ / | | | | | | | to register additional mimetype mappings | ||||
* | | use isset to prevent undefined index | Thomas Müller | 2013-08-05 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #4221 from owncloud/fix-3698 | Jörn Friedrich Dreyer | 2013-08-01 | 1 | -19/+19 |
|\ \ | | | | | | | Fix calculating size for empty folders | ||||
| * | | Use query to calculate folder size | Michael Gapczynski | 2013-07-29 | 1 | -10/+13 |
| | | |