Florin Peter
|
3c100af132
|
revert changes to fbbc76f281 because master is very unstable right now
|
2013-05-01 01:38:06 +02:00 |
|
Florin Peter
|
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 |
|
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
|
bcd9a69033
|
Cache: seperate handing of numeric storage id's to it's own class
|
2013-04-26 00:00:18 +02:00 |
|
Florin Peter
|
fac288a4ad
|
added unencrypted file size to file cache
improved file size calculation and speeds
|
2013-04-25 15:20:06 +02:00 |
|
OpenLarry
|
49313b334a
|
fixes #2679
|
2013-04-09 00:26:16 +03:00 |
|
Björn Schießle
|
abe408e934
|
replace \MDB with \OC_DB, approved in #2278
|
2013-03-14 14:59:12 +01:00 |
|
Thomas Mueller
|
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 |
|
Robin Appelman
|
ee1eb98d4a
|
Cache: cleanup permissions cache when removing a file from the cache
|
2013-02-28 17:04:50 +01:00 |
|
Thomas Mueller
|
5062ae250b
|
Merge branch 'master' into master-sqlserver
Conflicts:
lib/files/cache/cache.php
|
2013-02-20 10:55:20 +01:00 |
|
Robin Appelman
|
0c1ec758e8
|
Cache: hash long storage ids to ensure they fit in the database
|
2013-02-15 22:11:39 +01:00 |
|
Thomas Mueller
|
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 |
|
Thomas Mueller
|
78a3625ddf
|
final adoptions for mssql connectivity
|
2013-02-14 21:59:24 +01:00 |
|
Bart Visscher
|
ffae6f4b84
|
Style-fix: Breakup long lines
|
2013-02-14 08:38:37 +01:00 |
|
Thomas Mueller
|
b31cc83a2d
|
$this->numericId should be determined based on table storages not filecache
|
2013-02-12 17:26:58 +01:00 |
|
TheSFReader
|
d03155a8d5
|
translate the mimtype/mimepart to readable in the searchByMime function
|
2013-02-03 11:06:26 +01:00 |
|
Robin Appelman
|
9e2a066c7b
|
Cache: add function to get storage id and internal path of a file by id
|
2013-01-27 00:13:50 +01:00 |
|
Robin Appelman
|
42a1a17a30
|
Cache: return non numberic storage id
|
2013-01-21 22:01:22 +01:00 |
|
Michael Gapczynski
|
6801f82d09
|
Merge branch 'filesystem' into filesystem-etags
Conflicts:
lib/files/cache/cache.php
|
2013-01-07 10:28:37 -05:00 |
|
Robin Appelman
|
d0377b1951
|
Cache: normalize mimetypes
|
2013-01-07 02:09:21 +01:00 |
|
Michael Gapczynski
|
2c23e143d3
|
Store etags in the file cache
|
2012-12-30 16:32:55 -05:00 |
|
Robin Appelman
|
b12abb2c94
|
use numeric ids for storages in the filecache
|
2012-12-15 23:35:07 +01:00 |
|
Robin Appelman
|
a609992a75
|
better check if we are passing a fileid to Cache::get
|
2012-11-25 16:30:57 +01:00 |
|
Robin Appelman
|
0cfef83ed9
|
sort output of getFolderContent by name
|
2012-11-25 16:08:35 +01:00 |
|
Robin Appelman
|
ad706229f5
|
explicitly sort files when using getFolderContents
|
2012-11-23 00:17:18 +01:00 |
|
Robin Appelman
|
186c9e77e8
|
add Cache->getIncomplete for use in background scanning
|
2012-11-22 12:45:29 +01:00 |
|
Robin Appelman
|
15b8a3f987
|
move correctFolderSize from Scanner to Cache
|
2012-11-08 18:10:54 +01:00 |
|
Robin Appelman
|
3f644fe70c
|
fix calculateFolderSize for non existing files
|
2012-11-08 18:07:30 +01:00 |
|
Robin Appelman
|
e7bed5ddab
|
allow creating Cache objects with only the storage id instead of the whole storage object
|
2012-11-08 17:59:08 +01:00 |
|
Robin Appelman
|
8a6bb7965d
|
add Cache::move
|
2012-11-02 22:25:33 +01:00 |
|
Robin Appelman
|
fba7be1194
|
add filesystem watcher to detect updates
|
2012-10-28 11:39:37 +01:00 |
|
Robin Appelman
|
79d0ac21cc
|
delete child entries when a folder gets removed from cache
|
2012-10-27 18:08:00 +02:00 |
|
Robin Appelman
|
56e9ce44c3
|
add a way to recalucale the size of a folder in the cache
|
2012-10-27 18:08:00 +02:00 |
|
Robin Appelman
|
fcc92a9f43
|
add searchByMime to new cache api
|
2012-10-27 10:34:25 +02:00 |
|
Robin Appelman
|
695405dfeb
|
add permissions data to the results of the cache api
|
2012-10-27 10:01:20 +02:00 |
|
Robin Appelman
|
8bce661e4d
|
add search to the filecache api
|
2012-10-26 13:23:49 +02:00 |
|
Robin Appelman
|
39adadd3e3
|
move the cache api from OC_Files to filesystem(view)
|
2012-10-26 12:30:25 +02:00 |
|
Robin Appelman
|
13515effc9
|
add Cache::getStatus
|
2012-10-08 14:58:21 +02:00 |
|
Robin Appelman
|
636c75ce06
|
better parent path bahaviour for the filecache
|
2012-10-03 11:23:33 +02:00 |
|
Robin Appelman
|
92555eff71
|
add encrypted column to the new filecache
|
2012-10-02 23:34:45 +02:00 |
|
Robin Appelman
|
522d7df860
|
convert Cache to a non-static class that handles the cache for a single storage backend
|
2012-09-26 17:52:02 +02:00 |
|
Robin Appelman
|
dcf995fff3
|
add Cache::getFolderContent
|
2012-09-23 15:25:03 +02:00 |
|
Robin Appelman
|
6fafd5d4e9
|
this should be done elsewhere if needed
|
2012-09-23 01:46:52 +02:00 |
|
Robin Appelman
|
97b0eabc85
|
fix several problems in the new filecache in order to complete the tests
|
2012-09-22 15:43:48 +02:00 |
|
Robin Appelman
|
153cd802a9
|
add partial file data to the result of Cache::get
|
2012-09-22 14:40:04 +02:00 |
|
Robin Appelman
|
954596c251
|
rework filecache to work directly on storage backends wip
|
2012-09-16 16:52:32 +02:00 |
|