Jenkins for ownCloud
f60ecfc7fd
[tx-robot] updated from transifex
2013-12-22 01:56:05 -05:00
Björn Schießle
6a3e38266f
Merge pull request #6507 from owncloud/enc_fix_getUser
...
[encryption] fix getUser Helper
2013-12-19 11:09:41 -08:00
Bjoern Schiessle
517a55a437
tests added
2013-12-19 19:43:57 +01:00
Björn Schießle
f0da7b20c1
Merge pull request #6517 from owncloud/fix_6510
...
[encryption] fix rename of shared files
2013-12-19 10:19:09 -08:00
Bjoern Schiessle
552d0a6feb
check if the old owner and the old path is available
2013-12-19 18:40:40 +01:00
Bjoern Schiessle
165542f27d
fix rename of shared files
2013-12-19 17:29:38 +01:00
Vincent Petry
06dec2632f
Merge pull request #6512 from owncloud/master-failingoracletests
...
Removed numRows usage from encryption app
2013-12-19 08:22:44 -08:00
Björn Schießle
079f1a6f41
Merge pull request #6495 from owncloud/enc_fseek_fallback
...
Added fseek fallback to the encryption app
2013-12-19 07:09:07 -08:00
Bjoern Schiessle
fe7fb66ef8
we can also have a path user/cache/...
2013-12-19 15:58:10 +01:00
Vincent Petry
963ee31efb
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-19 15:51:24 +01:00
Bjoern Schiessle
df0c1fe7f3
add test for the stream wrapper to read encrypted files from the system folder /tmp
2013-12-18 17:07:35 +01:00
Bjoern Schiessle
f9ec3a7124
test for isEncryptedPath()
2013-12-18 16:39:34 +01:00
Bjoern Schiessle
4f8ae789ae
extend the encryption stream wrapper to handle local files and add a fall back for file size calculation if the storage doesn't support fseek
2013-12-18 15:43:50 +01:00
Bjoern Schiessle
d9668977cd
implement ftell stream wrapper and fix return value from fseek stream wrapper
2013-12-18 15:41:40 +01:00
Thomas Müller
930a46e8e2
Merge pull request #6469 from owncloud/enc_cleanup
...
remove duplicated code
2013-12-18 05:21:42 -08:00
Björn Schießle
22a6bf9e5a
Merge pull request #6474 from owncloud/enc_detect_encrypted_files
...
reliable detect encrypted files
2013-12-17 09:12:02 -08:00
Bjoern Schiessle
9a94c07553
remove unused method tail()
2013-12-17 16:19:00 +01:00
Bjoern Schiessle
c955381d56
fall back to getLocalFile if storage doesn't support fseek
2013-12-17 16:18:05 +01:00
Bjoern Schiessle
69b89454a4
reliable detect encrypted files
2013-12-17 15:53:25 +01:00
Jenkins for ownCloud
a99dd3183c
[tx-robot] updated from transifex
2013-12-17 06:46:52 -05:00
Bjoern Schiessle
83417d69be
remove duplicated code
2013-12-17 11:28:05 +01:00
Björn Schießle
4ae148cebd
Merge pull request #6183 from owncloud/enc_tests
...
enable more encryption tests
2013-12-16 08:46:52 -08:00
Bjoern Schiessle
95892c8be9
update file cache for target file
2013-12-16 16:05:24 +01:00
Bjoern Schiessle
cdd816c930
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 16:05:24 +01:00
Bjoern Schiessle
6d489e0474
call set password hook because it doesn't get triggered during test execution and fix paths
2013-12-16 16:00:16 +01:00
Jenkins for ownCloud
77b68505c2
[tx-robot] updated from transifex
2013-12-13 14:44:31 -05:00
Jenkins for ownCloud
6aab1ebf44
[tx-robot] updated from transifex
2013-12-09 06:40:22 -05:00
Jenkins for ownCloud
079d20a80e
[tx-robot] updated from transifex
2013-12-07 22:28:29 -05:00
Björn Schießle
575a68074f
Merge pull request #6220 from owncloud/debug_oracle_errors
...
cherry-picks from #5884 , just for debugging purpose
2013-12-06 10:00:04 -08:00
Bart Visscher
40f148cc6c
Don't try to encrypt a file when the temp file isn't created
2013-12-06 17:01:13 +01:00
Bjoern Schiessle
9ff231590c
set unencrypted_size to 0 after decryption... so that the unencrypted_size gets re-calculated if encryption was enabled again
2013-12-06 16:11:41 +01:00
Bjoern Schiessle
9371944e43
fix typo
2013-12-06 12:20:42 +01:00
Bjoern Schiessle
58c0117c3d
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-06 12:20:31 +01:00
Bjoern Schiessle
8082ef2073
show change password form if key couldn't be decrypted
2013-12-06 12:20:22 +01:00
Bjoern Schiessle
85467b973a
add method to check if users private/public key exists
2013-12-06 12:20:14 +01:00
Jenkins for ownCloud
7e702f294f
[tx-robot] updated from transifex
2013-12-04 18:14:17 -05:00
Bjoern Schiessle
b919a65432
enable more tests
2013-12-04 17:43:38 +01:00
Morris Jobke
36bc6b871f
Revert "Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)."
...
This reverts commit efbf18652c
.
2013-12-04 13:27:38 +01:00
Jenkins for ownCloud
83ec234f53
[tx-robot] updated from transifex
2013-12-02 17:28:29 -05: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