Commit Graph

5546 Commits

Author SHA1 Message Date
Björn Schießle 5b160edebb check if the user knows the correct recovery password before changing the recovery key settings 2013-05-15 14:02:13 +02:00
Björn Schießle 335f2ca321 Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption 2013-05-15 11:42:41 +02:00
Björn Schießle d8ae2fa80d only let the user change the recovery admin settings if a key passwords was entered. 2013-05-15 11:42:22 +02:00
Florin Peter 137039d35a workaround for blank page need an other solution 2013-05-15 10:52:23 +02:00
Florin Peter 3d7534da74 improved files_encryption tests 2013-05-15 10:21:56 +02:00
Florin Peter 01f1153b08 Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
Conflicts:
	apps/files/l10n/ar.php
	apps/files/l10n/bn_BD.php
	apps/files/l10n/de.php
	apps/files/l10n/de_DE.php
	apps/files/l10n/el.php
	apps/files/l10n/es.php
	apps/files/l10n/fa.php
	apps/files/l10n/fr.php
	apps/files/l10n/gl.php
	apps/files/l10n/id.php
	apps/files/l10n/ko.php
	apps/files/l10n/nl.php
	apps/files/l10n/nn_NO.php
	apps/files/l10n/pl.php
	apps/files/l10n/pt_BR.php
	apps/files/l10n/pt_PT.php
	apps/files/l10n/ro.php
	apps/files/l10n/ru.php
	apps/files/l10n/sl.php
	apps/files/l10n/uk.php
	apps/files/l10n/vi.php
	apps/files_encryption/l10n/ca.php
	apps/files_sharing/lib/cache.php
	apps/files_sharing/lib/sharedstorage.php
	apps/user_ldap/l10n/tr.php
	core/l10n/cs_CZ.php
	core/l10n/de.php
	core/l10n/de_DE.php
	core/l10n/ru.php
	core/l10n/sk_SK.php
	core/l10n/tr.php
	core/l10n/vi.php
	core/l10n/zh_CN.php
	l10n/af_ZA/files.po
	l10n/ar/files.po
	l10n/be/files.po
	l10n/bg_BG/files.po
	l10n/bn_BD/files.po
	l10n/ca/files.po
	l10n/ca/files_encryption.po
	l10n/cs_CZ/core.po
	l10n/cs_CZ/files.po
	l10n/da/files.po
	l10n/da/settings.po
	l10n/de/core.po
	l10n/de/files.po
	l10n/de/files_encryption.po
	l10n/de/files_external.po
	l10n/de/files_sharing.po
	l10n/de/files_trashbin.po
	l10n/de/files_versions.po
	l10n/de/lib.po
	l10n/de/settings.po
	l10n/de/user_ldap.po
	l10n/de_DE/files.po
	l10n/de_DE/files_encryption.po
	l10n/de_DE/files_external.po
	l10n/de_DE/files_sharing.po
	l10n/de_DE/files_trashbin.po
	l10n/de_DE/lib.po
	l10n/de_DE/settings.po
	l10n/de_DE/user_ldap.po
	l10n/el/files.po
	l10n/eo/files.po
	l10n/es/files.po
	l10n/es/lib.po
	l10n/es/settings.po
	l10n/es_AR/files.po
	l10n/eu/files.po
	l10n/fa/files.po
	l10n/fi/files.po
	l10n/fi_FI/files.po
	l10n/fr/core.po
	l10n/fr/files.po
	l10n/gl/files.po
	l10n/gl/settings.po
	l10n/he/core.po
	l10n/he/files.po
	l10n/he/user_ldap.po
	l10n/hi/files.po
	l10n/hr/files.po
	l10n/hu_HU/core.po
	l10n/hu_HU/files.po
	l10n/hu_HU/files_external.po
	l10n/hu_HU/settings.po
	l10n/hy/files.po
	l10n/ia/core.po
	l10n/ia/files.po
	l10n/ia/files_trashbin.po
	l10n/ia/settings.po
	l10n/id/files.po
	l10n/is/files.po
	l10n/it/files.po
	l10n/ja_JP/files.po
	l10n/ja_JP/user_ldap.po
	l10n/ka/files.po
	l10n/ka_GE/files.po
	l10n/kn/files.po
	l10n/ko/files.po
	l10n/ko/files_trashbin.po
	l10n/ko/settings.po
	l10n/ku_IQ/files.po
	l10n/lb/files.po
	l10n/lt_LT/core.po
	l10n/lt_LT/files.po
	l10n/lv/files.po
	l10n/mk/files.po
	l10n/ms_MY/files.po
	l10n/my_MM/files.po
	l10n/nb_NO/files.po
	l10n/ne/files.po
	l10n/nl/core.po
	l10n/nl/files.po
	l10n/nn_NO/files.po
	l10n/oc/files.po
	l10n/pl/files.po
	l10n/pl_PL/files.po
	l10n/pt_BR/files.po
	l10n/pt_PT/core.po
	l10n/pt_PT/files.po
	l10n/pt_PT/files_external.po
	l10n/pt_PT/settings.po
	l10n/ro/files.po
	l10n/ru/core.po
	l10n/ru/files.po
	l10n/si_LK/files.po
	l10n/sk/files.po
	l10n/sk_SK/core.po
	l10n/sk_SK/files.po
	l10n/sl/core.po
	l10n/sl/files.po
	l10n/sq/files.po
	l10n/sr/files.po
	l10n/sr@latin/files.po
	l10n/sv/files.po
	l10n/sw_KE/files.po
	l10n/ta_LK/files.po
	l10n/te/files.po
	l10n/th_TH/files.po
	l10n/tr/core.po
	l10n/tr/files.po
	l10n/tr/lib.po
	l10n/tr/settings.po
	l10n/tr/user_ldap.po
	l10n/uk/files.po
	l10n/ur_PK/files.po
	l10n/vi/core.po
	l10n/vi/files.po
	l10n/vi/files_external.po
	l10n/zh_CN.GB2312/files.po
	l10n/zh_CN/core.po
	l10n/zh_CN/files.po
	l10n/zh_CN/settings.po
	l10n/zh_HK/files.po
	l10n/zh_TW/core.po
	l10n/zh_TW/files.po
	l10n/zh_TW/files_versions.po
	l10n/zh_TW/settings.po
	l10n/zh_TW/user_ldap.po
	lib/base.php
	lib/files/filesystem.php
	lib/files/view.php
	lib/public/share.php
	settings/l10n/es.php
	settings/l10n/pt_PT.php
	settings/l10n/tr.php
	settings/l10n/zh_CN.php
	settings/personal.php
