deeeca69fe
[tx-robot] updated from transifex
2015-05-12 01:55:10 +07:00
f057efc42e
Merge pull request #16213 from cmeh/patch-5
...
Grammar, removal of line break
2015-05-11 09:18:45 +07:00
a331f6b83e
[tx-robot] updated from transifex
2015-05-11 01:54:43 +07:00
52fc45e6e3
[tx-robot] updated from transifex
2015-05-10 01:56:13 +07:00
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 +07:00
6f5854a8de
[tx-robot] updated from transifex
2015-05-09 01:55:35 +07:00
4a450c9d0d
improved admin settings
2015-05-08 11:41:38 +07:00
ff0faacf0b
[tx-robot] updated from transifex
2015-05-08 01:54:52 +07:00
12b24ee567
Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page
...
Display the module settings in the list of the encryption modules
2015-05-07 10:44:03 +07:00
3dee907b70
[tx-robot] updated from transifex
2015-05-07 01:56:44 +07:00
910146824e
[tx-robot] updated from transifex
2015-05-06 01:55:19 +07:00
2ce01ee0bf
Merge pull request #15938 from owncloud/enc_update_recovery_share_key
...
[encryption] check recovery key setting for the correct user
2015-05-05 10:48:09 +07:00
b60dcd91bb
[tx-robot] updated from transifex
2015-05-05 01:55:36 +07:00
ed16127a8d
Merge pull request #16026 from owncloud/enc_ux_improvements
...
[encryption] some small ux improvements
2015-05-04 17:40:05 +07:00
eadc2c330c
Display the module settings in the list of the encryption modules
2015-05-04 15:04:03 +07:00
f76c055244
some small ux improvements
2015-05-04 11:55:06 +07:00
0f7b8dd338
Merge pull request #15752 from owncloud/feature/fix-encryption-return-values
...
[enc2] fixing return values and adding tests
2015-05-04 11:44:15 +07:00
7376ea9b26
Merge pull request #15584 from owncloud/enc_fix_upload_shared_folder
...
skip user if we don't have a public key
2015-05-04 09:57:19 +07:00
7fa308977b
[tx-robot] updated from transifex
2015-05-04 01:54:47 +07:00
aa0d439ed9
[tx-robot] updated from transifex
2015-05-02 01:54:49 +07:00
4a6808a0f4
Simplify the test
2015-04-30 12:04:02 +07:00
4ef9df8750
skip user if we don't have a public key
2015-04-30 12:04:02 +07:00
70a44621be
check recovery setting for the right user
2015-04-30 11:38:53 +07:00
4209757d61
Merge pull request #15919 from owncloud/enc_handle_empty_files
...
Encryption improve handling of empty and unencrypted files
2015-04-29 19:32:02 +07:00
6ebb021359
Merge pull request #15911 from owncloud/enc_create_header_for_new_key
...
make sure that we create a header for the encrypted private key
2015-04-29 09:43:54 +07:00
3e06fd9342
Merge pull request #15706 from owncloud/fix-15705-master
...
move creation of shared key to the login handler
2015-04-29 09:36:34 +07:00
29bcfb2fdb
method shouldn't be static
2015-04-28 20:21:53 +07:00
d5cbb66b66
also create encryption keys for empty files
2015-04-28 20:21:53 +07:00
df428b76ac
skip update of encryption keys if file is not encrypted
2015-04-28 20:21:53 +07:00
7d05f387fb
make sure that we create a header for the encrypted private key
2015-04-28 13:00:09 +07:00
27683f9442
fall back to the ownCloud default encryption module and aes128 if we read a encrypted file without a header
2015-04-27 13:01:18 +07:00
8c0856779b
change error codes to 400
2015-04-24 09:42:02 +07:00
cc3bc6345b
Only get encryption status when logged in
...
This removes useless warnings in the logs.
2015-04-23 13:06:00 +07:00
f8f354b351
[tx-robot] updated from transifex
2015-04-23 01:54:51 +07:00
29168665cb
fix messages from settings crontroller
2015-04-22 13:26:06 +07:00
e3ec1a8bb8
remove status's and adjust js
2015-04-22 11:07:56 +07:00
1747117edf
destupify tests
2015-04-22 10:46:56 +07:00
c81bc152d7
fixing return values and adding tests
2015-04-22 10:46:55 +07:00
fc4127dd62
add $encryptionModuleId to methods of Keys/IStorage
2015-04-22 11:53:05 +07:00
d7bdf60559
[tx-robot] updated from transifex
2015-04-22 01:55:38 +07:00
4b968da9e6
Merge pull request #15713 from owncloud/fix-15707-master
...
[enc2] Fixing JS errors
2015-04-21 12:47:43 +07:00
490e779424
doc and indent
2015-04-21 12:19:15 +07:00
4a2f8f81ca
Don't pollute the global namespace
2015-04-21 12:01:56 +07:00
c548066d2c
[tx-robot] updated from transifex
2015-04-21 01:55:37 +07:00
55962c5f5a
make jshint happy
...
This reverts commit ae681f0061
2015-04-20 20:51:15 +07:00
3bc5c1c3cf
use a simple function - OC.Encryption is already defined - fixes #15707
...
This reverts commit 0ca6398aa3
2015-04-20 20:50:08 +07:00
b78e76a1cb
Merge pull request #15677 from owncloud/enc_reset_private_key_password
...
[encryption] let user update the private key password
2015-04-20 20:48:12 +07:00
04674c06cc
Dont use the old .status way
2015-04-20 18:26:14 +07:00
3f96662609
Fix several minor things
2015-04-20 17:44:34 +07:00
fd3c1484ad
[tx-robot] updated from transifex
2015-04-19 01:54:41 +07:00
Jenkins for ownCloud
Morris Jobke
Christian Hoffmann
Bjoern Schiessle
Björn Schießle
Joas Schilling
Thomas Müller
Clark Tomlinson
Lukas Reschke
Vincent Petry