Bjoern Schiessle
|
d3af7a9aa4
|
check if we are writing to user/files, otherwise skip encryption
|
2013-10-14 17:13:14 +02:00 |
Jenkins for ownCloud
|
f3336f8877
|
[tx-robot] updated from transifex
|
2013-10-13 20:33:30 -04:00 |
Björn Schießle
|
9a15aa8ee9
|
Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlines
fix setting dialog headlines for the encryption app
|
2013-10-11 07:15:58 -07:00 |
Bjoern Schiessle
|
57beef1e36
|
fix setting dialog headlines for the encryption app
|
2013-10-11 15:56:08 +02:00 |
Bjoern Schiessle
|
3ee7711284
|
fix another typo
|
2013-10-11 15:26:30 +02:00 |
Bjoern Schiessle
|
2d79a79202
|
change error code to 403
|
2013-10-11 15:24:49 +02:00 |
Bjoern Schiessle
|
83c78bc7a8
|
fix typo in error message and change error code to 403
|
2013-10-11 15:23:12 +02:00 |
Bjoern Schiessle
|
39d710e737
|
block file access if share keys are missing
|
2013-10-11 14:20:46 +02:00 |
Björn Schießle
|
4336d42ab0
|
Merge pull request #5233 from owncloud/enc_filter_users
only encrypt file to users with encryption keys
|
2013-10-11 01:48:02 -07:00 |
Jenkins for ownCloud
|
44a5b0bad0
|
[tx-robot] updated from transifex
|
2013-10-10 22:30:58 -04:00 |
Bjoern Schiessle
|
909af2b62e
|
don't cache if the encryption is enabled, this can lead to problems during unit testing
|
2013-10-10 15:02:52 +02:00 |
Bjoern Schiessle
|
38e5da05af
|
only encrypt file to users with encryption keys
|
2013-10-09 15:56:21 +02:00 |
Jenkins for ownCloud
|
209392587f
|
[tx-robot] updated from transifex
|
2013-10-08 07:24:19 -04:00 |
Jenkins for ownCloud
|
c655eec3d1
|
[tx-robot] updated from transifex
|
2013-10-07 12:21:38 -04:00 |
Jenkins for ownCloud
|
3613e79e10
|
[tx-robot] updated from transifex
|
2013-10-06 19:16:10 -04:00 |
Björn Schießle
|
2cdf54b77d
|
Merge pull request #4877 from owncloud/ocs_share_api
OCS Share API
|
2013-10-04 07:10:21 -07:00 |
Björn Schießle
|
5b7f76e702
|
Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617
Encryption improved error messages
|
2013-10-04 02:28:18 -07:00 |
Björn Schießle
|
1992450b32
|
Merge pull request #4902 from owncloud/repeat_recovery_password
let user repeat the recovery key password to prevent typos
|
2013-10-04 02:23:01 -07:00 |
Morris Jobke
|
5501dd623e
|
add/remove specific CSS class - not all classes
|
2013-10-03 12:22:25 +02:00 |
Thomas Müller
|
b58a464b86
|
Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
don't remember login if the encrypion app is enabled
|
2013-09-30 10:53:41 -07:00 |
Bjoern Schiessle
|
4d79e7e673
|
Merge branch 'master' into encryption_improved_error_messages_4617
|
2013-09-30 15:08:53 +02:00 |
Jenkins for ownCloud
|
59e4ff7d24
|
[tx-robot] updated from transifex
|
2013-09-29 00:03:26 -04:00 |
Morris Jobke
|
0f5fed5409
|
fix license header line breaks
|
2013-09-27 17:02:57 +02:00 |
Bjoern Schiessle
|
7e54e8831e
|
set rememberlogin to false for the encryption app
|
2013-09-26 19:34:50 +02:00 |
Bjoern Schiessle
|
62b8c36a40
|
check if encryption app is enabled before trying to calculate file size
|
2013-09-26 16:27:14 +02:00 |
Bjoern Schiessle
|
0b98427536
|
fix check if app is enabled
|
2013-09-25 19:23:07 +02:00 |
Bjoern Schiessle
|
71bbb2ea8b
|
check if key exists before reading it
|
2013-09-25 17:44:05 +02:00 |
Bjoern Schiessle
|
f6e8a388a9
|
Merge branch 'master' into encryption_improved_error_messages_4617
Conflicts:
settings/ajax/changepassword.php
|
2013-09-23 10:39:12 +02:00 |
Bjoern Schiessle
|
bc3b147396
|
remove spaces
|
2013-09-19 10:13:21 +02:00 |
Jenkins for ownCloud
|
6b1843d91b
|
[tx-robot] updated from transifex
|
2013-09-18 11:50:02 -04:00 |
Bjoern Schiessle
|
4edd8b8303
|
remove debug output
|
2013-09-18 16:08:29 +02:00 |
Bjoern Schiessle
|
5fb0e257a4
|
let user repeat the recovery key password to prevent typos
|
2013-09-18 16:03:53 +02:00 |
Björn Schießle
|
e0f18ec72b
|
Merge pull request #4708 from owncloud/encryption_fixes
make sure that initial encryption also starts for a fresh installation
|
2013-09-18 01:33:52 -07:00 |
Bjoern Schiessle
|
72eaf2894a
|
performance improvement, check configuration only if no private key exists
|
2013-09-17 16:53:52 +02:00 |
Jenkins for ownCloud
|
5cf12888ad
|
[tx-robot] updated from transifex
|
2013-09-16 11:38:45 -04:00 |
Bjoern Schiessle
|
82cbbb8ab8
|
Merge branch 'master' into encryption_improved_error_messages_4617
Conflicts:
apps/files/index.php
|
2013-09-16 10:42:37 +02:00 |
Jenkins for ownCloud
|
556bd1ef23
|
[tx-robot] updated from transifex
|
2013-09-13 21:49:24 -04:00 |
Thomas Müller
|
d5ddbfb045
|
Merge pull request #4719 from owncloud/port_4701_master
Always check variable type before using readdir to avoid surprises
|
2013-09-12 15:44:20 -07:00 |
Jenkins for ownCloud
|
72689f643b
|
[tx-robot] updated from transifex
|
2013-09-10 10:42:16 -04:00 |
Jenkins for ownCloud
|
92f6c3bb10
|
[tx-robot] updated from transifex
|
2013-09-08 21:37:53 -04:00 |
Jenkins for ownCloud
|
e895cf9188
|
[tx-robot] updated from transifex
|
2013-09-07 04:46:57 -04:00 |
Bjoern Schiessle
|
b2dde14dbc
|
coding style fixes
|
2013-09-06 16:07:18 +02:00 |
Bjoern Schiessle
|
93f4dec798
|
fix part file handling and real size calculation, this should also solve #4581
Conflicts:
apps/files_encryption/lib/stream.php
|
2013-09-06 16:06:34 +02:00 |
Bjoern Schiessle
|
f6830e7462
|
check shares for the real file and not for the .part file
|
2013-09-06 16:05:11 +02:00 |
Bjoern Schiessle
|
404e36323a
|
first check if a extension exists before comparing it
|
2013-09-06 16:05:03 +02:00 |
Bjoern Schiessle
|
597a3cf1ad
|
handle part files correctly
|
2013-09-06 16:04:56 +02:00 |
Bjoern Schiessle
|
1558cb860c
|
remove test code
|
2013-09-06 13:16:48 +02:00 |
Bjoern Schiessle
|
fb462e83cc
|
no longer enforce log out, but provide useful errors/warnings instead
|
2013-09-06 12:27:40 +02:00 |
Bjoern Schiessle
|
69b1625f0e
|
re-added error.php
|
2013-09-06 12:27:25 +02:00 |
Jenkins for ownCloud
|
0527fb05ad
|
[tx-robot] updated from transifex
|
2013-09-05 07:37:32 -04:00 |