Bjoern Schiessle
4c1510b729
updated description of the files encryption app
2014-01-17 12:56:58 +01:00
Bjoern Schiessle
3c7541e97c
don't try to encrypt/decrypt cache chunks or files in the trash bin
2014-01-15 15:58:56 +01:00
Bjoern Schiessle
13461698e4
tests added
2013-12-19 20:10:42 +01:00
Bjoern Schiessle
eaa5dd0282
we can also have a path user/cache/...
2013-12-19 20:10:29 +01:00
Bjoern Schiessle
672cbc5378
check if the old owner and the old path is available
2013-12-19 19:20:29 +01:00
Bjoern Schiessle
2f568c9766
fix rename of shared files
2013-12-19 19:20:17 +01:00
Vincent Petry
c4c972fd2f
Merge pull request #6498 from owncloud/stable6-oracleencryptiontestfix
...
[stable6] Trying to fix failing encryption tests on Oracle
2013-12-19 06:45:37 -08:00
Vincent Petry
1f93b4e842
Removed numRows usage from encryption app
...
numRows on Oracle always seem to return 0.
This fix removes numRows usage from the encryption and sharing app.
This fixes unit tests and potentially the encryption app itself
(migration status) when running on Oracle
2013-12-18 21:14:26 +01:00
Bjoern Schiessle
2f0ec8256f
reliable detect encrypted files
2013-12-17 18:14:36 +01:00
Bjoern Schiessle
3160b23291
update file cache for target file
2013-12-16 17:49:14 +01:00
Bjoern Schiessle
73a0b690e9
only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted
2013-12-16 17:49:05 +01:00
Bjoern Schiessle
bdb4890d04
call set password hook because it doesn't get triggered during test execution and fix paths
2013-12-16 17:48:52 +01:00
Bjoern Schiessle
9091dd7833
enable more tests
2013-12-16 17:48:44 +01:00
Vincent Petry
811ef19ada
Removed comments in database schema of encryption app
2013-12-14 11:18:48 +01:00
Bart Visscher
281bbf4bd4
Don't try to encrypt a file when the temp file isn't created
2013-12-06 19:07:11 +01:00
Bjoern Schiessle
01de6c565a
set unencrypted_size to 0 after decryption... so that the unencrypted_size gets re-calculated if encryption was enabled again
2013-12-06 17:08:17 +01:00
Bjoern Schiessle
91ca1cf985
fix typo
2013-12-05 20:02:41 +01:00
Bjoern Schiessle
f8a4bcdd50
only create new key on password change if a recovery key exists or if the user don't have any private/public keys
2013-12-05 19:41:01 +01:00
Bjoern Schiessle
418d401bf9
show change password form if key couldn't be decrypted
2013-12-05 18:50:52 +01:00
Bjoern Schiessle
d0afd774b7
add method to check if users private/public key exists
2013-12-05 18:49:55 +01:00
Morris Jobke
dffc2a8b1c
Revert "Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)."
...
This reverts commit efbf18652c
2013-12-04 13:26:59 +01:00
Andreas Fischer
efbf18652c
Adjust files_encryption requirements to the new core requirement (PHP 5.3.8).
2013-11-29 20:34:57 +01:00
Jenkins for ownCloud
1b18c5a047
[tx-robot] updated from transifex
2013-11-29 14:10:40 -05:00
Arthur Schiwon
ee78d48186
loginname is not necessarily username
2013-11-28 13:26:31 +01:00
Vincent Petry
a1d2f0f516
Merge pull request #6094 from owncloud/enc_fix_reshares
...
fix path reconstruction for reshares
2013-11-28 01:41:34 -08:00
Bjoern Schiessle
efe7c4075a
fix path reconstruction for reshares
2013-11-27 23:26:04 +01:00
Morris Jobke
55d7cf8ffd
improve encryption message
2013-11-27 23:07:19 +01:00
Bjoern Schiessle
d9729168f9
some small js fixes
2013-11-27 22:42:03 +01:00
Bjoern Schiessle
0219b8b3b9
add spinner to the template so that it can be loaded in time
2013-11-27 22:36:47 +01:00
Bjoern Schiessle
e0924a5f07
switch to large spinner
2013-11-27 21:58:38 +01:00
Bjoern Schiessle
1536c7ea58
switch from "name" attribute to "id"
2013-11-27 17:01:21 +01:00
Bjoern Schiessle
1065c33543
Merge branch 'master' into encryption_initial_enc_indicator
2013-11-27 16:44:06 +01:00
Bjoern Schiessle
060e0ad0cd
with the latest changes in master $this-userID is always the correct ID, so we no longer need the extra parameter
2013-11-27 15:35:32 +01:00
Bjoern Schiessle
9fb71af988
Merge branch 'master' into encryption_enable_public_upload
...
Conflicts:
apps/files_encryption/lib/helper.php
apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/keymanager.php
2013-11-27 15:08:09 +01:00
Thomas Müller
5b7b053634
Merge pull request #5976 from owncloud/encryption_work_with_public_gallery
...
Encryption work with public gallery
2013-11-27 04:25:54 -08:00
Bjoern Schiessle
7f2bdb0e97
typo fixed
2013-11-27 12:25:04 +01:00
Bjoern Schiessle
7f3b178d73
some small changes according to the review comments
2013-11-27 11:46:24 +01:00
Bjoern Schiessle
7240d349da
Merge branch 'master' into encryption_initial_enc_indicator
2013-11-26 19:15:53 +01:00
Bjoern Schiessle
c7e1fe50c2
added a small version of the dark loading gif, looks nicer on the blue background
2013-11-26 17:14:16 +01:00
Jenkins for ownCloud
fb7aa2f014
[tx-robot] updated from transifex
2013-11-26 10:47:07 -05:00
Bjoern Schiessle
0617e06f69
use POST instead of GET
2013-11-26 11:38:49 +01:00
Bjoern Schiessle
35a6ad255d
fix typo in var name
2013-11-26 11:38:45 +01:00
Jenkins for ownCloud
dc67c7efa9
[tx-robot] updated from transifex
2013-11-26 04:04:05 -05:00
Bjoern Schiessle
8974107b4e
remove debug output
2013-11-25 23:57:08 +01:00
Bjoern Schiessle
d6fb2afa85
show a message at the log-in screen if inital encryption take place
2013-11-25 23:49:05 +01:00
Bjoern Schiessle
49038545f8
Merge branch 'encryption_work_with_public_gallery' of github.com:owncloud/core into encryption_work_with_public_gallery
2013-11-25 10:29:53 +01:00
Bjoern Schiessle
9c4b8ae54c
fix typo in comment
2013-11-25 10:29:05 +01:00
Thomas Mueller
2a465fb20f
Merge branch 'master' into encryption_work_with_public_gallery
2013-11-24 23:20:46 +01:00
Jenkins for ownCloud
ba0e09adce
[tx-robot] updated from transifex
2013-11-24 00:14:51 -05:00
Jenkins for ownCloud
5d9731cef2
[tx-robot] updated from transifex
2013-11-21 10:05:34 -05:00
