Florin Peter
|
9f8f052f0d
|
merged files_trashbin
|
2013-05-01 01:52:06 +02:00 |
|
Florin Peter
|
04b0843bb4
|
fixed some tests
|
2013-05-01 01:43:56 +02:00 |
|
Florin Peter
|
3c100af132
|
revert changes to fbbc76f281 because master is very unstable right now
|
2013-05-01 01:38:06 +02:00 |
|
Florin Peter
|
5deba29bdf
|
fixed public-keys mount point error
|
2013-05-01 00:09:55 +02:00 |
|
Florin Peter
|
b08179d406
|
fixed tests after merge against master
|
2013-04-30 23:58:53 +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
|
fbbc76f281
|
fix for sharing files
|
2013-04-30 20:44:42 +02:00 |
|
FlorinPeter
|
4ab3614248
|
Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_master
Trashbin for encryption keys now against master
|
2013-04-30 11:39:21 -07:00 |
|
FlorinPeter
|
b464970142
|
Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache
fix for infinite loop causing on files_encryption branch when testing
|
2013-04-29 17:05:41 -07:00 |
Jenkins for ownCloud
|
5764bf088e
|
[tx-robot] updated from transifex
|
2013-04-30 01:59:18 +02:00 |
|
Florin Peter
|
b1c4464eda
|
improved key length tests
|
2013-04-30 01:54:19 +02:00 |
|
Florin Peter
|
27ce7845b4
|
fixed tests, now tests should work via autotest.sh
files_encryption app is now enabled in enable_all.php
|
2013-04-30 01:35:46 +02:00 |
|
Florin Peter
|
882a747b47
|
rename folder to tests
|
2013-04-30 00:34:05 +02:00 |
|
Florin Peter
|
d22795d68b
|
fixed test for crypt and keymanager
disabled encryption file proxy in test/lib/cache/file.php
|
2013-04-29 23:41:49 +02:00 |
|
Florin Peter
|
c52fe12537
|
fixed missing parameter
|
2013-04-29 23:37:08 +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 |
Jan-Christoph Borchardt
|
a5c72f1ad2
|
Merge pull request #3159 from owncloud/reword
Reword sentence and move HTML out of translation
|
2013-04-29 04:39:51 -07:00 |
Morris Jobke
|
cc9933be1c
|
Merge pull request #3160 from owncloud/remove-onclick
Remove onclick
|
2013-04-29 03:58:44 -07:00 |
|
Florin Peter
|
4ecd62e58d
|
improvements for test testSymmetricStreamEncryptShortFileContent
this runs currently into an infinite loop
|
2013-04-29 09:12:43 +02:00 |
|
Jenkins for ownCloud
|
2b36ad292d
|
[tx-robot] updated from transifex
|
2013-04-29 02:00:26 +02:00 |
|
Florin Peter
|
4a63faf64b
|
speed improvement
|
2013-04-29 01:43:59 +02:00 |
Lukas Reschke
|
3a6e39b990
|
It's a class
|
2013-04-28 23:28:41 +02:00 |
|
Lukas Reschke
|
003e6adb3f
|
Remove uneeded onclick handler
|
2013-04-28 23:26:07 +02:00 |
|
Lukas Reschke
|
6cf6103ed2
|
Move onclick handler
|
2013-04-28 23:25:58 +02:00 |
|
Lukas Reschke
|
e3c9554856
|
Reword sentence and move HTML out of translation
|
2013-04-29 00:13:23 +03:00 |
|
Florin Peter
|
7a3ecd0429
|
delete and restore of versions and share-keys now works
fix restore of the same file name
|
2013-04-28 20:48:30 +02:00 |
|
Florin Peter
|
5e11948598
|
added handling for share-keys
this works only with latest files_encryption branch up from 813641e6e8
|
2013-04-28 20:48:30 +02:00 |
|
Florin Peter
|
26e5ef193d
|
restore fixed
|
2013-04-28 20:48:30 +02:00 |
|
Florin Peter
|
228c501515
|
fixed some problems and broken code
|
2013-04-28 20:48:30 +02:00 |
Björn Schießle
|
680ba4bea1
|
restore encryption keys from trash bin (development snapshot)
|
2013-04-28 20:48:29 +02:00 |
|
Björn Schießle
|
cb65b7ca9d
|
move encryption keys to trash bin
|
2013-04-28 20:45:51 +02:00 |
Frank Karlitschek
|
1f194b7bdc
|
Merge pull request #3154 from owncloud/fix_3153
Change app identifier for core api routes
|
2013-04-28 03:51:21 -07:00 |
|
Jenkins for ownCloud
|
901e0c598d
|
[tx-robot] updated from transifex
|
2013-04-28 02:01:38 +02:00 |
|
Florin Peter
|
f9760f6521
|
improved file size
|
2013-04-27 23:34:25 +02:00 |
|
Florin Peter
|
7f1f0464a8
|
added self healing if file get remove from file cache
|
2013-04-27 23:02:42 +02:00 |
|
Florin Peter
|
d32bf993fa
|
removed previous added post rename FileProxy hook
|
2013-04-27 20:23:30 +02:00 |
|
Florin Peter
|
770aebfb9e
|
check if file exists before fixing file size
|
2013-04-27 20:22:38 +02:00 |
|
Florin Peter
|
ba080e0d2e
|
removed preRename and moved postRename to hooks.php
added postWrite and postTouch to fix file size and sharing keys
|
2013-04-27 20:21:46 +02:00 |
|
Florin Peter
|
05523b76c0
|
fix reusing keys
fix webdav part files
|
2013-04-27 20:18:57 +02:00 |
|
Florin Peter
|
d40ffc5aac
|
added filesystem post rename hook
|
2013-04-27 20:18:05 +02:00 |
|
Lukas Reschke
|
51a1f41225
|
Merge pull request #3121 from owncloud/ocs_fix_api_response
Fix the api response when a shipped and third party app both fail.
|
2013-04-27 10:05:06 -07:00 |
Tom Needham
|
1e1a8b2f3c
|
Fix typo
|
2013-04-27 17:52:37 +01:00 |
|
Tom Needham
|
66053693f8
|
Code style for ocs/routes.php
|
2013-04-27 17:51:36 +01:00 |
|
Tom Needham
|
59db762dfa
|
Change app identifier for core api routes
|
2013-04-27 17:45:44 +01:00 |
|
Tom Needham
|
d33f6b9af6
|
Use correct variable when checking auth
|
2013-04-27 17:45:23 +01:00 |
|
Morris Jobke
|
0e5eccbdbc
|
Merge pull request #3146 from owncloud/restart-hint
web_server_restart needs to be true to display the hint
|
2013-04-27 08:19:08 -07:00 |
|
Morris Jobke
|
86455d6ac3
|
Merge pull request #3145 from owncloud/magic_quotes_gpc-check
Add check for Magic Quotes
|
2013-04-27 08:14:40 -07:00 |
Raghu Nayyar
|
2bcb64e781
|
Merge pull request #3114 from owncloud/update-notification
Add an update notification
|
2013-04-26 21:12:38 -07:00 |
|
Jenkins for ownCloud
|
7b2c64236c
|
[tx-robot] updated from transifex
|
2013-04-27 02:24:29 +02:00 |
|
Florin Peter
|
813641e6e8
|
improved file size
created new method fixFileSize in Util so it can be used with files_trashbin
|
2013-04-27 00:05:20 +02:00 |