Jörn Friedrich Dreyer
904227a0e4
Merge pull request #3661 from owncloud/fixing-windows-server-master
...
Fixing windows server master
2013-06-19 02:42:18 -07:00
Thomas Mueller
87521f6c6e
dirname('/test.txt') returns '\' on windows whereas on linux we get back '.'
2013-06-14 11:59:30 +02:00
Thomas Müller
8edb56de05
Merge pull request #3690 from owncloud/use_execute_audited_in_filecache
...
use executeAudited in files cache
2013-06-13 13:55:55 -07:00
Thomas Müller
54f3174665
Merge pull request #3640 from infoneo/master
...
Folders with multiple periods problem fix
2013-06-13 03:34:36 -07:00
Thomas Mueller
84a8aea410
restore Updater functionality on non-Windows platforms
2013-06-13 00:09:52 +02:00
Jörn Friedrich Dreyer
54f9477f34
fix another double wrapped array
2013-06-12 23:01:52 +02:00
Jörn Friedrich Dreyer
6d55a062be
remove additional array wrapping
2013-06-12 21:23:34 +02:00
Jörn Friedrich Dreyer
d3eadcde56
use executeAudited in files cache
2013-06-12 20:11:53 +02:00
Thomas Mueller
74a170f2a5
[Fixing unit tests in Windows]
...
on windows open resources will be locked while the stream is open.
closing the resource allows deletion below
2013-06-10 19:28:55 +02:00
Thomas Mueller
c0b25a4375
[Fixing Updater Unit Tests on Windows]
...
using $internalPath within call to self::correctFolder() because $path inside of it is not processed properly due to directory separator on Windows.
2013-06-10 18:47:36 +02:00
Thomas Mueller
073306eaa2
[Fixing Updater Unit Tests on Windows]
...
using $internalPath within call to self::correctFolder() because $path inside of it is not processed properly due to directory separator on Windows.
error logging has been added in case the given 4path is not found within self::correctFolder
2013-06-10 18:35:47 +02:00
Jörn Friedrich Dreyer
875c18b115
fix fetchRow checks to also work with MDB2
2013-06-10 17:43:09 +02:00
Morris Jobke
1da112750e
Merge pull request #3647 from owncloud/missing_backticks
...
add missing backticks all over the place
2013-06-10 05:15:07 -07:00
Jörn Friedrich Dreyer
307f1626e8
convert LIMIT to parameter
2013-06-10 10:04:52 +02:00
Jörn Friedrich Dreyer
124f34422c
add missing backticks all over the place
2013-06-10 09:53:29 +02:00
infoneo
b39113ae3e
Update mapper.php
...
Now slugify is performed on whole filename (including extension). Changed method of adding index number (using regular expressions pathinfo() method removed).
2013-06-08 18:39:25 +03:00
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