Robin Appelman
|
c9f3f2874f
|
Merge branch 'master' into update-parent-storage-mtime
Conflicts:
lib/private/files/cache/updater.php
|
2013-10-30 13:41:10 +01:00 |
Bjoern Schiessle
|
0d7d396d80
|
make sure that also the storage etag gets changed
|
2013-10-29 16:30:47 +01:00 |
|
Bjoern Schiessle
|
a80ac9c492
|
make getUidAndFilename() private
|
2013-10-29 15:10:02 +01:00 |
|
Bjoern Schiessle
|
fcfac51aa1
|
backport of https://github.com/owncloud/core/pull/5513
|
2013-10-29 15:08:12 +01:00 |
|
Robin Appelman
|
b3626f34cd
|
Update the parent folders storage_mtime on write and delete to prevent rescans
|
2013-10-29 14:18:57 +01:00 |
Thomas Müller
|
9c9dc276b7
|
move the private namespace OC into lib/private - OCP will stay in lib/public
Conflicts:
lib/private/vcategories.php
|
2013-09-30 16:36:59 +02:00 |