3c100af132
revert changes to fbbc76f281 because master is very unstable right now
2013-05-01 01:38:06 +02:00
b2da07fe95
Merge branch 'master' into files_encryption to get the latest files_trashbin app
...
Conflicts:
apps/files/l10n/bn_BD.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/de_DE.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/hr.php
apps/files/l10n/ms_MY.php
apps/files/l10n/ro.php
apps/files/l10n/si_LK.php
apps/files/l10n/sl.php
apps/files/l10n/ta_LK.php
apps/files_external/l10n/de_DE.php
apps/files_external/l10n/et_EE.php
apps/user_ldap/l10n/tr.php
core/l10n/bg_BG.php
l10n/af_ZA/files.po
l10n/af_ZA/files_external.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/files_external.po
l10n/be/files.po
l10n/be/files_external.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/files_external.po
l10n/bg_BG/files_trashbin.po
l10n/bg_BG/files_versions.po
l10n/bg_BG/settings.po
l10n/bn_BD/core.po
l10n/bn_BD/files.po
l10n/bn_BD/files_external.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/files_external.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/files_external.po
l10n/cs_CZ/lib.po
l10n/cy_GB/core.po
l10n/cy_GB/files.po
l10n/cy_GB/files_external.po
l10n/cy_GB/settings.po
l10n/da/core.po
l10n/da/files.po
l10n/da/files_external.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_external.po
l10n/de_DE/core.po
l10n/de_DE/files.po
l10n/de_DE/files_external.po
l10n/el/core.po
l10n/el/files.po
l10n/el/files_external.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/files_external.po
l10n/es/core.po
l10n/es/files.po
l10n/es/files_external.po
l10n/es_AR/core.po
l10n/es_AR/files.po
l10n/es_AR/files_external.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/files_external.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/files_external.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/files_external.po
l10n/fi/files.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/files_external.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/files_external.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/files_external.po
l10n/he/core.po
l10n/he/files.po
l10n/he/files_external.po
l10n/hi/files.po
l10n/hi/files_external.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/files_external.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hy/files.po
l10n/hy/files_external.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/files_external.po
l10n/id/core.po
l10n/id/files.po
l10n/id/files_external.po
l10n/is/core.po
l10n/is/files.po
l10n/is/files_external.po
l10n/it/core.po
l10n/it/files.po
l10n/it/files_external.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/files_external.po
l10n/ka/files.po
l10n/ka/files_external.po
l10n/ka_GE/core.po
l10n/ka_GE/files.po
l10n/ka_GE/files_external.po
l10n/kn/files.po
l10n/kn/files_external.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/files_external.po
l10n/ku_IQ/files.po
l10n/ku_IQ/files_external.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/files_external.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/files_external.po
l10n/lv/core.po
l10n/lv/files.po
l10n/lv/files_external.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/files_external.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/files_external.po
l10n/my_MM/files.po
l10n/my_MM/files_external.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/files_external.po
l10n/ne/files.po
l10n/ne/files_external.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/files_external.po
l10n/nn_NO/files.po
l10n/nn_NO/files_external.po
l10n/oc/core.po
l10n/oc/files.po
l10n/oc/files_external.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/files_external.po
l10n/pl_PL/files.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/files_external.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/files_external.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/files_external.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru_RU/core.po
l10n/ru_RU/files.po
l10n/si_LK/core.po
l10n/si_LK/files.po
l10n/si_LK/files_external.po
l10n/sk/files.po
l10n/sk/files_external.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/files_external.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/files_external.po
l10n/sq/core.po
l10n/sq/files.po
l10n/sq/files_external.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/files_external.po
l10n/sr@latin/files.po
l10n/sr@latin/files_external.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/files_external.po
l10n/sw_KE/files.po
l10n/sw_KE/files_external.po
l10n/ta_LK/core.po
l10n/ta_LK/files.po
l10n/ta_LK/files_external.po
l10n/te/files.po
l10n/te/files_external.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_trashbin.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/files_external.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/files_external.po
l10n/tr/user_ldap.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/files_external.po
l10n/ur_PK/files.po
l10n/ur_PK/files_external.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/zh_CN.GB2312/core.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN.GB2312/files_external.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/files_external.po
l10n/zh_HK/core.po
l10n/zh_HK/files.po
l10n/zh_HK/files_external.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/files_external.po
lib/base.php
lib/files/mount/mount.php
2013-04-30 20:53:56 +02:00
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
bcd9a69033
Cache: seperate handing of numeric storage id's to it's own class
2013-04-26 00:00:18 +02:00
fac288a4ad
added unencrypted file size to file cache
...
improved file size calculation and speeds
2013-04-25 15:20:06 +02:00
2fa34d6772
Make FileCache upgrade more robust, fixes #2650
2013-04-15 11:56:30 +02:00
49313b334a
fixes #2679
2013-04-09 00:26:16 +03:00
e75406e712
PostreSQL compatibility, fixes #2666
2013-04-03 23:56:59 +02:00
aa103bd5b3
supress write hook for .part files
2013-03-28 12:15:27 +01:00
4a70315ad1
ignore files in scanFile instead of scan to catch all occurences.
2013-03-28 12:15:27 +01:00
78c694b6ee
Cache: on equal mtime also for equal size before keeping ETag, at least makes Unit Test happy
2013-03-27 19:20:08 +01:00
3d29a82150
Cache: Do not overwrite ETag when file did not change
2013-03-27 19:19:40 +01:00
2a2d409733
Only prepare an SQL statement once.
2013-03-27 19:19:16 +01:00
1d676fb0e6
Add PHPDoc
2013-03-27 19:18:58 +01:00
d9e07ca60a
Adjust to Icewind's fix
2013-03-27 19:18:34 +01:00
1a874b9106
Cache: fix property path for getting legacy etag
2013-03-27 19:18:13 +01:00
19c7d9c3dc
Port Icewind's fix I
2013-03-27 19:17:49 +01:00
5fc276602a
Change LIMIT in DB query respectively remove where not necessary
2013-03-27 19:13:14 +01:00
e2afd0cb42
Upgrade FileCache on ownCloud upgrade for all users with files
2013-03-27 19:12:28 +01:00
9d25058905
Performance: prepare queries only once
2013-03-27 19:12:04 +01:00
7839ec5093
Fix lost ETag on Cache Upgrade
2013-03-27 19:11:35 +01:00
d16dd1ad2a
listen to touch hook to update the mtime after sync
2013-03-26 09:42:55 +01:00
0e55b61169
Improve phpdoc for the filecache
2013-03-24 02:06:50 +01:00
7f1ff3e9e1
Merge pull request #2204 from owncloud/chache_updater_rename
...
Cache: better rename hook for cache updater
2013-03-17 05:03:18 -07:00
a3db54f9b0
Merge pull request #2383 from owncloud/error-handling-upgrade
...
Add error handling to the file cache upgrade
2013-03-16 12:17:31 -07:00
c69dc3483a
Add error handling to the file cache upgrade
2013-03-16 14:28:42 -04:00
387be37427
Filter display of blacklisted files
...
Blacklisted files like ".htaccess" and ".git" should not only be
blacklisted for upload and rename, but they should also not be displayed
in the directory listings.
I needed this personally to hide ".git" folders in shared folders. Its
also a simple implementation of feature requests like
http://forum.owncloud.org/viewtopic.php?f=4&t=3279 and
http://forum.owncloud.org/viewtopic.php?f=3&t=5708
2013-03-15 12:11:42 +01:00
abe408e934
replace \MDB with \OC_DB, approved in #2278
2013-03-14 14:59:12 +01:00
9d4d399aa3
write error message to log file in case insert to file cache failed - took hours to find that the insert failed :-(
2013-03-12 15:39:29 +01:00
1d3beffacf
Cache: better rename hook for cache updater
2013-03-08 19:08:07 +01:00
9d9acf24de
Cache: more efficient detection for existing entries during upgrade
2013-03-04 23:19:55 +01:00
56ae4bb6e9
Cache: also check if the file id is already in the cache during upgrade
...
Should solve upgrade issues if only some of the configured storages were migrated previously
2013-03-04 22:26:03 +01:00
ee1eb98d4a
Cache: cleanup permissions cache when removing a file from the cache
2013-02-28 17:04:50 +01:00
f7a43391a7
Cache: add option to delete file from permissions cache for all users
2013-02-28 17:04:34 +01:00
5062ae250b
Merge branch 'master' into master-sqlserver
...
Conflicts:
lib/files/cache/cache.php
2013-02-20 10:55:20 +01:00
0c1ec758e8
Cache: hash long storage ids to ensure they fit in the database
2013-02-15 22:11:39 +01:00
4b80466880
Merge branch 'master' into master-sqlserver
...
Conflicts:
lib/db.php
lib/files/cache/cache.php
lib/files/cache/legacy.php
lib/setup.php
2013-02-14 22:54:48 +01:00
78a3625ddf
final adoptions for mssql connectivity
2013-02-14 21:59:24 +01:00
ffae6f4b84
Style-fix: Breakup long lines
2013-02-14 08:38:37 +01:00
5c4a804ddb
Fix SpaceBeforeOpenBrace errors
2013-02-14 08:36:26 +01:00
76b31f870c
Merge branch 'master' into master-sqlserver
2013-02-12 00:32:38 +01:00
4e5a3fbcaf
- Fixed indentations.
...
- Fixed a bug in legacy.php: there was an error that was not checked for if the table 'fscache' did not exist in the database.
2013-02-10 14:08:00 +01:00
b31cc83a2d
$this->numericId should be determined based on table storages not filecache
2013-02-12 17:26:58 +01:00
251b676a06
Merge pull request #1616 from owncloud/cache_fixes_rebase
...
Cache: reuse known folder sizes when doing a shallow scan - rebase
2013-02-12 08:07:49 -08:00
b54dcd1999
Cache: fix scanner trying to use existing data when file isn't in cache
2013-02-12 16:48:21 +01:00
f2baf1ae0e
fixing syntax error
2013-02-12 16:18:48 +01:00
e1fe5279dd
Cache: also preserve etags for files
2013-02-12 14:56:57 +01:00
062befd1fc
Update lib/files/cache/legacy.php
...
Fixing a bug that occurs when trying to update a non-existent 'fscache' table in the database - if unfixed upgrading does not succeed.
Unfortunately I could not get a call to PEAR::isError working. That is why I check for the existence of a property present in class MDB2_Error.
2013-02-11 20:28:36 +01:00
2921d2fb78
Cache: don't create a new etag when the mtime hasn't changed
2013-02-11 13:33:56 +01:00
d84c3cd014
Cache: actually use parameter
2013-02-11 13:33:48 +01:00
Florin Peter
Florin Peter
Robin Appelman
Arthur Schiwon
OpenLarry
Jörn Friedrich Dreyer
Björn Schießle
Frank Karlitschek
Bernhard Posselt
Michael Gapczynski
Andreas Schönebeck
Thomas Mueller
Bart Visscher
Administrator
irgsmirx