2013-05-15 10:18:25 +02:00
Florin Peter 226aec8d56 Merge branch 'master' into files_encryption 2013-05-15 03:22:06 +02:00
Florin Peter 7461e9c2b5 improved tests and added new tests for file rename and move 2013-05-15 02:38:08 +02:00
Florin Peter 499fe6ca8e disabled FileProxy in Keymanager::getPrivateKey 2013-05-15 02:36:23 +02:00
Florin Peter ddedf20106 prevent of infinite loop with FileProxy 2013-05-15 02:34:36 +02:00
Jenkins for ownCloud 6a788d1a54 [tx-robot] updated from transifex 2013-05-15 02:02:45 +02:00
Florin Peter 8776000754 fix for move file to an empty folder 2013-05-14 23:19:16 +02:00
Florin Peter 0a7aa6e8cd fix for Allowed memory size of xx bytes exhausted while reading big files 2013-05-14 22:32:39 +02:00
Thomas Müller fdef2a373a Merge pull request #2821 from owncloud/fix-2159-rename-to-shared
fix allowed rename of folder in root directory to reserved name "Shared"
2013-05-14 13:13:16 -07:00
Florin Peter 84c56a5d56 fix for zero size files 2013-05-14 21:29:24 +02:00
Björn Schießle 96ff19a703 fix history template, print_unescaped() needs to include closing tags 2013-05-14 21:22:30 +02:00
Florin Peter 517105660d fix for public link share 2013-05-14 20:11:07 +02:00
Raghu Nayyar 418503a4ad Merge pull request #3338 from owncloud/button_color_fix
Keeping Font Colors Consistant on the headers.
2013-05-14 09:52:54 -07:00
Morris Jobke 784f117ec2 Merge pull request #3330 from owncloud/preselect_filename_on_rename
peselect filename without extension on rename
2013-05-14 06:16:30 -07:00
Morris Jobke 0d8fa2eb98 [files] add private declaration of $view 2013-05-14 12:49:23 +02:00
raghunayyar 18618c75aa color change to crumb elements as well. 2013-05-14 11:07:12 +05:30
Florin Peter 81ae4cb5d0 added test for public shared file via link 2013-05-14 00:00:20 +02:00
Florin Peter a4e9e2fc79 added post_deleteUser hook for cleanup public key 2013-05-13 22:49:27 +02:00
Florin Peter b2d021b2a5 added post_createUser hook 2013-05-13 22:34:11 +02:00
Florin Peter 61ed347d26 added handling for public file access via files_sharing link 2013-05-13 21:24:59 +02:00
Florin Peter d92f6b887d removed var_dump 2013-05-13 21:22:59 +02:00
raghunayyar 6d95d130e4 Keeping Font Colors Consistant on the headers. 2013-05-13 23:12:05 +05:30
Björn Schießle aa3eb6bb5b don't handle public share keys in lib/public/share.php but in apps/files_encryption/lib/util.php instead 2013-05-13 17:40:57 +02:00
Björn Schießle 517efdf952 don't create a recovery user, only generate recovery key similar to the public link share key 2013-05-13 17:26:21 +02:00
Jörn Friedrich Dreyer 591b383f2d peselect filename without extension on rename 2013-05-13 15:54:45 +02:00
Björn Schießle 2f4ba9d1e8 if file was shared to user than userIds is just the users Id 2013-05-13 15:45:30 +02:00
Björn Schießle d1e2e47592 generate random key name for share key to avoid name conflicts 2013-05-13 15:15:35 +02:00
Björn Schießle a6ef25ba08 use preShare hook only to check if all pub keys are available and the postShare hook to finaly update the shareKeys if the file was shared successfully 2013-05-13 14:28:45 +02:00
Arthur Schiwon beaa10b823 Merge branch 'master' into ldap_configurable_username_n_uuid 2013-05-13 12:41:22 +02:00
Björn Schießle 0ef8590773 Merge branch 'master' into update_etags_on_restore 2013-05-13 10:48:06 +02:00
Jenkins for ownCloud e8c154f341 [tx-robot] updated from transifex 2013-05-13 02:10:20 +02:00
Morris Jobke e2bd32323d [files] fix mock creation and remove hardcoded 'require' statement 2013-05-12 13:02:01 +02:00
Morris Jobke b777c0fd75 [files] rename lib to "App" 2013-05-12 11:47:22 +02:00
Morris Jobke b32c30b6d0 [files] ownCloud typo 2013-05-12 11:47:22 +02:00
Morris Jobke 7e23e97676 [files] rename test class and add rename test 2013-05-12 11:47:22 +02:00
Morris Jobke d4ba9cf338 [files] remove realpath in test 2013-05-12 11:47:22 +02:00
Morris Jobke bb5554de7f [files] rename tests 2013-05-12 11:47:22 +02:00
Morris Jobke b9f426b1d7 [files] remove normalizePath on rename and dependency injection 2013-05-12 11:47:22 +02:00
Morris Jobke 324c423548 [files] kill stripslashes 2013-05-12 11:47:22 +02:00
Morris Jobke 418e878ba8 [files] fix typos 2013-05-12 11:47:22 +02:00
Morris Jobke 1020d5c16c [files] refactoring 2013-05-12 11:47:22 +02:00
Morris Jobke 33b31931bd string comparision 2013-05-12 11:47:22 +02:00
Morris Jobke b393c91a96 wrong root dir name 2013-05-12 11:47:22 +02:00
Morris Jobke a878bd9923 fix allowed rename of folder in root directory to reserved name "Shared"
refs #2159
2013-05-12 11:47:22 +02:00
Jenkins for ownCloud 74f92d0c7f [tx-robot] updated from transifex 2013-05-12 02:05:29 +02:00
Florin Peter 8e004cc3e1 added handling for sharing with link
NOTE: only encryption work atm
2013-05-11 01:03:43 +02:00
Florin Peter 33e0dfeecb sharing with group should work now 2013-05-11 00:25:32 +02:00
Florin Peter e88595638c fix for webdav 2013-05-11 00:23:30 +02:00
Björn Schießle cc433d47cb touch() needs to be performed relative to user/files otherwise ownCloud doesn't execute the hooks which means that etags aren't updated properly 2013-05-10 12:05:11 +02:00
Florin Peter 3eae26143f added test for re-share folder 2013-05-10 01:00:24 +02:00
Florin Peter 15845bf0bf fix for autotest.sh 2013-05-09 23:22:46 +02:00
Florin Peter 18a821b1e3 added helper 2013-05-09 23:22:22 +02:00
Florin Peter de855ac31b improved tests and include helper 2013-05-09 19:37:26 +02:00
Florin Peter e25aa78caf added helper class and moved hook registration to it 2013-05-09 19:36:18 +02:00
Sam Tuke 163fe64016 Fixes to code formatting and indentation 2013-05-09 18:24:07 +02:00
Sam Tuke 92e28839ff Improvements to code formatting & indentation 2013-05-09 18:16:59 +02:00
Sam Tuke 3003dd46d1 Implemented initial recoveryAdmin functionality in crypto file proxy 2013-05-09 18:09:20 +02:00
Sam Tuke 101e037529 Fixed bugs with pre_share hook usage
Made sure new user being shared to is added to array of sharing users
2013-05-09 14:43:06 +02:00
Björn Schießle bda8187f3b rename a file if it gets restored so that it no longer exists as a version. Otherwise it can happen that the expire() function removes all other versions so that we end up with only one version which is exactly the same as the original file 2013-05-08 23:00:13 +02:00
Björn Schießle b9134dcd6a touch file relative to users file folder, otherwise the hooks will be ignored 2013-05-08 22:59:49 +02:00
Arthur Schiwon d69579f773 LDAP: fix display of numerical display names 2013-05-08 17:54:38 +02:00
Arthur Schiwon 796ee8c4c0 LDAP: Implement clear mappings functionality 2013-05-08 17:47:07 +02:00
Sam Tuke 28866de44b Added pre_share hook
Switched it for post_share hook in encryption hooks
Stop a file from being shared if the encryption procedure fails for any users
2013-05-08 16:22:08 +02:00
Arthur Schiwon 3f1717d3d5 LDAP: implement UUID and internal username override 2013-05-08 14:56:52 +02:00
Arthur Schiwon c9b3da5bbc LDAP: better variable name 2013-05-08 14:55:56 +02:00
Arthur Schiwon bc23010670 LDAP: implement r+w for new settings 2013-05-08 14:05:08 +02:00
Arthur Schiwon c18158906c LDAP: add settings for UUID override 2013-05-08 13:57:21 +02:00
Florin Peter fdc49e7acb added test for share folder 2013-05-07 22:56:59 +02:00
Florin Peter 33fc830dd3 added test for re-share 2013-05-07 22:22:05 +02:00
Bart Visscher 175633d380 Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-app
Use === and !== in user_ldap app
2013-05-07 12:45:43 -07:00
Arthur Schiwon 498eae49b1 LDAP: prepare settings for internal username attribute and clearing user mappings 2013-05-07 19:31:51 +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
Arthur Schiwon 68ecee9771 LDAP: Coypright info 2013-05-07 18:23:49 +02:00
Sam Tuke 763c8f78ed Made code formatting of new methods more consistent 2013-05-07 17:16:16 +02:00
Sam Tuke 4b53f72d0d Added facility to manually encrypt all files from personal settings
Added success/fail feedback to personal settings functions
Improved look/layout of personal settings page
Fixed misplaced plain text in ajax scripts
2013-05-07 16:17:38 +02:00
Florin Peter b535964006 test for share is now able to run with autotest.sh 2013-05-07 13:43:34 +02:00
Florin Peter 8b54553872 fix for wrong file infos 2013-05-07 13:42:49 +02:00
Florin Peter a9649713d3 fix empty path 2013-05-07 13:42:08 +02:00
Morris Jobke deb0885e46 Merge pull request #3246 from owncloud/newfile-mimetype
Files: set the proper mimetype when creating a new text file
2013-05-07 01:53:43 -07:00
Florin Peter 8fcef41143 added test for share 2013-05-07 09:49:14 +02:00
Florin Peter fe6d12ddec fix file info put on stream 2013-05-06 21:15:25 +02:00
Robin Appelman 3de40f7cfb Files: set the proper mimetype when creating a new text file 2013-05-06 17:55:22 +02:00
Lukas Reschke db1e6b5f3b Use $dir instead of $fullpath 2013-05-06 14:28:01 +03:00
Lukas Reschke b13b19c58b Use the internal ownCloud view 2013-05-06 13:43:23 +03:00
Arthur Schiwon d659d8e193 LDAP: do not reset UUID attribute setting when guid is detected 2013-05-06 10:17:52 +02:00
Florin Peter 5610429a02 handling for re-share and re-unshare should work now 2013-05-05 23:41:42 +02:00
Sam Tuke c8946ea608 Added support for user-specified password for adminRecovery account in admin settings page
Made encryptAll() (file migration for unencrypted + legacy encrypted files) run only on first login for each user (status stored in DB)
Made recoveryAdmin user member of 'admin' user group automatically
Set recoveryadmin settings to only display on user settings if enabled by an admin
Updated encryption db xml schema
2013-05-04 16:14:38 +02:00
Florin Peter 9605d14a17 fixed re-share problems 2013-05-04 03:37:22 +02:00
Jenkins for ownCloud a876240b32 [tx-robot] updated from transifex 2013-05-04 02:00:54 +02:00
Björn Schießle d649f77898 make sure to find the correct path for shared files 2013-05-03 17:14:43 +02:00
Björn Schießle 050258f003 remove encryption keys if a file gets deleted permanently 2013-05-03 16:33:18 +02:00
Björn Schießle 8a1223181b disable proxys before copying files to the trash bin 2013-05-03 15:18:05 +02:00
Arthur Schiwon 1e2b872160 LDAP: cachekey in set method needs to match with that one from get 2013-05-03 15:13:37 +02:00
Bart Visscher e0f6d159d6 Merge pull request #3229 from owncloud/fix_3210
LDAP: remove restriction from group names to be in line with core behavi...
2013-05-03 06:04:24 -07:00
Bart Visscher a541b80592 Merge pull request #3222 from owncloud/fix-3218
Fix retrieving of mount points for shared storage, fix #3218
2013-05-03 06:02:33 -07:00
Arthur Schiwon 22a8e7ad55 LDAP: remove restriction from group names to be in line with core behaviour again 2013-05-03 14:11:06 +02:00
Björn Schießle a2516e549b get original path in case of shared files when restoring file from trash bin 2013-05-03 14:03:42 +02:00
Björn Schießle 996a557475 get original path in case of shared files 2013-05-03 13:00:04 +02:00
Jenkins for ownCloud 4f6565d8e7 [tx-robot] updated from transifex 2013-05-03 02:05:10 +02:00
Morris Jobke a204a46d50 Merge pull request #3212 from owncloud/stop-links
Don't display shared links if disabled
2013-05-02 15:29:00 -07:00
Michael Gapczynski 7039421efc Fix retrieving of mount points for shared storage, fix #3218 2013-05-02 17:47:11 -04:00
Frank Karlitschek 8a5e88b21c Merge pull request #3211 from owncloud/fix-2816
Fix #2816 renaming shared files
2013-05-02 00:54:09 -07:00
Michael Gapczynski 274bf3c6bd Don't display shared links if disabled 2013-05-01 20:39:02 -04:00
Michael Gapczynski 04b7a9902d Fix #2816 renaming shared files 2013-05-01 20:29:07 -04:00
Jenkins for ownCloud ee53e7b3d2 [tx-robot] updated from transifex 2013-05-02 02:19:04 +02:00
Michael Gapczynski 657ff34c6c Merge pull request #3147 from owncloud/storage-mkdir-root
Dont task external storages with creating their own root
2013-05-01 16:35:44 -07:00
Sam Tuke ba29147e34 Fixed recoveryadmin settings in user and admin settings pages (js, templates, ajax)
Renamed recovery methods in Util{} for clarity
Added note about bug causing slow page load and redundant keypair generation
recoveryAdmin functionality not yet complete
2013-05-01 19:21:01 +02:00
Frank Karlitschek db49b0aff8 Merge pull request #3202 from owncloud/swift_id
Set storage id for openstack swift backend
2013-05-01 05:28:37 -07:00
Florin Peter d3db4ee103 fixed re-share problems 2013-05-01 11:04:40 +02:00
Florin Peter 3579ba1e41 Merge branch 'master' into files_encryption
Conflicts:
	apps/user_ldap/l10n/nn_NO.php
	core/l10n/es.php
	core/l10n/et_EE.php
	core/l10n/ja_JP.php
	core/l10n/nn_NO.php
	l10n/ca/core.po
	l10n/ca/files_external.po
	l10n/ca/settings.po
	l10n/cy_GB/core.po
	l10n/cy_GB/files.po
	l10n/cy_GB/files_encryption.po
	l10n/cy_GB/files_external.po
	l10n/cy_GB/files_sharing.po
	l10n/cy_GB/files_trashbin.po
	l10n/cy_GB/lib.po
	l10n/cy_GB/settings.po
	l10n/de_DE/core.po
	l10n/es/core.po
	l10n/et_EE/core.po
	l10n/et_EE/files.po
	l10n/et_EE/settings.po
	l10n/et_EE/user_ldap.po
	l10n/gl/core.po
	l10n/it/core.po
	l10n/ja_JP/core.po
	l10n/ja_JP/settings.po
	l10n/nn_NO/core.po
	l10n/nn_NO/user_ldap.po
	l10n/pt_BR/core.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/zh_TW/files_sharing.po
	settings/l10n/et_EE.php
2013-05-01 09:31:26 +02:00
Jenkins for ownCloud 6163a85668 [tx-robot] updated from transifex 2013-05-01 02:02:59 +02:00
Florin Peter 06a5cf70f7 fix duplicate login behavior if user not setup 2013-05-01 02:01:16 +02:00
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
Robin Appelman 4c980b1a14 Set storage id for openstack swift backend 2013-05-01 00:24:34 +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
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
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
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
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 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