Jenkins for ownCloud
e89f080f09
[tx-robot] updated from transifex
2013-11-03 14:39:28 -05:00
Jenkins for ownCloud
07e540613e
[tx-robot] updated from transifex
2013-11-03 12:44:12 -05:00
Vincent Petry
d21a5b45f3
Merge pull request #5549 from owncloud/encryption-insertmigrationentrywhenmissing
...
Fixed encryption migration when entry is missing in DB
2013-10-30 07:49:49 -07:00
Bjoern Schiessle
abbacbacb4
remove unused variable
2013-10-30 11:39:30 +01:00
Bjoern Schiessle
6e77fa46f2
if the database doesn't contain any information about the recovery mode than we assume that it is disabled
2013-10-30 11:28:36 +01:00
Vincent Petry
4c7ef85252
Merge pull request #5616 from owncloud/fixing-l10n-master
...
Fixing l10n master
2013-10-30 02:44:54 -07:00
Thomas Müller
ffb0e14d7b
replacing ownCloud by theme-able name or avoid it's usage
2013-10-29 23:29:16 +01:00
Bjoern Schiessle
fcfac51aa1
backport of https://github.com/owncloud/core/pull/5513
2013-10-29 15:08:12 +01:00
Jenkins for ownCloud
b0b76fe064
[tx-robot] updated from transifex
2013-10-29 07:31:51 -04:00
Jenkins for ownCloud
119ecc6f34
[tx-robot] updated from transifex
2013-10-27 02:32:11 -04:00
Vincent Petry
e246e2b669
Fixed encryption migration when entry is missing in DB
...
When resetting the DB and some users still have encrypted files, the
migration state isn't read properly becaue the migration entries are
missing. This causes the wrong file size to be returned.
This fix inserts the missing migration entry when this condition is met.
Fixes #5541
2013-10-25 15:38:35 +02:00
Markus Goetz
af58360434
files_encryption: Fix getFileSize()
...
For certain file sizes, we rounded to the wrong chunk number
and the returned bogus results. This should fix
https://github.com/owncloud/mirall/issues/1009
Conflicts:
apps/files_encryption/tests/util.php
2013-10-23 16:28:43 +02:00
Bjoern Schiessle
3d1d443529
remove debug output
2013-10-22 16:21:04 +02:00
Bjoern Schiessle
eb348b776c
set the init status to "NOT_INITIALIZED" if the encryption app gets enabled
2013-10-22 16:15:24 +02:00
Jenkins for ownCloud
a376407da3
[tx-robot] updated from transifex
2013-10-21 13:03:32 -04:00
Jenkins for ownCloud
6aee83cadf
[tx-robot] updated from transifex
2013-10-19 08:27:13 -04:00
Jenkins for ownCloud
2845747528
[tx-robot] updated from transifex
2013-10-17 13:48:52 -04:00
Björn Schießle
9f8d52ee44
Merge pull request #5329 from owncloud/enc_fix_unencrypted_size
...
try to fix unencrypted file size if it doesn't look plausible
2013-10-16 02:25:28 -07:00
Bjoern Schiessle
6bfd8bdf63
revert last changes
2013-10-16 11:24:56 +02:00
Morris Jobke
97905775b0
Merge pull request #5354 from owncloud/enc_tests
...
added simple test for getFileSize proxy
2013-10-16 02:14:35 -07:00
Jenkins for ownCloud
630be99ddf
[tx-robot] updated from transifex
2013-10-16 00:31:48 -04:00
Bjoern Schiessle
0811d2e304
added another test, if unencrypted size and encrypted size are equal we can also assume that something is wrong
2013-10-15 17:52:06 +02:00
Bjoern Schiessle
beaed2195d
fix comment
2013-10-15 17:36:52 +02:00
Bjoern Schiessle
0d4117f6d5
added simple test for getFileSize proxy
2013-10-15 17:33:31 +02:00
Bjoern Schiessle
d3af7a9aa4
check if we are writing to user/files, otherwise skip encryption
2013-10-14 17:13:14 +02:00
Bjoern Schiessle
58196304b8
fix array key
2013-10-14 16:43:18 +02:00
Bjoern Schiessle
4151fd3ed9
try to fix unencrypted file size if it doesn't look plausible
2013-10-14 16:34: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
