Commit Graph

675 Commits

Author SHA1 Message Date
Florin Peter 9605d14a17 fixed re-share problems 2013-05-04 03:37:22 +02:00
Jenkins for ownCloud 4f6565d8e7 [tx-robot] updated from transifex 2013-05-03 02:05:10 +02: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
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 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
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 4ecd62e58d improvements for test testSymmetricStreamEncryptShortFileContent
this runs currently into an infinite loop
2013-04-29 09:12:43 +02:00
Florin Peter 4a63faf64b speed improvement 2013-04-29 01:43:59 +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
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
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
Florin Peter d017bbb065 fix share for renamed or moved files 2013-04-25 23:24:07 +02:00
Florin Peter 8ee7959092 implement postRename
@samtuke no need anymore for fixPartialFilePath this is now handled by rename
share-keys are now handled properly
webdav .part files are handled properly
2013-04-25 22:49:47 +02:00
Florin Peter 328dea93c7 webdav fix for file chunking
upload with big files should now work
@samtuke and @schiesbn we need a solution for the cache files created by webdav
2013-04-25 20:23:54 +02:00
Florin Peter 11d0eef8cc fixed webdav errors, now webdav up - and downloads are full working 2013-04-25 15:21:11 +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
Florin Peter 170d09203f fixed file_proxy handling 2013-04-25 14:56:11 +02:00
Florin Peter f8819f54c2 Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption 2013-04-23 19:09:01 +02:00
Florin Peter baa6fd639f improved file size handling 2013-04-23 19:08:52 +02:00
Sam Tuke b7d8da87d0 Development snapshot
working on stream handling (large files) in Util->encryptAll()
2013-04-23 18:41:01 +02:00
Sam Tuke c6bfc7315b Stream writing improved: working with dolphin + kate, gedit & nautilus give errors, suspect those issues are clientside
.part file paths fixed in stream{}
2013-04-23 17:36:35 +02:00
Sam Tuke 4aa80d02be Merge branch 'master' into files_encryption 2013-04-23 14:13:40 +02:00
Sam Tuke a1d241783e Updated buglist 2013-04-23 14:12:28 +02:00
Florin Peter 8ab9433fdf fix wrong file path in proxy 2013-04-22 18:54:23 +02:00
Florin Peter 2827004634 Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption 2013-04-22 18:51:11 +02:00
Florin Peter 37c7205941 fix wrong file path in util 2013-04-22 18:50:59 +02:00
Björn Schießle a4364a93d0 delete all share keys if a file gets deleted 2013-04-22 15:29:58 +02:00
Björn Schießle b5cb5dab51 fix encryption to owncloud user for public link shares 2013-04-22 14:30:10 +02:00
Björn Schießle b57478fa27 fix comment, remove unused variable 2013-04-22 14:14:28 +02:00
Björn Schießle bcb2e87846 check if the item source was shared to me to decide if it is a re-share or not. Re-sharing of encrypted files should work now, we might still need to test some corner cases 2013-04-22 14:13:59 +02:00
Björn Schießle 1705938848 removed some leftover code; use already existing var for path to users file folder 2013-04-22 12:32:38 +02:00
Florin Peter eade87dc79 Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption 2013-04-22 12:32:35 +02:00
Florin Peter f6ac34afea improved handling for getSharingUsersArray 2013-04-22 12:25:55 +02:00
Björn Schießle 8a46e809f0 remove util::getPaths(), this function was broken and is replaced my util::getAllFiles(). When unsharing a folder only remove the share key for sub files if the user really no longer have access to the file. Can happen that a sub-file/-folder is shared to a group the user is a member of or explicitly once more to the same user 2013-04-22 12:22:07 +02:00
Björn Schießle 8790ceba25 Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption 2013-04-22 11:59:26 +02:00
Björn Schießle a2ba3c8a43 fix sharing of folders. First we need to collect all files. Than we need to find all users with access to the file because this can vary from file to file and than we can encrypt it for all recipients 2013-04-22 11:58:39 +02:00
Florin Peter 6b47da10be improved rename and file size support
fix missing user_id on write
2013-04-22 04:40:49 +02:00
FlorinPeter 9a0b73070c Merge pull request #2992 from FlorinPeter/files_encryption
fix for trashbin
2013-04-20 05:35:29 -07:00
Björn Schießle 12785b93f1 make sure that all share keys get deleted if a file/folder gets unshared from a user/group 2013-04-19 13:17:08 +02:00
Florin Peter 0e1970438b fixed incorrect filesize, download via web is now possible
fixed broken file-info
2013-04-18 22:34:22 +02:00
Björn Schießle 2bd338c49f getUsersSharingFile() no longer needed, use getSharingUsersArray() instead; fix filterShareReadyUsers() to return the correct results 2013-04-18 20:02:27 +02:00
Björn Schießle 5a7a64df08 Session needs filesystem view as parameter; use getSharingUsersArray(), this function also adds the owner to the list 2013-04-18 20:00:45 +02:00
Björn Schießle 935d039860 necessary changes in util.php after the changes in \OCP\Share::getUsersSharingFile() (fe58e4b1a6) 2013-04-18 17:53:59 +02:00
Björn Schießle 39c717b24c some fixes to the keymanager class to identify the file owner and the owner path correctly. 2013-04-18 17:52:27 +02:00
Björn Schießle 1df36e0c88 rename $shareFilePath to $path to avoid confusions, it is not about paths to share files but about general path to files stored in ownCloud 2013-04-18 16:39:00 +02:00
Björn Schießle 40905c8941 fix file sharing, sharing files works now; moved the identification of file owner and the owner path in the keymanager functions so that other functions doesn't have to deal with it 2013-04-18 16:34:23 +02:00
Björn Schießle 7892fddcb9 remove ToDo, every time the file key gets encrypted new share keys are generated and a new encrypted filekey. We always need to use the latest share-keys and encrypted keyfiles 2013-04-18 15:44:57 +02:00
Björn Schießle bd3024242f always save key file, the key doesn't change but the encrypted keyfile change always the same way like the share-keys change 2013-04-18 15:42:28 +02:00
Björn Schießle a646a1169f return filename relative to users file dir and not relative to data dir 2013-04-18 13:41:21 +02:00
Florin Peter 2434739d69 fix for trashbin 2013-04-18 02:03:03 +02:00
Sam Tuke 6dd8c79461 Development snapshot
Working on stream{} write
2013-04-17 17:20:37 +02:00
Sam Tuke f89a3604aa Working on stream{} writing
Development snapshot
2013-04-16 18:29:22 +02:00
Sam Tuke 770dcbf663 Fixed stream{} reading of encrypted files (stream_read()) 2013-04-16 14:53:54 +02:00
Sam Tuke b4dd6ae36c Merge pull request #2885 from FlorinPeter/files_encryption
fix performance issues
2013-04-16 04:25:59 -07:00
Sam Tuke f378a7f572 Fixed proxy class handing of read / write files
Various work on other classes
2013-04-16 13:22:16 +02:00
Jenkins for ownCloud 19afc216cf [tx-robot] updated from transifex 2013-04-13 02:15:54 +02:00
Björn Schießle 854b920787 fix some more paths 2013-04-12 15:18:19 +02:00
Björn Schießle 02d1f86a53 fix some confusion about paths relative to the files dir and to the data dir 2013-04-12 14:30:02 +02:00
Björn Schießle f87229ddaf fix stream wrapper to make initial encryption work 2013-04-12 14:13:38 +02:00
Florin Peter 8f0bbdc5cb fix performance issues 2013-04-11 22:55:48 +02:00
Björn Schießle c3a284569b make sure that public-keys dir exists 2013-04-10 16:46:02 +02:00
Björn Schießle 4303d6318e Session expect OC_FilesystemView() 2013-04-10 15:31:19 +02:00
Björn Schießle fff979a590 add $view as parameter for getFileKey() call 2013-04-10 15:14:44 +02:00
Björn Schießle 98de385b8a add $view as parameter for session constructor 2013-04-10 15:08:28 +02:00
Sam Tuke 109fe198c3 Added info about filesystem method access conventions 2013-04-09 19:19:27 +02:00
Sam Tuke 400cf5beb3 Fixed naming bug of public owncloud key dir, which caused new keypair to be generated on each pageload 2013-04-09 19:11:38 +02:00
Sam Tuke 14451bdaf0 Development snapshot;
Fixed errors from Hooks::login();
Work on enable/disable recoveryAdmin for lost passwords in settings page (template, ajax, js);
Work on fixing sharing files to users (still broken);
2013-03-29 21:11:29 +01:00
Sam Tuke ff6f52d5ec Merge branch 'master' into files_encryption
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/keymanager.php
2013-03-28 18:39:12 +01:00
Sam Tuke 9ecfd07f23 Added ajax scripts for setting pwd recovery preferences 2013-03-28 18:29:18 +01:00
Björn Schießle e717f7150e check for dir in deleteFileKey() and delShareKey(), to always handle all share keys and file keys on delete 2013-03-26 16:52:58 +01:00
Björn Schießle 73157133e8 reuse function provided in util.php 2013-03-26 16:22:26 +01:00
Björn Schießle 6beeb2466f also delete share keys if a different user than the owner deletes a shared file 2013-03-26 16:17:26 +01:00
Björn Schießle b1d620300e delete share keys if file gets deleted 2013-03-26 14:22:18 +01:00
Björn Schießle 5f233ee814 get the correct paths and owner to access shared files 2013-03-26 12:40:31 +01:00
Björn Schießle a65d741a3f move getUidAndFilename() tu util.php 2013-03-26 12:39:55 +01:00
Björn Schießle 890f0142a2 get shared keys from new location 2013-03-26 12:24:04 +01:00
Björn Schießle 5995b6996b always call stripUserFilesPath(), we need to keep the Shared/ to find the correct owner of the file later 2013-03-26 12:23:28 +01:00
Björn Schießle f10be4ea17 new file structure for share keys; sub-folder need to be generated each by one (we don't have a recursive mkdir) 2013-03-26 11:58:54 +01:00
Sam Tuke fd4e59b748 Added method for setting user keyfile recovery preference
Fixed method for checking if keyfile recovery is enabled for a user
Added unit test for above 2 methods
Made proxy{} always use sharing
Made proxy{} work regardless of sharing API enabled or not
Implemented proxy-based sharing to admin if user keyfile recovery is enabled
2013-03-20 19:26:59 +01:00
Jenkins for ownCloud 63e3f978ab [tx-robot] updated from transifex 2013-03-20 00:02:44 +01:00
Sam Tuke c89fd49870 Improved folder creation code
Created stub method for checking user pwd recovery preference from db
Added pwd recovery column to db
Added comments
2013-03-19 19:53:15 +01:00
Jenkins for ownCloud 63ca84e7bc [tx-robot] updated from transifex 2013-03-19 00:05:52 +01:00
Jenkins for ownCloud 0c123ebf9d [tx-robot] updated from transifex 2013-03-15 00:06:36 +01:00
Jenkins for ownCloud f3a2daaa9d [tx-robot] updated from transifex 2013-03-13 00:06:21 +01:00
Sam Tuke c1f1fbda08 Fixed stream wrapper bugs
Switched encryptAll() to use stream-based instead of file-at-a-time encryption
Development snapshot
2013-03-09 19:18:34 +01:00
Tom Needham dfbf57207d Merge pull request #1584 from owncloud/ocs_multiple_methods
Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
2013-03-09 16:59:13 -08:00
Tom Needham e58dbd46fc Merge in master 2013-03-09 00:04:33 +00:00
Jenkins for ownCloud 0629ff4dd9 [tx-robot] updated from transifex 2013-03-09 00:06:34 +01:00
Jenkins for ownCloud 97222b1de5 [tx-robot] updated from transifex 2013-03-07 00:16:59 +01:00
Tom Needham 370f202251 Rebase to current master 2013-03-05 00:25:56 +00:00
Björn Schießle f2b86d0227 make sure that $this->userId is initialized before using it as a parameter 2013-03-04 17:58:56 +01:00
Björn Schießle e65e6a12f1 define key size in constructor, otherwise the key size will depend on the servers openssl conf 2013-03-04 15:33:38 +01:00
Bernhard Posselt 10b108ed8a Merge pull request #2030 from j-ed/master
suppress log messages like `include path for class ... starts with "apps/"`
2013-03-04 12:59:39 -08:00
j-ed 5352f1e65b Update app.php
suppress log messages like `include path for class \"OCA\\Encryption\\Crypt\" starts with \"apps\/\"`.
2013-03-02 12:18:28 +01:00
Lukas Reschke 7f8eddffe4 [files_encryption] Use p() instead of echo() 2013-02-27 21:20:37 +01:00
Sam Tuke 0bc7d3bcf8 Added notes where to reuse old keys instead of generating new ones 2013-02-27 18:50:57 +00:00
Sam Tuke 953319a2c3 Made proxy class reuse existing keyfiles not gen new ones;
Added notes about reusing shareKeys
2013-02-27 18:46:44 +00:00
Sam Tuke 69bc42f920 Deleting encrypted files with missing keyfiles/shareKeys now succeeds 2013-02-27 16:15:03 +00:00
Sam Tuke 14eae441eb Unsharing a single file now works 2013-02-27 15:31:23 +00:00
Sam Tuke aae9b0b1bf Started work on post unshare hook
Development snapshot
2013-02-26 18:33:31 +00:00
Sam Tuke 4550ae6a69 Shared encrypted files now readable by both sharer and sharee 2013-02-26 18:11:29 +00:00
Lukas Reschke c94974cb97 Add missing echo 2013-02-26 16:10:52 +01:00
Björn Schießle ca1b94d890 make sure that home folders are mounted correctly before write/read keyfile 2013-02-25 12:29:07 +01:00
Björn Schießle 31c434b795 the default should be to encrypt all files if the user/admin doesn't specify a blacklist explicitely 2013-02-22 16:08:08 +01:00
Björn Schießle 40efeb9187 isSharedFile() doesn't detect all shares, just use getUsersSharingFile() directly either you get a list of users or not 2013-02-22 16:02:27 +01:00
Jenkins for ownCloud dcd93a53e4 [tx-robot] updated from transifex 2013-02-21 00:15:58 +01:00
Sam Tuke 2d267501a1 Development snapshot
Added comments
Added methods
2013-02-20 19:18:00 +00:00
Sam Tuke 1b880f2f96 Moved dependencies out of Crypt methods (encKeyfileToMultipleUsers)(DI)
Fixed bug preventing sharing with users other than 'ownCloud'
Added comments
Moved functionality into filterShareReadyUsers()
Other changes
2013-02-19 19:16:50 +00:00
Sam Tuke 14ae373dfe Fixed wrong array key reference 2013-02-19 17:42:37 +00:00
Björn Schießle fd629983fa remove debug output 2013-02-19 17:10:32 +01:00
Björn Schießle 109fee7673 remove todo, it is already solved 2013-02-19 14:47:45 +01:00
Jenkins for ownCloud 76c4dc6296 [tx-robot] updated from transifex 2013-02-19 00:06:51 +01:00
Jenkins for ownCloud c8e7b14ab3 [tx-robot] updated from transifex 2013-02-17 00:26:17 +01:00
Jenkins for ownCloud b169073169 [tx-robot] updated from transifex 2013-02-15 00:06:50 +01:00
Björn Schießle 8c35bbcba7 remove debug output, fix typo in file names 2013-02-14 16:33:57 +01:00
Bart Visscher cd35d257bb Fix NoSpaceAfterComma and SpaceBeforeComma 2013-02-14 08:36:26 +01:00
Jenkins for ownCloud bfe6334cd9 [tx-robot] updated from transifex 2013-02-14 00:06:51 +01:00
Björn Schießle 5005195db0 create keypair for ownCloud with empty passphrase, will be used for public link shares 2013-02-13 17:57:45 +01:00
Björn Schießle 9356f9a6bf add post_unshareALll hook, update recursively all keyfiles if a folder was shared/unshared 2013-02-13 17:23:27 +01:00
Björn Schießle 4952dfe956 add post_unshare hook, also add public link shares to the list of user with access to a file 2013-02-13 14:56:39 +01:00
Björn Schießle a692264fa4 add option to keep duplicates in the list of users with access to a file, e.g. for the unshare operation we need to know if access was granted more than once, for example as group share and as individual share 2013-02-12 17:00:33 +01:00
Björn Schießle d1bbb30385 also find users with access to the file if a folder above the actual file was already shared 2013-02-12 16:48:04 +01:00
Björn Schießle 1e5d03da80 use right location of the file is the source and not the target it is shared to 2013-02-12 12:45:54 +01:00
Björn Schießle 8eef919a75 take group shares into account if we retrieve the list a all recipients 2013-02-12 12:08:34 +01:00
Björn Schießle 5a64c96d06 go back to preUnshare hooks since sharing doesn't trigger post unshare hooks 2013-02-11 15:13:42 +01:00
Björn Schießle 9b49832090 unshare all should work the same like unshare single users 2013-02-11 13:50:11 +01:00
Björn Schießle 3e3cee98c8 - moved the enrcyption of the filekey ifg file gets shared from the post shared hook to
Crypt::encKeyfileToMultipleUsers() because this can be reused if files get unshared
- switch from preUnshare hook to postUnshare hook because afterward we can simply get the
  updated list of users with access to the file and call Crypt::encKeyfileToMultipleUsers()
2013-02-11 13:28:37 +01:00
Björn Schießle 2787aafae6 added some TODOs 2013-02-11 12:12:21 +01:00
Sam Tuke d17d838ecc Updated specfile 2013-02-11 10:34:23 +00:00
Sam Tuke 92f06243be Implementing sharing support
New file-specific methods in lib/public/share
Changes to how keyfiles are stored
2013-02-11 10:21:23 +00:00
Tom Needham f141f8b523 Add further capabilities to /cloud/capabilitites api call 2013-02-10 14:42:23 +01:00
Sam Tuke b3e59ca1e3 Work on post_share hook for files_encryption
New method in OCP\Share{}:: getUsersSharingFile()
Development shapshot
2013-02-09 18:39:32 +00:00
Jenkins for ownCloud 68fa0b7dcc [tx-robot] updated from transifex 2013-02-13 00:05:40 +01:00
Jenkins for ownCloud 8d9352a40d [tx-robot] updated from transifex 2013-02-12 15:12:46 +01:00
Jenkins for ownCloud fb23ac3ce2 [tx-robot] updated from transifex 2013-02-12 00:21:45 +01:00
Jenkins for ownCloud 39d19a9274 [tx-robot] updated from transifex 2013-02-11 15:42:41 +01:00
Robin Appelman ad360296b9 Update tests and apps to the new \OC\Files\Filesystem::init signature 2013-02-11 11:06:09 +01:00
Jenkins for ownCloud 04146f2059 [tx-robot] updated from transifex 2013-02-11 00:04:49 +01:00
Jenkins for ownCloud f7d898d835 [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
Thomas Müller 7f58e27495 cleanup - more to come after 2013-02-09 18:01:38 +01:00
Sam Tuke 1aba986d9f Fixed bug causing nested file read over webdav to fail 2013-02-09 12:42:18 +00:00
Sam Tuke b95bc663af Merge branch 'master' into files_encryption-style-fixes
Conflicts:
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/util.php
2013-02-09 11:52:11 +00:00
Jenkins for ownCloud e5c05e9674 [tx-robot] updated from transifex 2013-02-09 00:14:08 +01:00
Jenkins for ownCloud 59249ebc0c [tx-robot] updated from transifex 2013-02-08 00:13:16 +01:00
Jenkins for ownCloud 35bd7a400d [tx-robot] updated from transifex 2013-02-07 00:11:04 +01:00
Sam Tuke 954a627483 Added comment 2013-02-06 18:24:35 +00:00
Sam Tuke 2b07afc8ab Removed debugging code 2013-02-06 17:59:47 +00:00
Sam Tuke a3289d3991 Merge branch 'master' into files_encryption 2013-02-06 15:08:53 +00:00
Sam Tuke 6870add18f Development snapshot 2013-02-06 15:08:36 +00:00
Sam Tuke 16a5ace434 Fixed bug causing encrypted files to be doubly encrypted at login
Added comments and docblocks
2013-02-06 14:30:40 +00:00
Jenkins for ownCloud 335b6cd060 [tx-robot] updated from transifex 2013-02-06 00:06:28 +01:00
Sam Tuke 3b9e2f1bab Merge branch 'master' into files_encryption-style-fixes
Conflicts:
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/keymanager.php
2013-02-05 18:43:55 +00:00
Sam Tuke a528f96b84 Merge branch 'master' into files_encryption-style-fixes 2013-02-05 18:23:03 +00:00
Sam Tuke 20b1d12cbf Fixed comment typo, wrapped return value conditional on var assignment in session{} 2013-02-05 17:28:26 +00:00
Sam Tuke 4ba0ab7f65 Added missing translation wrapping 2013-02-05 17:22:59 +00:00
Sam Tuke b84e83261e Added notice to personal settings indicating what filetypes are not encrypted 2013-02-05 17:06:15 +00:00
Sam Tuke 680c5b3dad Removed debugging output 2013-02-05 16:11:50 +00:00
Sam Tuke 221b69dd0e Fixed bug relating to Filesystem{} that prevented webdav logins with files_encryption 2013-02-05 16:09:01 +00:00
Sam Tuke a1f200c1e5 Cleaned up path formatting with new method stripUserFilesPath() 2013-02-05 15:59:28 +00:00
Sam Tuke 53248a9b60 Recryption of legacy encrypted files now working on login 2013-02-05 15:35:29 +00:00
Sam Tuke fd90b82acd Merge github.com:owncloud/core 2013-02-05 13:44:45 +00:00
Sam Tuke 927d4c98a1 Fixed todos: undefined vars and unreachable code 2013-02-05 13:12:34 +00:00
Jenkins for ownCloud 98f37f4bed [tx-robot] updated from transifex 2013-02-05 00:20:29 +01:00
Jenkins for ownCloud 2936140838 [tx-robot] updated from transifex 2013-02-03 00:06:15 +01:00
Jenkins for ownCloud b29b55a332 [tx-robot] updated from transifex 2013-02-02 00:08:15 +01:00
Sam Tuke 0677d56ee2 Added debugging output relating to recrypting legacy files 2013-02-01 19:31:15 +00:00
Sam Tuke 06847f609b Improved support for detecting and recrypting legacy files. Bugs remain. 2013-01-31 19:40:51 +00:00
Sam Tuke c6b3bdd5a0 Fixed compatibility with filecache rewrite merge 2013-01-31 17:51:46 +00:00
Sam Tuke 2183f77527 Fixed incompatibilities with filecache rewrite merge 2013-01-31 16:49:07 +00:00
Sam Tuke 31e723a907 Merge github.com:owncloud/core
Conflicts:
	lib/public/share.php
2013-01-31 16:30:37 +00:00
Jenkins for ownCloud 209d599ec5 [tx-robot] updated from transifex 2013-01-31 17:05:21 +01:00
Jenkins for ownCloud 00a30e6651 [tx-robot] updated from transifex 2013-01-31 00:31:28 +01:00
Sam Tuke c7b1bdf00e Fixed handling of keyfile subdir creation
Improved keyfile subdir deletion (1 bug remains here)
2013-01-30 18:52:02 +00:00
Sam Tuke 61b23ce6cc Working on support for deleting directories (removing all keyfiles) 2013-01-30 17:25:17 +00:00
Thomas Mueller 8ded07dd5c first style fixes - @samtuke: I added some TODO regarding undefined variables and unreachable code - please review 2013-01-30 17:49:05 +01:00
Jenkins for ownCloud 68266e70f2 [tx-robot] updated from transifex 2013-01-30 00:25:41 +01:00
Sam Tuke c1f20fe37a Made encyrption keyfiles be deleted when their parents are
Made encryption keyfiles be renamed when their parents are
Fixed bugs with encryptAll() execution on login
2013-01-29 19:54:40 +00:00
Jenkins for ownCloud 8c4931a645 [tx-robot] updated from transifex 2013-01-29 00:06:20 +01:00
Jenkins for ownCloud b655444709 [tx-robot] updated from transifex 2013-01-28 00:05:43 +01:00
Jenkins for ownCloud 00a28062e1 [tx-robot] updated from transifex 2013-01-27 00:06:21 +01:00
Jenkins for ownCloud af4411e33d [tx-robot] updated from transifex 2013-01-26 00:10:07 +01:00
Jenkins for ownCloud 6832dddf39 [tx-robot] updated from transifex 2013-01-25 00:05:56 +01:00
Sam Tuke 094213e231 Fixed many coding guidelines issues
Continued work on upgrade path via login hook listener
New spec file with notes
2013-01-24 18:37:34 +00:00
Thomas Mueller ef88ceba8c drop SimpleTest compatibility 2013-01-24 16:47:17 +01:00
Jenkins for ownCloud 3ff32eba25 [tx-robot] updated from transifex 2013-01-24 00:07:38 +01:00
Sam Tuke 59ca312263 Work on util: findFiles() and encryptAll(); both close to working
Ecnryption unit tests are failing, recursion in filecache{}
2013-01-23 19:24:26 +00:00
Sam Tuke cd832935e8 Merge branch 'files_encryption' 2013-01-23 12:54:09 +00:00
Jenkins for ownCloud c986dbe573 [tx-robot] updated from transifex 2013-01-23 00:06:18 +01:00
Sam Tuke 47592657d7 Added localisation for encryption settings 2013-01-22 17:15:03 +00:00
Sam Tuke 619780a67d Merge branch 'master' into files_encryption 2013-01-22 16:50:20 +00:00
Sam Tuke d95fc4e1e3 Adding sharing support: added new method in Keymanager setShareKey()
Added notes in proxy{} and stream{} pointing to share support
2013-01-14 19:07:28 +00:00
Sam Tuke 1641ed8ac7 Merge branch 'master' into files_encryption 2013-01-14 16:54:25 +00:00
Sam Tuke e9f3c5feea Added creation of dir for shared file env encryption keys
Added comment to use multiKeyEncrypt
2013-01-14 15:39:04 +00:00
Sam Tuke 3fbf362ba2 Removed debugging comments 2013-01-14 12:36:46 +00:00
Jenkins for ownCloud d03dce1283 [tx-robot] updated from transifex 2013-01-11 00:06:14 +01:00
Sam Tuke fed74eda1c Removed old and unnecessary comments 2013-01-10 18:48:40 +00:00
Sam Tuke 2e30641caa Removed misleading crypto gen comment 2013-01-10 18:19:37 +00:00
Sam Tuke 9ca9124dc1 Merge branch 'master' into files_encryption 2013-01-10 18:07:15 +00:00
Sam Tuke 61104d1441 Re-added 'checkAdminUser'
Improved code formatting
2013-01-10 18:04:52 +00:00
Jenkins for ownCloud 912050afa0 [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
Sam Tuke 015787fbb3 All in-use unit tests now passing after merge 2013-01-06 18:38:35 +00:00
Sam Tuke 2d98afa1ea Removed debugging line 2013-01-06 14:06:22 +00:00
Sam Tuke b024db9f98 Made Keymanager::getFileKey() dependencies explicit, fixed client code and tests accordingly 2013-01-06 13:56:45 +00:00
Sam Tuke 7fe9245636 Development snapshot
Crypt{} & Util{} unit tests now passing locally
Added keymanager unit tests
2013-01-05 17:12:23 +00:00
Sam Tuke 665261dc9a Development snapshot, mocking out Session{} for crypt unit tests 2013-01-02 19:29:22 +00:00
Sam Tuke bf69677933 Merge branch 'master' into files_encryption
Conflicts:
	apps/files/css/files.css
	apps/files/index.php
	apps/files/js/files.js
	apps/files/js/keyboardshortcuts.js
	apps/files/l10n/da.php
	apps/files/l10n/el.php
	apps/files/l10n/eu.php
	apps/files/l10n/hu_HU.php
	apps/files/l10n/mk.php
	apps/files/l10n/nb_NO.php
	apps/files/l10n/ro.php
	apps/files/l10n/ru.php
	apps/files/l10n/ru_RU.php
	apps/files/l10n/th_TH.php
	apps/files/l10n/tr.php
	apps/files/templates/admin.php
	apps/files/templates/index.php
	apps/files/templates/part.breadcrumb.php
	apps/files_encryption/appinfo/app.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/cryptstream.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/settings.php
	apps/files_encryption/templates/settings.php
	apps/files_encryption/tests/proxy.php
	apps/files_encryption/tests/stream.php
	apps/files_external/l10n/gl.php
	apps/files_external/l10n/uk.php
	apps/files_external/personal.php
	apps/files_external/settings.php
	apps/files_external/templates/settings.php
	apps/files_sharing/public.php
	apps/user_ldap/l10n/gl.php
	apps/user_ldap/l10n/uk.php
	apps/user_ldap/lib/access.php
	apps/user_webdavauth/l10n/eo.php
	apps/user_webdavauth/l10n/eu.php
	apps/user_webdavauth/l10n/fr.php
	apps/user_webdavauth/l10n/gl.php
	apps/user_webdavauth/l10n/sl.php
	apps/user_webdavauth/l10n/tr.php
	apps/user_webdavauth/l10n/uk.php
	apps/user_webdavauth/l10n/zh_CN.php
	core/ajax/share.php
	core/css/styles.css
	core/l10n/ca.php
	core/l10n/de.php
	core/l10n/de_DE.php
	core/l10n/el.php
	core/l10n/eo.php
	core/l10n/es.php
	core/l10n/eu.php
	core/l10n/fr.php
	core/l10n/gl.php
	core/l10n/he.php
	core/l10n/is.php
	core/l10n/it.php
	core/l10n/nl.php
	core/l10n/pl.php
	core/l10n/pt_PT.php
	core/l10n/ru.php
	core/l10n/sl.php
	core/l10n/tr.php
	core/l10n/uk.php
	core/l10n/zh_CN.php
	core/templates/installation.php
	core/templates/login.php
	l10n/ar/files_external.po
	l10n/ar/settings.po
	l10n/bg_BG/files_external.po
	l10n/bg_BG/settings.po
	l10n/ca/core.po
	l10n/ca/files_external.po
	l10n/ca/settings.po
	l10n/cs_CZ/files_external.po
	l10n/cs_CZ/settings.po
	l10n/da/files.po
	l10n/da/files_external.po
	l10n/da/settings.po
	l10n/de/core.po
	l10n/de/files_external.po
	l10n/de/settings.po
	l10n/de_DE/core.po
	l10n/de_DE/files_external.po
	l10n/de_DE/settings.po
	l10n/el/core.po
	l10n/el/files.po
	l10n/el/files_external.po
	l10n/el/settings.po
	l10n/eo/core.po
	l10n/eo/files_external.po
	l10n/eo/settings.po
	l10n/eo/user_webdavauth.po
	l10n/es/core.po
	l10n/es/files_external.po
	l10n/es/settings.po
	l10n/es_AR/core.po
	l10n/es_AR/files_external.po
	l10n/es_AR/settings.po
	l10n/et_EE/files_external.po
	l10n/et_EE/settings.po
	l10n/et_EE/user_webdavauth.po
	l10n/eu/core.po
	l10n/eu/files.po
	l10n/eu/files_external.po
	l10n/eu/settings.po
	l10n/eu/user_webdavauth.po
	l10n/fa/files_external.po
	l10n/fa/settings.po
	l10n/fi_FI/files_external.po
	l10n/fi_FI/settings.po
	l10n/fr/core.po
	l10n/fr/files_external.po
	l10n/fr/settings.po
	l10n/fr/user_webdavauth.po
	l10n/gl/core.po
	l10n/gl/files_external.po
	l10n/gl/settings.po
	l10n/gl/user_ldap.po
	l10n/gl/user_webdavauth.po
	l10n/he/core.po
	l10n/he/files_external.po
	l10n/he/settings.po
	l10n/hi/files_external.po
	l10n/hi/settings.po
	l10n/hr/files_external.po
	l10n/hr/settings.po
	l10n/hu_HU/files.po
	l10n/hu_HU/files_external.po
	l10n/hu_HU/settings.po
	l10n/ia/files_external.po
	l10n/ia/settings.po
	l10n/id/files_external.po
	l10n/id/settings.po
	l10n/is/core.po
	l10n/is/files.po
	l10n/is/files_encryption.po
	l10n/is/files_external.po
	l10n/is/files_sharing.po
	l10n/is/files_versions.po
	l10n/is/lib.po
	l10n/is/settings.po
	l10n/is/user_ldap.po
	l10n/is/user_webdavauth.po
	l10n/it/core.po
	l10n/it/files_external.po
	l10n/it/settings.po
	l10n/ja_JP/core.po
	l10n/ja_JP/files_external.po
	l10n/ja_JP/settings.po
	l10n/ka_GE/files_external.po
	l10n/ka_GE/settings.po
	l10n/ko/core.po
	l10n/ko/files_external.po
	l10n/ko/settings.po
	l10n/ko/user_ldap.po
	l10n/ko/user_webdavauth.po
	l10n/ku_IQ/files_external.po
	l10n/ku_IQ/settings.po
	l10n/lb/files_external.po
	l10n/lb/settings.po
	l10n/lt_LT/files_external.po
	l10n/lt_LT/settings.po
	l10n/lv/files_external.po
	l10n/lv/settings.po
	l10n/mk/files.po
	l10n/mk/files_external.po
	l10n/mk/settings.po
	l10n/ms_MY/files_external.po
	l10n/ms_MY/settings.po
	l10n/nb_NO/files.po
	l10n/nb_NO/files_external.po
	l10n/nb_NO/settings.po
	l10n/nl/core.po
	l10n/nl/files_external.po
	l10n/nl/settings.po
	l10n/nn_NO/files_external.po
	l10n/nn_NO/settings.po
	l10n/oc/files_external.po
	l10n/oc/settings.po
	l10n/pl/core.po
	l10n/pl/files_external.po
	l10n/pl/settings.po
	l10n/pl_PL/files_external.po
	l10n/pl_PL/settings.po
	l10n/pt_BR/core.po
	l10n/pt_BR/files_external.po
	l10n/pt_BR/settings.po
	l10n/pt_PT/core.po
	l10n/pt_PT/files_external.po
	l10n/pt_PT/settings.po
	l10n/ro/files.po
	l10n/ro/files_external.po
	l10n/ro/settings.po
	l10n/ru/core.po
	l10n/ru/files.po
	l10n/ru/files_external.po
	l10n/ru/settings.po
	l10n/ru_RU/files.po
	l10n/ru_RU/files_external.po
	l10n/ru_RU/settings.po
	l10n/si_LK/files_external.po
	l10n/si_LK/settings.po
	l10n/sk_SK/core.po
	l10n/sk_SK/files_external.po
	l10n/sk_SK/settings.po
	l10n/sk_SK/user_webdavauth.po
	l10n/sl/core.po
	l10n/sl/files_external.po
	l10n/sl/settings.po
	l10n/sl/user_webdavauth.po
	l10n/sq/core.po
	l10n/sq/files_external.po
	l10n/sq/settings.po
	l10n/sq/user_ldap.po
	l10n/sq/user_webdavauth.po
	l10n/sr/core.po
	l10n/sr/files_external.po
	l10n/sr/settings.po
	l10n/sr@latin/files_external.po
	l10n/sr@latin/settings.po
	l10n/sv/files_external.po
	l10n/sv/settings.po
	l10n/ta_LK/files_external.po
	l10n/ta_LK/settings.po
	l10n/ta_LK/user_ldap.po
	l10n/ta_LK/user_webdavauth.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_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/th_TH/settings.po
	l10n/th_TH/user_webdavauth.po
	l10n/tr/core.po
	l10n/tr/files.po
	l10n/tr/files_external.po
	l10n/tr/settings.po
	l10n/tr/user_webdavauth.po
	l10n/uk/core.po
	l10n/uk/files_external.po
	l10n/uk/settings.po
	l10n/uk/user_ldap.po
	l10n/uk/user_webdavauth.po
	l10n/vi/core.po
	l10n/vi/files_external.po
	l10n/vi/settings.po
	l10n/zh_CN.GB2312/files_external.po
	l10n/zh_CN.GB2312/settings.po
	l10n/zh_CN/core.po
	l10n/zh_CN/files_external.po
	l10n/zh_CN/settings.po
	l10n/zh_CN/user_webdavauth.po
	l10n/zh_HK/core.po
	l10n/zh_HK/files_external.po
	l10n/zh_HK/settings.po
	l10n/zh_HK/user_ldap.po
	l10n/zh_HK/user_webdavauth.po
	l10n/zh_TW/core.po
	l10n/zh_TW/files_external.po
	l10n/zh_TW/settings.po
	l10n/zh_TW/user_ldap.po
	l10n/zh_TW/user_webdavauth.po
	l10n/zu_ZA/files_external.po
	l10n/zu_ZA/settings.po
	lib/base.php
	lib/filecache.php
	lib/files.php
	lib/helper.php
	lib/l10n.php
	lib/request.php
	lib/util.php
	settings/ajax/togglegroups.php
	settings/js/users.js
	settings/l10n/ar.php
	settings/l10n/de_DE.php
	settings/l10n/el.php
	settings/l10n/eo.php
	settings/l10n/es_AR.php
	settings/l10n/eu.php
	settings/l10n/fa.php
	settings/l10n/gl.php
	settings/l10n/he.php
	settings/l10n/hi.php
	settings/l10n/ko.php
	settings/l10n/si_LK.php
	settings/l10n/sk_SK.php
	settings/l10n/sl.php
	settings/l10n/sr.php
	settings/l10n/ta_LK.php
	settings/l10n/th_TH.php
	settings/l10n/tr.php
	settings/l10n/uk.php
	settings/l10n/vi.php
	settings/l10n/zh_CN.php
	settings/l10n/zh_TW.php
	settings/templates/help.php
2013-01-02 17:14:23 +00:00
Jenkins for ownCloud 329bddab48 [tx-robot] updated from transifex 2012-12-31 00:05:31 +01:00
Jenkins for ownCloud e9c51b319e [tx-robot] updated from transifex 2012-12-28 00:20:34 +01:00
Jenkins for ownCloud 27f9ea2abb [tx-robot] updated from transifex 2012-12-27 00:05:17 +01:00
Frank Karlitschek 7c5150ce32 Merge pull request #913 from owncloud/fix_settings
cleaning up the settings
2012-12-18 15:27:52 -08:00
Jenkins for ownCloud a4b0df419e [tx-robot] updated from transifex 2012-12-18 00:14:58 +01:00
Frank Karlitschek c4ecbad009 check if admin 2012-12-17 14:46:57 +01:00
Frank Karlitschek 30b0e8b70c cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-) 2012-12-15 20:02:16 +01:00
Sam Tuke 063f225a26 Merge branch 'master' into files_encryption
Encryption unit tests still failing, needs work
Conflicts:
	3rdparty/Archive/Tar.php
	3rdparty/MDB2/Driver/Datatype/Common.php
	3rdparty/MDB2/Driver/mysql.php
	3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
	3rdparty/Sabre/CalDAV/Plugin.php
	3rdparty/Sabre/CalDAV/Version.php
	3rdparty/Sabre/CardDAV/AddressBook.php
	3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
	3rdparty/Sabre/CardDAV/Plugin.php
	3rdparty/Sabre/CardDAV/Version.php
	3rdparty/Sabre/DAV/Client.php
	3rdparty/Sabre/DAV/Locks/Plugin.php
	3rdparty/Sabre/DAV/Server.php
	3rdparty/Sabre/DAV/Tree/Filesystem.php
	3rdparty/Sabre/DAV/Version.php
	3rdparty/Sabre/HTTP/BasicAuth.php
	3rdparty/Sabre/HTTP/Version.php
	3rdparty/Sabre/VObject/Component/VEvent.php
	3rdparty/Sabre/VObject/DateTimeParser.php
	3rdparty/Sabre/VObject/RecurrenceIterator.php
	3rdparty/Sabre/VObject/Version.php
	3rdparty/class.phpmailer.php
	3rdparty/class.smtp.php
	3rdparty/css/chosen-sprite.png
	3rdparty/css/chosen.css
	3rdparty/css/chosen/chosen.css
	3rdparty/fullcalendar/css/fullcalendar.css
	3rdparty/fullcalendar/css/fullcalendar.print.css
	3rdparty/fullcalendar/js/fullcalendar.js
	3rdparty/fullcalendar/js/fullcalendar.min.js
	3rdparty/fullcalendar/js/gcal.js
	3rdparty/js/chosen/VERSION
	3rdparty/js/chosen/chosen.jquery.js
	3rdparty/js/chosen/chosen.jquery.min.js
	3rdparty/openid/class.openid.v3.php
	3rdparty/openid/phpmyid.php
	3rdparty/php-cloudfiles/cloudfiles.php
	3rdparty/smb4php/smb.php
	3rdparty/timepicker/css/jquery.ui.timepicker.css
	3rdparty/timepicker/js/i18n/i18n.html
	3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js
	3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js
	3rdparty/timepicker/js/jquery.ui.timepicker.js
	3rdparty/timepicker/releases.txt
	README
	apps/files/admin.php
	apps/files/ajax/autocomplete.php
	apps/files/ajax/move.php
	apps/files/ajax/newfile.php
	apps/files/ajax/scan.php
	apps/files/ajax/timezone.php
	apps/files/ajax/upload.php
	apps/files/appinfo/filesync.php
	apps/files/appinfo/update.php
	apps/files/css/files.css
	apps/files/index.php
	apps/files/js/fileactions.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/l10n/ar.php
	apps/files/l10n/bg_BG.php
	apps/files/l10n/ca.php
	apps/files/l10n/cs_CZ.php
	apps/files/l10n/da.php
	apps/files/l10n/de.php
	apps/files/l10n/el.php
	apps/files/l10n/eo.php
	apps/files/l10n/es.php
	apps/files/l10n/es_AR.php
	apps/files/l10n/et_EE.php
	apps/files/l10n/eu.php
	apps/files/l10n/fa.php
	apps/files/l10n/fi_FI.php
	apps/files/l10n/fr.php
	apps/files/l10n/gl.php
	apps/files/l10n/he.php
	apps/files/l10n/hr.php
	apps/files/l10n/hu_HU.php
	apps/files/l10n/ia.php
	apps/files/l10n/id.php
	apps/files/l10n/it.php
	apps/files/l10n/ja_JP.php
	apps/files/l10n/ko.php
	apps/files/l10n/lb.php
	apps/files/l10n/lt_LT.php
	apps/files/l10n/lv.php
	apps/files/l10n/mk.php
	apps/files/l10n/ms_MY.php
	apps/files/l10n/nb_NO.php
	apps/files/l10n/nl.php
	apps/files/l10n/nn_NO.php
	apps/files/l10n/oc.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/ru_RU.php
	apps/files/l10n/si_LK.php
	apps/files/l10n/sk_SK.php
	apps/files/l10n/sl.php
	apps/files/l10n/sr.php
	apps/files/l10n/sr@latin.php
	apps/files/l10n/sv.php
	apps/files/l10n/th_TH.php
	apps/files/l10n/tr.php
	apps/files/l10n/uk.php
	apps/files/l10n/vi.php
	apps/files/l10n/zh_CN.GB2312.php
	apps/files/l10n/zh_CN.php
	apps/files/l10n/zh_TW.php
	apps/files/templates/admin.php
	apps/files/templates/index.php
	apps/files/templates/part.breadcrumb.php
	apps/files/templates/part.list.php
	apps/files_encryption/appinfo/app.php
	apps/files_encryption/appinfo/info.xml
	apps/files_encryption/js/settings.js
	apps/files_encryption/l10n/fa.php
	apps/files_encryption/l10n/sl.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/cryptstream.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/settings.php
	apps/files_encryption/templates/settings.php
	apps/files_encryption/tests/encryption.php
	apps/files_encryption/tests/proxy.php
	apps/files_encryption/tests/stream.php
	apps/files_external/l10n/cs_CZ.php
	apps/files_external/l10n/et_EE.php
	apps/files_external/l10n/lt_LT.php
	apps/files_external/l10n/nl.php
	apps/files_external/l10n/ru.php
	apps/files_external/l10n/sk_SK.php
	apps/files_external/l10n/sl.php
	apps/files_external/l10n/vi.php
	apps/files_external/lib/config.php
	apps/files_external/lib/ftp.php
	apps/files_external/lib/smb.php
	apps/files_external/lib/streamwrapper.php
	apps/files_external/lib/swift.php
	apps/files_external/lib/webdav.php
	apps/files_external/tests/ftp.php
	apps/files_sharing/appinfo/update.php
	apps/files_sharing/css/public.css
	apps/files_sharing/js/share.js
	apps/files_sharing/l10n/de.php
	apps/files_sharing/l10n/et_EE.php
	apps/files_sharing/l10n/ja_JP.php
	apps/files_sharing/l10n/nb_NO.php
	apps/files_sharing/l10n/ru.php
	apps/files_sharing/l10n/sl.php
	apps/files_sharing/l10n/vi.php
	apps/files_sharing/lib/share/file.php
	apps/files_sharing/lib/share/folder.php
	apps/files_sharing/lib/sharedstorage.php
	apps/files_sharing/public.php
	apps/files_sharing/templates/public.php
	apps/files_versions/l10n/et_EE.php
	apps/files_versions/l10n/lt_LT.php
	apps/files_versions/l10n/nb_NO.php
	apps/files_versions/l10n/nl.php
	apps/files_versions/l10n/ru.php
	apps/files_versions/l10n/sl.php
	apps/files_versions/l10n/vi.php
	apps/files_versions/lib/hooks.php
	apps/files_versions/lib/versions.php
	apps/user_ldap/appinfo/database.xml
	apps/user_ldap/appinfo/update.php
	apps/user_ldap/group_ldap.php
	apps/user_ldap/l10n/da.php
	apps/user_ldap/l10n/et_EE.php
	apps/user_ldap/l10n/pt_PT.php
	apps/user_ldap/l10n/sl.php
	apps/user_ldap/l10n/vi.php
	apps/user_ldap/l10n/zh_CN.php
	apps/user_ldap/lib/access.php
	apps/user_ldap/lib/connection.php
	apps/user_ldap/settings.php
	apps/user_ldap/templates/settings.php
	apps/user_ldap/tests/group_ldap.php
	apps/user_ldap/user_ldap.php
	apps/user_webdavauth/appinfo/app.php
	apps/user_webdavauth/appinfo/info.xml
	apps/user_webdavauth/settings.php
	apps/user_webdavauth/templates/settings.php
	apps/user_webdavauth/user_webdavauth.php
	autotest.sh
	core/ajax/appconfig.php
	core/ajax/share.php
	core/ajax/translations.php
	core/ajax/vcategories/add.php
	core/ajax/vcategories/delete.php
	core/ajax/vcategories/edit.php
	core/css/share.css
	core/js/eventsource.js
	core/js/js.js
	core/js/oc-vcategories.js
	core/js/share.js
	core/l10n/ar.php
	core/l10n/bg_BG.php
	core/l10n/ca.php
	core/l10n/cs_CZ.php
	core/l10n/da.php
	core/l10n/de.php
	core/l10n/el.php
	core/l10n/eo.php
	core/l10n/es.php
	core/l10n/es_AR.php
	core/l10n/et_EE.php
	core/l10n/eu.php
	core/l10n/fa.php
	core/l10n/fi_FI.php
	core/l10n/fr.php
	core/l10n/gl.php
	core/l10n/he.php
	core/l10n/hi.php
	core/l10n/hr.php
	core/l10n/hu_HU.php
	core/l10n/ia.php
	core/l10n/id.php
	core/l10n/it.php
	core/l10n/ja_JP.php
	core/l10n/ko.php
	core/l10n/ku_IQ.php
	core/l10n/lb.php
	core/l10n/lt_LT.php
	core/l10n/lv.php
	core/l10n/mk.php
	core/l10n/ms_MY.php
	core/l10n/nb_NO.php
	core/l10n/nl.php
	core/l10n/nn_NO.php
	core/l10n/oc.php
	core/l10n/pl.php
	core/l10n/pt_BR.php
	core/l10n/pt_PT.php
	core/l10n/ro.php
	core/l10n/ru.php
	core/l10n/ru_RU.php
	core/l10n/si_LK.php
	core/l10n/sk_SK.php
	core/l10n/sl.php
	core/l10n/sr.php
	core/l10n/sr@latin.php
	core/l10n/sv.php
	core/l10n/th_TH.php
	core/l10n/tr.php
	core/l10n/uk.php
	core/l10n/vi.php
	core/l10n/zh_CN.GB2312.php
	core/l10n/zh_CN.php
	core/l10n/zh_TW.php
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
	core/templates/layout.base.php
	core/templates/layout.guest.php
	core/templates/layout.user.php
	cron.php
	db_structure.xml
	files/webdav.php
	index.php
	l10n/.tx/config
	l10n/af/calendar.po
	l10n/af/contacts.po
	l10n/af/core.po
	l10n/af/files.po
	l10n/ar/calendar.po
	l10n/ar/contacts.po
	l10n/ar/core.po
	l10n/ar/files.po
	l10n/ar/files_encryption.po
	l10n/ar/lib.po
	l10n/ar/media.po
	l10n/ar/settings.po
	l10n/ar_SA/core.po
	l10n/ar_SA/files.po
	l10n/bg_BG/calendar.po
	l10n/bg_BG/contacts.po
	l10n/bg_BG/core.po
	l10n/bg_BG/files.po
	l10n/bg_BG/lib.po
	l10n/bg_BG/media.po
	l10n/bg_BG/settings.po
	l10n/ca/calendar.po
	l10n/ca/contacts.po
	l10n/ca/core.po
	l10n/ca/files.po
	l10n/ca/gallery.po
	l10n/ca/lib.po
	l10n/ca/settings.po
	l10n/cs_CZ/calendar.po
	l10n/cs_CZ/contacts.po
	l10n/cs_CZ/core.po
	l10n/cs_CZ/files.po
	l10n/cs_CZ/files_external.po
	l10n/cs_CZ/gallery.po
	l10n/cs_CZ/lib.po
	l10n/cs_CZ/settings.po
	l10n/da/calendar.po
	l10n/da/contacts.po
	l10n/da/core.po
	l10n/da/files.po
	l10n/da/lib.po
	l10n/da/settings.po
	l10n/da/user_ldap.po
	l10n/de/calendar.po
	l10n/de/contacts.po
	l10n/de/core.po
	l10n/de/files.po
	l10n/de/files_sharing.po
	l10n/de/gallery.po
	l10n/de/lib.po
	l10n/de/settings.po
	l10n/de_DE/core.po
	l10n/de_DE/files.po
	l10n/de_DE/settings.po
	l10n/el/calendar.po
	l10n/el/contacts.po
	l10n/el/core.po
	l10n/el/files.po
	l10n/el/gallery.po
	l10n/el/lib.po
	l10n/el/settings.po
	l10n/eo/calendar.po
	l10n/eo/contacts.po
	l10n/eo/core.po
	l10n/eo/files.po
	l10n/eo/lib.po
	l10n/eo/media.po
	l10n/eo/settings.po
	l10n/es/calendar.po
	l10n/es/contacts.po
	l10n/es/core.po
	l10n/es/files.po
	l10n/es/gallery.po
	l10n/es/lib.po
	l10n/es/settings.po
	l10n/es_AR/core.po
	l10n/es_AR/files.po
	l10n/es_AR/lib.po
	l10n/es_AR/settings.po
	l10n/et_EE/calendar.po
	l10n/et_EE/contacts.po
	l10n/et_EE/core.po
	l10n/et_EE/files.po
	l10n/et_EE/files_external.po
	l10n/et_EE/files_sharing.po
	l10n/et_EE/files_versions.po
	l10n/et_EE/lib.po
	l10n/et_EE/settings.po
	l10n/et_EE/user_ldap.po
	l10n/eu/calendar.po
	l10n/eu/contacts.po
	l10n/eu/core.po
	l10n/eu/files.po
	l10n/eu/lib.po
	l10n/eu/settings.po
	l10n/eu_ES/core.po
	l10n/eu_ES/files.po
	l10n/fa/calendar.po
	l10n/fa/contacts.po
	l10n/fa/core.po
	l10n/fa/files.po
	l10n/fa/files_encryption.po
	l10n/fa/lib.po
	l10n/fa/settings.po
	l10n/fi/core.po
	l10n/fi/files.po
	l10n/fi_FI/calendar.po
	l10n/fi_FI/contacts.po
	l10n/fi_FI/core.po
	l10n/fi_FI/files.po
	l10n/fi_FI/gallery.po
	l10n/fi_FI/lib.po
	l10n/fi_FI/settings.po
	l10n/fr/calendar.po
	l10n/fr/contacts.po
	l10n/fr/core.po
	l10n/fr/files.po
	l10n/fr/gallery.po
	l10n/fr/lib.po
	l10n/fr/media.po
	l10n/fr/settings.po
	l10n/gl/calendar.po
	l10n/gl/contacts.po
	l10n/gl/core.po
	l10n/gl/files.po
	l10n/gl/lib.po
	l10n/gl/settings.po
	l10n/he/calendar.po
	l10n/he/contacts.po
	l10n/he/core.po
	l10n/he/files.po
	l10n/he/lib.po
	l10n/he/settings.po
	l10n/hi/core.po
	l10n/hi/files.po
	l10n/hi/lib.po
	l10n/hi/settings.po
	l10n/hr/calendar.po
	l10n/hr/contacts.po
	l10n/hr/core.po
	l10n/hr/files.po
	l10n/hr/lib.po
	l10n/hr/settings.po
	l10n/hu_HU/calendar.po
	l10n/hu_HU/contacts.po
	l10n/hu_HU/core.po
	l10n/hu_HU/files.po
	l10n/hu_HU/lib.po
	l10n/hu_HU/settings.po
	l10n/hy/calendar.po
	l10n/hy/contacts.po
	l10n/hy/core.po
	l10n/hy/files.po
	l10n/ia/calendar.po
	l10n/ia/contacts.po
	l10n/ia/core.po
	l10n/ia/files.po
	l10n/ia/lib.po
	l10n/ia/settings.po
	l10n/id/calendar.po
	l10n/id/contacts.po
	l10n/id/core.po
	l10n/id/files.po
	l10n/id/files_encryption.po
	l10n/id/files_external.po
	l10n/id/files_sharing.po
	l10n/id/files_versions.po
	l10n/id/lib.po
	l10n/id/settings.po
	l10n/id/user_ldap.po
	l10n/id_ID/core.po
	l10n/id_ID/files.po
	l10n/it/calendar.po
	l10n/it/contacts.po
	l10n/it/core.po
	l10n/it/files.po
	l10n/it/gallery.po
	l10n/it/lib.po
	l10n/it/settings.po
	l10n/ja_JP/calendar.po
	l10n/ja_JP/contacts.po
	l10n/ja_JP/core.po
	l10n/ja_JP/files.po
	l10n/ja_JP/files_sharing.po
	l10n/ja_JP/lib.po
	l10n/ja_JP/settings.po
	l10n/ko/calendar.po
	l10n/ko/contacts.po
	l10n/ko/core.po
	l10n/ko/files.po
	l10n/ko/lib.po
	l10n/ko/settings.po
	l10n/ku_IQ/core.po
	l10n/ku_IQ/files.po
	l10n/ku_IQ/lib.po
	l10n/ku_IQ/settings.po
	l10n/lb/calendar.po
	l10n/lb/contacts.po
	l10n/lb/core.po
	l10n/lb/files.po
	l10n/lb/lib.po
	l10n/lb/settings.po
	l10n/lt_LT/calendar.po
	l10n/lt_LT/contacts.po
	l10n/lt_LT/core.po
	l10n/lt_LT/files.po
	l10n/lt_LT/files_external.po
	l10n/lt_LT/files_versions.po
	l10n/lt_LT/lib.po
	l10n/lt_LT/settings.po
	l10n/lv/core.po
	l10n/lv/files.po
	l10n/lv/lib.po
	l10n/lv/settings.po
	l10n/mk/calendar.po
	l10n/mk/contacts.po
	l10n/mk/core.po
	l10n/mk/files.po
	l10n/mk/lib.po
	l10n/mk/settings.po
	l10n/ms_MY/calendar.po
	l10n/ms_MY/contacts.po
	l10n/ms_MY/core.po
	l10n/ms_MY/files.po
	l10n/ms_MY/lib.po
	l10n/ms_MY/settings.po
	l10n/nb_NO/calendar.po
	l10n/nb_NO/contacts.po
	l10n/nb_NO/core.po
	l10n/nb_NO/files.po
	l10n/nb_NO/files_sharing.po
	l10n/nb_NO/files_versions.po
	l10n/nb_NO/gallery.po
	l10n/nb_NO/lib.po
	l10n/nb_NO/settings.po
	l10n/nb_NO/user_ldap.po
	l10n/nl/calendar.po
	l10n/nl/contacts.po
	l10n/nl/core.po
	l10n/nl/files.po
	l10n/nl/files_external.po
	l10n/nl/files_versions.po
	l10n/nl/gallery.po
	l10n/nl/lib.po
	l10n/nl/settings.po
	l10n/nl/user_ldap.po
	l10n/nn_NO/calendar.po
	l10n/nn_NO/contacts.po
	l10n/nn_NO/core.po
	l10n/nn_NO/files.po
	l10n/nn_NO/lib.po
	l10n/nn_NO/settings.po
	l10n/oc/core.po
	l10n/oc/files.po
	l10n/oc/lib.po
	l10n/oc/settings.po
	l10n/pl/calendar.po
	l10n/pl/contacts.po
	l10n/pl/core.po
	l10n/pl/files.po
	l10n/pl/gallery.po
	l10n/pl/lib.po
	l10n/pl/settings.po
	l10n/pl_PL/core.po
	l10n/pl_PL/files.po
	l10n/pl_PL/lib.po
	l10n/pl_PL/settings.po
	l10n/pt_BR/calendar.po
	l10n/pt_BR/contacts.po
	l10n/pt_BR/core.po
	l10n/pt_BR/files.po
	l10n/pt_BR/lib.po
	l10n/pt_BR/settings.po
	l10n/pt_PT/calendar.po
	l10n/pt_PT/contacts.po
	l10n/pt_PT/core.po
	l10n/pt_PT/files.po
	l10n/pt_PT/gallery.po
	l10n/pt_PT/lib.po
	l10n/pt_PT/settings.po
	l10n/pt_PT/user_ldap.po
	l10n/ro/calendar.po
	l10n/ro/contacts.po
	l10n/ro/core.po
	l10n/ro/files.po
	l10n/ro/lib.po
	l10n/ro/settings.po
	l10n/ru/calendar.po
	l10n/ru/contacts.po
	l10n/ru/core.po
	l10n/ru/files.po
	l10n/ru/files_external.po
	l10n/ru/files_sharing.po
	l10n/ru/files_versions.po
	l10n/ru/gallery.po
	l10n/ru/lib.po
	l10n/ru/settings.po
	l10n/ru_RU/core.po
	l10n/ru_RU/files.po
	l10n/ru_RU/lib.po
	l10n/ru_RU/settings.po
	l10n/si_LK/core.po
	l10n/si_LK/files.po
	l10n/si_LK/files_encryption.po
	l10n/si_LK/files_external.po
	l10n/si_LK/files_sharing.po
	l10n/si_LK/files_versions.po
	l10n/si_LK/lib.po
	l10n/si_LK/settings.po
	l10n/si_LK/user_ldap.po
	l10n/sk_SK/calendar.po
	l10n/sk_SK/contacts.po
	l10n/sk_SK/core.po
	l10n/sk_SK/files.po
	l10n/sk_SK/files_external.po
	l10n/sk_SK/lib.po
	l10n/sk_SK/settings.po
	l10n/sk_SK/user_ldap.po
	l10n/sl/calendar.po
	l10n/sl/contacts.po
	l10n/sl/core.po
	l10n/sl/files.po
	l10n/sl/files_encryption.po
	l10n/sl/files_external.po
	l10n/sl/files_sharing.po
	l10n/sl/files_versions.po
	l10n/sl/gallery.po
	l10n/sl/lib.po
	l10n/sl/settings.po
	l10n/sl/user_ldap.po
	l10n/so/core.po
	l10n/so/files.po
	l10n/sr/calendar.po
	l10n/sr/contacts.po
	l10n/sr/core.po
	l10n/sr/files.po
	l10n/sr/lib.po
	l10n/sr/settings.po
	l10n/sr@latin/calendar.po
	l10n/sr@latin/contacts.po
	l10n/sr@latin/core.po
	l10n/sr@latin/files.po
	l10n/sr@latin/lib.po
	l10n/sr@latin/settings.po
	l10n/sv/calendar.po
	l10n/sv/contacts.po
	l10n/sv/core.po
	l10n/sv/files.po
	l10n/sv/gallery.po
	l10n/sv/lib.po
	l10n/sv/media.po
	l10n/sv/settings.po
	l10n/ta_LK/core.po
	l10n/ta_LK/files.po
	l10n/ta_LK/lib.po
	l10n/ta_LK/settings.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_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/th_TH/calendar.po
	l10n/th_TH/contacts.po
	l10n/th_TH/core.po
	l10n/th_TH/files.po
	l10n/th_TH/gallery.po
	l10n/th_TH/lib.po
	l10n/th_TH/settings.po
	l10n/tr/calendar.po
	l10n/tr/contacts.po
	l10n/tr/core.po
	l10n/tr/files.po
	l10n/tr/gallery.po
	l10n/tr/lib.po
	l10n/tr/settings.po
	l10n/uk/calendar.po
	l10n/uk/contacts.po
	l10n/uk/core.po
	l10n/uk/files.po
	l10n/uk/files_encryption.po
	l10n/uk/files_versions.po
	l10n/uk/lib.po
	l10n/uk/media.po
	l10n/uk/settings.po
	l10n/vi/core.po
	l10n/vi/files.po
	l10n/vi/files_external.po
	l10n/vi/files_sharing.po
	l10n/vi/files_versions.po
	l10n/vi/lib.po
	l10n/vi/settings.po
	l10n/vi/user_ldap.po
	l10n/zh_CN.GB2312/core.po
	l10n/zh_CN.GB2312/files.po
	l10n/zh_CN.GB2312/lib.po
	l10n/zh_CN.GB2312/settings.po
	l10n/zh_CN/calendar.po
	l10n/zh_CN/contacts.po
	l10n/zh_CN/core.po
	l10n/zh_CN/files.po
	l10n/zh_CN/files_external.po
	l10n/zh_CN/gallery.po
	l10n/zh_CN/lib.po
	l10n/zh_CN/settings.po
	l10n/zh_CN/user_ldap.po
	l10n/zh_TW/calendar.po
	l10n/zh_TW/contacts.po
	l10n/zh_TW/core.po
	l10n/zh_TW/files.po
	l10n/zh_TW/lib.po
	l10n/zh_TW/settings.po
	lib/MDB2/Driver/sqlite3.php
	lib/app.php
	lib/appconfig.php
	lib/archive.php
	lib/archive/tar.php
	lib/archive/zip.php
	lib/base.php
	lib/connector/sabre/auth.php
	lib/connector/sabre/directory.php
	lib/connector/sabre/file.php
	lib/connector/sabre/locks.php
	lib/connector/sabre/node.php
	lib/db.php
	lib/eventsource.php
	lib/filecache.php
	lib/filecache/cached.php
	lib/filecache/update.php
	lib/filechunking.php
	lib/fileproxy.php
	lib/fileproxy/fileoperations.php
	lib/fileproxy/quota.php
	lib/files.php
	lib/filestorage.php
	lib/filestorage/common.php
	lib/filestorage/commontest.php
	lib/filestorage/local.php
	lib/filesystem.php
	lib/filesystemview.php
	lib/group.php
	lib/group/dummy.php
	lib/group/example.php
	lib/helper.php
	lib/image.php
	lib/installer.php
	lib/json.php
	lib/l10n.php
	lib/l10n/ca.php
	lib/l10n/cs_CZ.php
	lib/l10n/da.php
	lib/l10n/de.php
	lib/l10n/el.php
	lib/l10n/eo.php
	lib/l10n/es.php
	lib/l10n/es_AR.php
	lib/l10n/et_EE.php
	lib/l10n/eu.php
	lib/l10n/fa.php
	lib/l10n/fi_FI.php
	lib/l10n/fr.php
	lib/l10n/gl.php
	lib/l10n/he.php
	lib/l10n/hu_HU.php
	lib/l10n/it.php
	lib/l10n/ja_JP.php
	lib/l10n/lt_LT.php
	lib/l10n/nb_NO.php
	lib/l10n/nl.php
	lib/l10n/oc.php
	lib/l10n/pl.php
	lib/l10n/pt_BR.php
	lib/l10n/pt_PT.php
	lib/l10n/ro.php
	lib/l10n/ru.php
	lib/l10n/ru_RU.php
	lib/l10n/sk_SK.php
	lib/l10n/sl.php
	lib/l10n/sv.php
	lib/l10n/th_TH.php
	lib/l10n/uk.php
	lib/l10n/vi.php
	lib/l10n/zh_CN.GB2312.php
	lib/l10n/zh_CN.php
	lib/l10n/zh_TW.php
	lib/log.php
	lib/log/owncloud.php
	lib/mail.php
	lib/migrate.php
	lib/migration/content.php
	lib/minimizer.php
	lib/ocs.php
	lib/ocsclient.php
	lib/preferences.php
	lib/public/backgroundjob.php
	lib/public/db.php
	lib/public/share.php
	lib/public/util.php
	lib/request.php
	lib/search.php
	lib/search/provider/file.php
	lib/search/result.php
	lib/setup.php
	lib/streamwrappers.php
	lib/template.php
	lib/templatelayout.php
	lib/updater.php
	lib/user.php
	lib/user/database.php
	lib/user/http.php
	lib/util.php
	lib/vcategories.php
	lib/vobject.php
	public.php
	remote.php
	search/ajax/search.php
	settings/admin.php
	settings/ajax/apps/ocs.php
	settings/ajax/changepassword.php
	settings/ajax/creategroup.php
	settings/ajax/createuser.php
	settings/ajax/disableapp.php
	settings/ajax/enableapp.php
	settings/ajax/getlog.php
	settings/ajax/lostpassword.php
	settings/ajax/openid.php
	settings/ajax/removegroup.php
	settings/ajax/removeuser.php
	settings/ajax/setlanguage.php
	settings/ajax/setloglevel.php
	settings/ajax/setquota.php
	settings/ajax/togglegroups.php
	settings/ajax/togglesubadmins.php
	settings/ajax/userlist.php
	settings/apps.php
	settings/css/settings.css
	settings/help.php
	settings/js/apps.js
	settings/js/users.js
	settings/l10n/ar.php
	settings/l10n/bg_BG.php
	settings/l10n/ca.php
	settings/l10n/cs_CZ.php
	settings/l10n/da.php
	settings/l10n/de.php
	settings/l10n/el.php
	settings/l10n/eo.php
	settings/l10n/es.php
	settings/l10n/es_AR.php
	settings/l10n/et_EE.php
	settings/l10n/eu.php
	settings/l10n/fa.php
	settings/l10n/fi_FI.php
	settings/l10n/fr.php
	settings/l10n/gl.php
	settings/l10n/hr.php
	settings/l10n/hu_HU.php
	settings/l10n/id.php
	settings/l10n/it.php
	settings/l10n/ja_JP.php
	settings/l10n/ko.php
	settings/l10n/lb.php
	settings/l10n/lt_LT.php
	settings/l10n/lv.php
	settings/l10n/ms_MY.php
	settings/l10n/nb_NO.php
	settings/l10n/nl.php
	settings/l10n/nn_NO.php
	settings/l10n/oc.php
	settings/l10n/pl.php
	settings/l10n/pt_BR.php
	settings/l10n/pt_PT.php
	settings/l10n/ro.php
	settings/l10n/ru.php
	settings/l10n/ru_RU.php
	settings/l10n/si_LK.php
	settings/l10n/sk_SK.php
	settings/l10n/sl.php
	settings/l10n/sr.php
	settings/l10n/sr@latin.php
	settings/l10n/sv.php
	settings/l10n/th_TH.php
	settings/l10n/tr.php
	settings/l10n/uk.php
	settings/l10n/vi.php
	settings/l10n/zh_CN.GB2312.php
	settings/l10n/zh_CN.php
	settings/l10n/zh_TW.php
	settings/personal.php
	settings/settings.php
	settings/templates/admin.php
	settings/templates/apps.php
	settings/templates/help.php
	settings/templates/personal.php
	settings/templates/users.php
	settings/trans.png
	settings/users.php
	tests/bootstrap.php
	tests/data/db_structure.xml
	tests/lib/archive.php
	tests/lib/cache.php
	tests/lib/cache/apc.php
	tests/lib/cache/xcache.php
	tests/lib/db.php
	tests/lib/filesystem.php
	tests/lib/geo.php
	tests/lib/share/share.php
	tests/lib/streamwrappers.php
	tests/lib/util.php
	tests/phpunit.xml
2012-12-12 17:39:43 +00:00
Sam Tuke 398b52e4f0 Improved formatting of getPublicKeys() 2012-12-11 17:24:25 +00:00
Sam Tuke 453fd66c70 Changing user login pwd now correctly changes encryption key passphrase
All crypt unit tests are now passing
2012-12-11 17:12:46 +00:00
Sam Tuke 1fc5b1d02d Replaced phpseclib calls with symmetric re-encryption of user private key 2012-12-11 15:15:30 +00:00
Sam Tuke a00dd2d5d6 Revert "Revert "Development snapshot""
This reverts commit b66d38ecae.
2012-12-11 15:10:56 +00:00
Sam Tuke b66d38ecae Revert "Development snapshot"
This reverts commit c56fb905d1.
2012-12-11 15:10:39 +00:00
Sam Tuke aabef796a0 Added library phpseclib
First implementation of passphrase changing on user pwd change
2012-12-11 13:22:46 +00:00
Jenkins for ownCloud a444999a8c [tx-robot] updated from transifex 2012-12-10 00:12:32 +01:00
Sam Tuke c56fb905d1 Development snapshot
Read/write interoperability working through web UI and WebDAV
New class Session for handling session data
A few new unit tests
Some additional unit tests are now failing, esp. legacy enc related ones
2012-12-05 18:57:44 +00:00
Jenkins for ownCloud 524f3c3c0b [tx-robot] updated from transifex 2012-12-05 00:04:55 +01:00
Sam Tuke bc3550b37b Development Snapshot
Opening short files via webdav, that were saved via webdav, now works
2012-12-04 19:53:13 +00:00
Thomas Müller 475fe281a4 Merge pull request #654 from butonic/checkstyle_fixes
fix checkstyle for files_encryption & files_encryption app, add whitespace for readability
2012-12-02 03:14:30 -08:00
Jenkins for ownCloud 401c56ce7b [tx-robot] updated from transifex 2012-12-02 00:03:12 +01:00
Jörn Friedrich Dreyer df21ebeaf7 fix checkstyle for files_encryption app, add whitespace for readability 2012-11-30 16:26:04 +01:00
Sam Tuke bfd47cd2df Development snapshot
Moved legacy crypto methods from Util into Crypt
Added preliminary support for reading legacy encrypted files
Added some unit tests
2012-11-28 18:39:19 +00:00
Sam Tuke a465b3cb63 Development snapshot 2012-11-22 20:19:03 +00:00
Sam Tuke 5f78f9d642 Development snapshot 2012-11-22 19:36:48 +00:00
Sam Tuke 13d93fb416 Development snapshot 2012-11-22 14:08:19 +00:00
Jenkins for ownCloud 9204be827b [tx-robot] updated from transifex 2012-11-21 00:02:33 +01:00
Sam Tuke 5328aae8a8 Added unit tests for legacy encryption methods
Improvements to documentation
2012-11-20 19:10:10 +00:00
Jenkins for ownCloud e28d71bf55 [tx-robot] updated from transifex 2012-11-18 00:02:00 +01:00
Sam Tuke 637891b771 Development snapshot, lots of fixes
Web UI based encryption working
Crypt and Util unit tests passing
2012-11-16 18:31:37 +00:00
Sam Tuke 6df35eeddc Added unit tests for setupServerSide(), key paths, and ready()
Started using Mockery library for mimicking objects
2012-11-16 18:30:00 +00:00
Sam Tuke b5c0e4042e Fixing use of splitIv
Fixed unit tests for splitIv
2012-11-15 13:01:05 +00:00
Sam Tuke 138a255f73 Switched require() for require_once() 2012-11-15 13:01:04 +00:00
Sam Tuke cb81b82a11 Fixed IV generation test
Changed use of namespace
2012-11-15 11:54:16 +00:00
Sam Tuke 886fb188cd Improved documentation
Implemented exceptions
Added method for splitting catfiles
2012-11-15 11:54:16 +00:00
Sam Tuke 459a7622dc Added check if sharing app is enabled, commented out sharing code due to issue 2012-11-15 11:54:16 +00:00
Jenkins for ownCloud a418a3ba65 [tx-robot] updated from transifex 2012-11-15 00:03:50 +01:00
Sam Tuke fdf0f6ce61 Added namespace 2012-11-14 16:39:35 +00:00
Sam Tuke dd987a8bd1 Added minor documentation 2012-11-14 13:58:57 +00:00
Jenkins for ownCloud ac22cd4ab0 [tx-robot] updated from transifex 2012-11-13 00:07:19 +01:00
Felix Moeller 0e70ea9d8b Checkstyle: Fix the last 25 NoSpaceAfterComma 2012-11-04 18:28:29 +01:00
Felix Moeller 30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Felix Moeller afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Felix Moeller dfc8228fb4 NoSpaceAfterComma 2012-10-28 23:58:08 +01:00
Felix Moeller 561cbb2de6 NoSpaceAfterComma II 2012-10-23 23:01:10 +02:00
Felix Moeller e73b817a38 Checkstyle: NoSpaceAfterComma 2012-10-23 22:53:54 +02:00
Felix Moeller 2d61f03452 More Checkstyle cleanup
This is for all LowerCaseConstant warnings
2012-10-23 08:01:09 +02:00
Jenkins for ownCloud bc2a648f2d [tx-robot] updated from transifex 2012-10-23 02:06:03 +02:00
Jenkins for ownCloud 16c4eb66d7 [tx-robot] updated from transifex 2012-10-21 02:06:44 +02:00
Jenkins for ownCloud cfbd310d34 [tx-robot] updated from transifex 2012-10-20 02:03:53 +02:00
Sam Tuke 265f3654af all unit files_encryption crypt unit tests now passing after merge 2012-10-17 16:35:19 +01:00
Jenkins for ownCloud fd6adc7d08 [tx-robot] updated from transifex 2012-10-16 23:39:13 +02:00
Sam Tuke 8b01286a5d Merged branch 'master' 2012-10-16 16:57:07 +01:00
Sam Tuke 06ea9c18f8 Development snapshot
Stream reading and writing of small and large files working, using write cache
2012-10-16 15:02:51 +01:00
Sam Tuke 4da67b0a08 Development snapshot; encryption stream wrapper now successfully writes files, and passes unit tests 2012-10-10 18:40:59 +01:00
Jenkins for ownCloud b934668b9e [tx-robot] updated from transifex 2012-10-08 02:07:01 +02:00
Jenkins for ownCloud e36317c21a [tx-robot] updated from transifex 2012-10-07 02:08:12 +02:00
Frank Karlitschek 3fdebaa5dc automatically remove and prevent installation of apps with a require version less than the current one. We check now the first ad second part of the version number.
Also increase the require tags of the core apps to 4.9 Please note that 4.9 is the internal versionnumber of the upcoming 4.5 release.
You have to pu a <require>4.9</require> into the info.xml of your app to make it as compatible with 4.5
2012-10-02 12:10:45 +02:00
Jenkins for ownCloud 09aa95586a [tx-robot] updated from transifex 2012-09-27 02:03:09 +02:00
Jenkins for ownCloud e5487376da [tx-robot] updated from transifex 2012-09-25 02:05:18 +02:00
Jenkins for ownCloud ecb90d72f3 [tx-robot] updated from transifex 2012-09-24 02:04:10 +02:00
Jenkins for ownCloud 7c42e88676 [tx-robot] updated from transifex 2012-09-20 02:09:31 +02:00
Jenkins for ownCloud b0e645fe13 [tx-robot] updated from transifex 2012-09-19 02:07:26 +02:00
Jenkins for ownCloud 06e963c54f [tx-robot] updated from transifex 2012-09-18 02:04:26 +02:00
Jenkins for ownCloud e41ccd4344 [tx-robot] updated from transifex 2012-09-14 02:03:18 +02:00
Sam Tuke ed980674a6 Development snapshot 2012-09-11 13:40:45 +01:00
Jenkins for ownCloud d5d2e89622 [tx-robot] updated from transifex 2012-09-08 02:05:41 +02:00
Thomas Mueller 3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Jenkins for ownCloud a94b56b57b [tx-robot] updated from transifex 2012-09-07 02:07:22 +02:00
Jenkins for ownCloud af3e767489 [tx-robot] updated from transifex 2012-09-06 02:06:37 +02:00
Thomas Mueller ebb28412ca no more require_once() 2012-09-05 23:28:59 +02:00
Bart Visscher 9329af921d Add missing ; to js code 2012-09-05 22:26:09 +02:00
Jenkins for ownCloud 2bb7cb9f64 [tx-robot] updated from transifex 2012-09-02 02:02:53 +02:00
Bart Visscher 0e58800016 Whitespace fixes in apps 2012-08-29 20:29:43 +02:00
Jenkins for ownCloud 8374a49cc1 [tx-robot] updated from transifex 2012-08-28 02:03:56 +02:00
Frank Karlitschek c2290a542e add deprecated warning 2012-08-27 22:58:50 +02:00
Jenkins for ownCloud faf702b9e6 [tx-robot] updated from transifex 2012-08-26 19:47:33 +02:00
Jenkins for ownCloud f57d527a7c [tx-robot] updated from transifex 2012-08-25 02:08:36 +02:00