Commit Graph

187 Commits

Author SHA1 Message Date
Morris Jobke f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Jenkins for ownCloud dddbfb903f [tx-robot] updated from transifex 2015-06-25 01:55:15 -04:00
Björn Schießle cce841c665 Merge pull request #17045 from owncloud/enc_improvements
encryption improvements
2015-06-23 14:30:21 +02:00
Jenkins for ownCloud 183bd6dd49 [tx-robot] updated from transifex 2015-06-20 01:55:10 -04:00
Bjoern Schiessle ed3dc199ae remove files_encryption from database at the end of the migration process 2015-06-19 14:15:56 +02:00
Jenkins for ownCloud c4cb34da9d [tx-robot] updated from transifex 2015-06-18 01:55:14 -04:00
Jenkins for ownCloud 3898b8c9b8 [tx-robot] updated from transifex 2015-06-17 01:55:34 -04:00
Jenkins for ownCloud 0a5d73b874 [tx-robot] updated from transifex 2015-06-16 01:55:41 -04:00
Jenkins for ownCloud fe9b28a800 [tx-robot] updated from transifex 2015-06-14 01:54:49 -04:00
Jenkins for ownCloud 88d3c9ad40 [tx-robot] updated from transifex 2015-06-11 01:55:05 -04:00
Jenkins for ownCloud 4d88302b3a [tx-robot] updated from transifex 2015-06-10 01:54:55 -04:00
Bjoern Schiessle d743d6d356 add hint to exception 2015-06-08 21:16:23 +02:00
Jenkins for ownCloud 2fb1b0864a [tx-robot] updated from transifex 2015-06-08 01:55:01 -04:00
Jenkins for ownCloud 3542148761 [tx-robot] updated from transifex 2015-06-07 01:55:03 -04:00
Jenkins for ownCloud e544d5b2c6 [tx-robot] updated from transifex 2015-06-05 01:55:04 -04:00
Jenkins for ownCloud 66a24ff479 [tx-robot] updated from transifex 2015-06-04 01:56:24 -04:00
Joas Schilling d3e3a84cae Move the helpful method to the TestCase class 2015-06-03 12:33:29 +02:00
Jenkins for ownCloud 410a836702 [tx-robot] updated from transifex 2015-06-03 01:55:29 -04:00
Jenkins for ownCloud baca5c60c0 [tx-robot] updated from transifex 2015-06-02 01:56:23 -04:00
Jenkins for ownCloud 8d23b34402 [tx-robot] updated from transifex 2015-05-31 01:54:44 -04:00
Jenkins for ownCloud a3bc112412 [tx-robot] updated from transifex 2015-05-30 01:55:46 -04:00
Jenkins for ownCloud fff0fb66d6 [tx-robot] updated from transifex 2015-05-29 01:56:13 -04:00
Bjoern Schiessle 68db3059ee detect migration status 2015-05-27 21:00:02 +02:00
Bjoern Schiessle 5549641f1f improve error messages displayed to the user 2015-05-27 21:00:02 +02:00
Jenkins for ownCloud 06934e7c00 [tx-robot] updated from transifex 2015-05-24 01:55:03 -04:00
Jenkins for ownCloud e189435499 [tx-robot] updated from transifex 2015-05-23 01:55:05 -04:00
Jenkins for ownCloud 42dd40ad80 [tx-robot] updated from transifex 2015-05-21 01:55:57 -04:00
Jenkins for ownCloud c49a06a684 [tx-robot] updated from transifex 2015-05-20 01:56:19 -04:00
Thomas Müller d90b83725f Merge pull request #16085 from owncloud/encryption-module-rename
rename to 'Default encryption module'
2015-05-19 11:13:33 +02:00
Jenkins for ownCloud 313994a33d [tx-robot] updated from transifex 2015-05-19 01:55:35 -04:00
Joas Schilling 30d165ebf2 Add missing import for the exception 2015-05-18 15:45:47 +02:00
Joas Schilling 4444db61b7 Add a unit test for the decrypt method 2015-05-18 15:45:11 +02:00
Bjoern Schiessle 7676166254 add l10n to constructor 2015-05-18 15:43:53 +02:00
Vincent Petry 86cf8e1f68 Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash
also encrypt files in trash bin
2015-05-18 14:59:34 +02:00
Bjoern Schiessle 7d492fefae also encrypt files in trash bin 2015-05-18 12:51:47 +02:00
Bjoern Schiessle 887be709f5 a new approach to display the error message 2015-05-18 10:15:17 +02:00
Jenkins for ownCloud 73a3086945 [tx-robot] updated from transifex 2015-05-18 01:54:58 -04:00
Jenkins for ownCloud 744a9f2c78 [tx-robot] updated from transifex 2015-05-16 01:54:47 -04:00
Thomas Müller 937306b416 Merge pull request #16323 from owncloud/enc_webdav_fixes
some encryption fixes
2015-05-15 10:38:22 +02:00
Jenkins for ownCloud 49c4ee98b4 [tx-robot] updated from transifex 2015-05-15 01:54:49 -04:00
Jenkins for ownCloud 1596a1fd32 [tx-robot] updated from transifex 2015-05-14 01:54:47 -04:00
Bjoern Schiessle ccbefb6e75 delete all file keys doesn't need the encryption module as parameter; implement rmdir; getFileKeyDir should also work for part files and complete directories 2015-05-13 19:06:23 +02:00
Jenkins for ownCloud 504586aec6 [tx-robot] updated from transifex 2015-05-13 01:55:14 -04:00
Jenkins for ownCloud deeeca69fe [tx-robot] updated from transifex 2015-05-12 01:55:10 -04:00
Morris Jobke f057efc42e Merge pull request #16213 from cmeh/patch-5
Grammar, removal of line break
2015-05-11 09:18:45 +02:00
Jenkins for ownCloud a331f6b83e [tx-robot] updated from transifex 2015-05-11 01:54:43 -04:00
Jenkins for ownCloud 52fc45e6e3 [tx-robot] updated from transifex 2015-05-10 01:56:13 -04:00
Christian Hoffmann 6441721626 Grammar, removal of line break
* Corrected "… if the user forgets their password." to "… if the user forgets his or her password" in line 17.
* Removed line break from line 17 to line 18.
2015-05-09 11:31:21 +02:00
Jenkins for ownCloud 6f5854a8de [tx-robot] updated from transifex 2015-05-09 01:55:35 -04:00
Bjoern Schiessle 4a450c9d0d improved admin settings 2015-05-08 11:41:38 +02:00