Sam Tuke
|
a3289d3991
|
Merge branch 'master' into files_encryption
|
2013-02-06 15:08:53 +00:00 |
|
Sam Tuke
|
6870add18f
|
Development snapshot
|
2013-02-06 15:08:36 +00:00 |
|
Sam Tuke
|
16a5ace434
|
Fixed bug causing encrypted files to be doubly encrypted at login
Added comments and docblocks
|
2013-02-06 14:30:40 +00:00 |
Jenkins for ownCloud
|
335b6cd060
|
[tx-robot] updated from transifex
|
2013-02-06 00:06:28 +01:00 |
|
Sam Tuke
|
20b1d12cbf
|
Fixed comment typo, wrapped return value conditional on var assignment in session{}
|
2013-02-05 17:28:26 +00:00 |
|
Sam Tuke
|
4ba0ab7f65
|
Added missing translation wrapping
|
2013-02-05 17:22:59 +00:00 |
|
Sam Tuke
|
b84e83261e
|
Added notice to personal settings indicating what filetypes are not encrypted
|
2013-02-05 17:06:15 +00:00 |
|
Sam Tuke
|
680c5b3dad
|
Removed debugging output
|
2013-02-05 16:11:50 +00:00 |
|
Sam Tuke
|
221b69dd0e
|
Fixed bug relating to Filesystem{} that prevented webdav logins with files_encryption
|
2013-02-05 16:09:01 +00:00 |
|
Sam Tuke
|
a1f200c1e5
|
Cleaned up path formatting with new method stripUserFilesPath()
|
2013-02-05 15:59:28 +00:00 |
|
Sam Tuke
|
53248a9b60
|
Recryption of legacy encrypted files now working on login
|
2013-02-05 15:35:29 +00:00 |
|
Sam Tuke
|
fd90b82acd
|
Merge github.com:owncloud/core
|
2013-02-05 13:44:45 +00:00 |
|
Jenkins for ownCloud
|
98f37f4bed
|
[tx-robot] updated from transifex
|
2013-02-05 00:20:29 +01:00 |
|
Jenkins for ownCloud
|
2936140838
|
[tx-robot] updated from transifex
|
2013-02-03 00:06:15 +01:00 |
|
Jenkins for ownCloud
|
b29b55a332
|
[tx-robot] updated from transifex
|
2013-02-02 00:08:15 +01:00 |
|
Sam Tuke
|
0677d56ee2
|
Added debugging output relating to recrypting legacy files
|
2013-02-01 19:31:15 +00:00 |
|
Sam Tuke
|
06847f609b
|
Improved support for detecting and recrypting legacy files. Bugs remain.
|
2013-01-31 19:40:51 +00:00 |
|
Sam Tuke
|
c6b3bdd5a0
|
Fixed compatibility with filecache rewrite merge
|
2013-01-31 17:51:46 +00:00 |
|
Sam Tuke
|
2183f77527
|
Fixed incompatibilities with filecache rewrite merge
|
2013-01-31 16:49:07 +00:00 |
|
Sam Tuke
|
31e723a907
|
Merge github.com:owncloud/core
Conflicts:
lib/public/share.php
|
2013-01-31 16:30:37 +00:00 |
|
Jenkins for ownCloud
|
209d599ec5
|
[tx-robot] updated from transifex
|
2013-01-31 17:05:21 +01:00 |
|
Jenkins for ownCloud
|
00a30e6651
|
[tx-robot] updated from transifex
|
2013-01-31 00:31:28 +01:00 |
|
Sam Tuke
|
c7b1bdf00e
|
Fixed handling of keyfile subdir creation
Improved keyfile subdir deletion (1 bug remains here)
|
2013-01-30 18:52:02 +00:00 |
|
Sam Tuke
|
61b23ce6cc
|
Working on support for deleting directories (removing all keyfiles)
|
2013-01-30 17:25:17 +00:00 |
|
Jenkins for ownCloud
|
68266e70f2
|
[tx-robot] updated from transifex
|
2013-01-30 00:25:41 +01:00 |
|
Sam Tuke
|
c1f20fe37a
|
Made encyrption keyfiles be deleted when their parents are
Made encryption keyfiles be renamed when their parents are
Fixed bugs with encryptAll() execution on login
|
2013-01-29 19:54:40 +00:00 |
|
Jenkins for ownCloud
|
8c4931a645
|
[tx-robot] updated from transifex
|
2013-01-29 00:06:20 +01:00 |
|
Jenkins for ownCloud
|
b655444709
|
[tx-robot] updated from transifex
|
2013-01-28 00:05:43 +01:00 |
|
Jenkins for ownCloud
|
00a28062e1
|
[tx-robot] updated from transifex
|
2013-01-27 00:06:21 +01:00 |
|
Jenkins for ownCloud
|
af4411e33d
|
[tx-robot] updated from transifex
|
2013-01-26 00:10:07 +01:00 |
|
Jenkins for ownCloud
|
6832dddf39
|
[tx-robot] updated from transifex
|
2013-01-25 00:05:56 +01:00 |
|
Sam Tuke
|
094213e231
|
Fixed many coding guidelines issues
Continued work on upgrade path via login hook listener
New spec file with notes
|
2013-01-24 18:37:34 +00:00 |
|
Thomas Mueller
|
ef88ceba8c
|
drop SimpleTest compatibility
|
2013-01-24 16:47:17 +01:00 |
|
Jenkins for ownCloud
|
3ff32eba25
|
[tx-robot] updated from transifex
|
2013-01-24 00:07:38 +01:00 |
|
Sam Tuke
|
59ca312263
|
Work on util: findFiles() and encryptAll(); both close to working
Ecnryption unit tests are failing, recursion in filecache{}
|
2013-01-23 19:24:26 +00:00 |
|
Sam Tuke
|
cd832935e8
|
Merge branch 'files_encryption'
|
2013-01-23 12:54:09 +00:00 |
|
Jenkins for ownCloud
|
c986dbe573
|
[tx-robot] updated from transifex
|
2013-01-23 00:06:18 +01:00 |
|
Sam Tuke
|
47592657d7
|
Added localisation for encryption settings
|
2013-01-22 17:15:03 +00:00 |
|
Sam Tuke
|
619780a67d
|
Merge branch 'master' into files_encryption
|
2013-01-22 16:50:20 +00:00 |
|
Sam Tuke
|
d95fc4e1e3
|
Adding sharing support: added new method in Keymanager setShareKey()
Added notes in proxy{} and stream{} pointing to share support
|
2013-01-14 19:07:28 +00:00 |
|
Sam Tuke
|
1641ed8ac7
|
Merge branch 'master' into files_encryption
|
2013-01-14 16:54:25 +00:00 |
|
Sam Tuke
|
e9f3c5feea
|
Added creation of dir for shared file env encryption keys
Added comment to use multiKeyEncrypt
|
2013-01-14 15:39:04 +00:00 |
|
Sam Tuke
|
3fbf362ba2
|
Removed debugging comments
|
2013-01-14 12:36:46 +00:00 |
|
Jenkins for ownCloud
|
d03dce1283
|
[tx-robot] updated from transifex
|
2013-01-11 00:06:14 +01:00 |
|
Sam Tuke
|
fed74eda1c
|
Removed old and unnecessary comments
|
2013-01-10 18:48:40 +00:00 |
|
Sam Tuke
|
2e30641caa
|
Removed misleading crypto gen comment
|
2013-01-10 18:19:37 +00:00 |
|
Sam Tuke
|
9ca9124dc1
|
Merge branch 'master' into files_encryption
|
2013-01-10 18:07:15 +00:00 |
|
Sam Tuke
|
61104d1441
|
Re-added 'checkAdminUser'
Improved code formatting
|
2013-01-10 18:04:52 +00:00 |
|
Jenkins for ownCloud
|
912050afa0
|
[tx-robot] updated from transifex
|
2013-01-10 00:05:53 +01:00 |
|
Sam Tuke
|
015787fbb3
|
All in-use unit tests now passing after merge
|
2013-01-06 18:38:35 +00:00 |