Michael Gapczynski
|
cb9fe475c4
|
Merge branch 'master' into hook-improvements
Conflicts:
lib/files/view.php
|
2013-06-04 18:19:08 -04:00 |
Robin Appelman
|
38bd234686
|
make sure the filesystem is setup before doing mount operations
|
2013-06-02 22:09:44 +02:00 |
Robin Appelman
|
b5e817d638
|
fix clearing mounts when filesystem isn't initialized yet
|
2013-06-02 21:44:24 +02:00 |
icewind1991
|
94a6622bcd
|
Merge pull request #3459 from owncloud/fix_for_2377
fix problems with german "Umlaut" in folder name
|
2013-05-31 14:00:02 -07:00 |
icewind1991
|
aa1c5a5d63
|
Merge pull request #3529 from owncloud/folder-permissions
Cache: provide a function to get the permissions of all files in a folder with one query
|
2013-05-30 05:54:29 -07:00 |
Michael Gapczynski
|
dbbf195727
|
Only retrieve the current user's permissions
|
2013-05-29 18:08:18 -04:00 |
Michael Gapczynski
|
ea55367678
|
Organize conditionals in a better order
|
2013-05-29 10:40:05 -04:00 |
Michael Gapczynski
|
04805d0be9
|
Only update metadata that has changed
|
2013-05-29 10:19:03 -04:00 |
Robin Appelman
|
44d217c425
|
Cache: provide a function to get the permissions of all files in a folder with one query
|
2013-05-29 15:25:42 +02:00 |
Florin Peter
|
adcafbde34
|
Merge branch 'master' into fix_for_2377
|
2013-05-25 20:37:28 +02:00 |
Florin Peter
|
505a300776
|
we should also normalize on update and search because the database layer will not do this for us
|
2013-05-25 20:35:12 +02:00 |
Michael Gapczynski
|
0fdf3a7e63
|
Merge pull request #3388 from roha4000/master
Duplicate DB entries in filecache table when renaming folder in WebUI #2
|
2013-05-25 11:18:20 -07:00 |
Florin Peter
|
c245f5a99f
|
added more places where normalization is needed
|
2013-05-25 14:56:00 +02:00 |
Florin Peter
|
946e9ccc0a
|
Merge branch 'master' into fix_for_2377
|
2013-05-24 20:54:13 +02:00 |
Florin Peter
|
736f10039d
|
changed builtin normalizer to \OC_Util::normalizeUnicode
|
2013-05-24 20:36:20 +02:00 |
Thomas Müller
|
4911305887
|
Merge pull request #3416 from owncloud/files_encryption
New files encryption app
|
2013-05-24 02:21:19 -07:00 |
Florin Peter
|
d4b700ef4e
|
revert previous fix and added normalizer to cache class
|
2013-05-23 20:29:46 +02:00 |
Michael Gapczynski
|
30330b4343
|
Merge branch 'master' into move-storages
Conflicts:
tests/lib/files/view.php
|
2013-05-23 10:25:12 -04:00 |
Michael Gapczynski
|
3b6d850e59
|
Switch to calling deleteAll via storage to avoid emitting delete hook
|
2013-05-23 10:23:16 -04:00 |
Florin Peter
|
85e0c78166
|
fix problems with german "Umlaut" in folder name
|
2013-05-23 01:21:36 +02:00 |
Björn Schießle
|
ee53bd1aa3
|
Merge branch 'master' into files_encryption
Conflicts:
lib/files/cache/cache.php
|
2013-05-22 15:29:22 +02:00 |
Jörn Friedrich Dreyer
|
1f1abe595d
|
cleanup codestyle
|
2013-05-22 13:59:08 +02:00 |
Jörn Friedrich Dreyer
|
eceb3c8ed5
|
add debug output
|
2013-05-22 13:59:07 +02:00 |
Roland Hager
|
2ea2abf11e
|
Fixing UPDATE error in filecache table when renaming files by calling move(). Add storage id to the where clause to avoid updating entries of other users.
|
2013-05-22 08:18:57 +02:00 |
Florin Peter
|
28d72b822d
|
Merge branch 'master' into files_encryption
Conflicts:
lib/files/cache/cache.php
|
2013-05-22 01:26:35 +02:00 |
Robin Appelman
|
81fd1badc3
|
merge master into filecache_mtime
|
2013-05-21 23:35:19 +02:00 |
Jörn Friedrich Dreyer
|
fb4d8ddf0a
|
Merge pull request #3335 from owncloud/prevent-scan-loop
Prevent backgroundScan() from looping
|
2013-05-21 09:15:22 -07:00 |
Michael Gapczynski
|
09ff46eda2
|
Remove user name addition to paths in deleteAll
|
2013-05-20 10:21:55 -04:00 |
Florin Peter
|
31037241e1
|
Merge branch 'master' into files_encryption
|
2013-05-20 02:25:56 +02:00 |
Florin Peter
|
58a8d67a9b
|
fix for webdav because initMounts() is triggered twice so we lost the root path
|
2013-05-20 01:57:16 +02:00 |
Florin Peter
|
b3b6738d59
|
Revert "fix for webdav and wrong reference for findByStorageId"
This reverts commit 079f918d5c .
|
2013-05-20 01:47:35 +02:00 |
Florin Peter
|
079f918d5c
|
fix for webdav and wrong reference for findByStorageId
|
2013-05-19 22:30:03 +02:00 |
Michael Gapczynski
|
fc5bce1f76
|
Fix undefined variable for copying empty folders
|
2013-05-19 15:04:41 -04:00 |
Michael Gapczynski
|
41e2d64c86
|
Add support for copying/moving folders between storages, move isIgnoredDir() to Filesystem
|
2013-05-19 14:15:49 -04:00 |
Thomas Mueller
|
5dcec346e5
|
Merge branch 'master' into fix-3353
|
2013-05-15 23:43:46 +02:00 |
Florin Peter
|
c50bf3e3c5
|
fix for losing mount point "/"
|
2013-05-15 20:09:02 +02:00 |
Michael Gapczynski
|
d91161186b
|
Fix finding mount in background watcher, fixes #3353
|
2013-05-15 09:33:38 -04:00 |
Florin Peter
|
807740a07a
|
fix for losing mount point "/"
|
2013-05-15 10:19:38 +02:00 |
Florin Peter
|
226aec8d56
|
Merge branch 'master' into files_encryption
|
2013-05-15 03:22:06 +02:00 |
Michael Gapczynski
|
71eed76dbe
|
Prevent backgroundScan() from looping if opendir() is failing for the same path
|
2013-05-13 11:17:08 -04:00 |
Jörn Friedrich Dreyer
|
9134395b43
|
don't emit rename hooks on partial file renames
|
2013-05-10 12:01:50 +02:00 |
Jörn Friedrich Dreyer
|
c3b0d3d38c
|
rename isIgnoredFile to isPartialFile, remove check of blacklisted files in isPartialFile, correct usage of isPartialFile and isFileBlacklisted
|
2013-05-10 12:00:13 +02:00 |
Björn Schießle
|
2e81efc37e
|
don't call correctFolder() in touchHook, it will be called later in the writeUpdate()
|
2013-05-08 23:00:24 +02:00 |
Björn Schießle
|
0e30e68b22
|
update etag for for the touched file
|
2013-05-08 23:00:03 +02:00 |
icewind1991
|
5b61c5d478
|
Merge pull request #3044 from owncloud/backgroundwatcher
Add a background job to watch for external filesystem changes
|
2013-05-07 10:00:00 -07:00 |
Michael Gapczynski
|
349a533f66
|
Merge pull request #3025 from owncloud/move-file
Cache: only look for child entires when doing a move operation when moving a folder
|
2013-05-07 07:52:57 -07:00 |
Michael Gapczynski
|
7039421efc
|
Fix retrieving of mount points for shared storage, fix #3218
|
2013-05-02 17:47:11 -04:00 |
Florin Peter
|
f55aaad858
|
fix for infinite loop causing on files_encryption branch when testing "apps/files_encryption/test/crypt.php" on Method testSymmetricStreamEncryptShortFileContent
|
2013-04-29 15:43:48 +02:00 |
Robin Appelman
|
8a838e0e03
|
Code style
|
2013-04-26 17:30:55 +02:00 |
Robin Appelman
|
809b5f81f6
|
Further seperation of mount management logic
|
2013-04-26 00:01:36 +02:00 |