4441835d18
https://github.com/owncloud/core/pull/15305#discussion_r27382305
...
Conflicts:
lib/private/files/stream/encryption.php
2015-04-07 13:30:28 +02:00
90487384f7
initializing some variables
2015-04-07 13:30:28 +02:00
0c48b069ba
call end() before closing the file
2015-04-07 13:30:28 +02:00
498625ea3a
adding unit tests for stream wrapper
2015-04-07 13:30:28 +02:00
a905f641b3
various fixes & start to unit test the encryption storage wrapper
2015-04-07 13:30:28 +02:00
3e6eb28ee3
Applying diff as of https://github.com/owncloud/core/pull/15303
2015-04-07 13:30:28 +02:00
a85e2e0bfd
make recovery settings work
2015-04-07 13:30:28 +02:00
4aa125cc0a
fix unit test execution
2015-04-07 13:30:28 +02:00
2331298380
fix parameter declaration and class initialisation
2015-04-07 13:30:28 +02:00
937efe856d
fix lib/private/encryption/util.php call
2015-04-07 13:30:28 +02:00
48fc3f3afe
fix unit test execution, variable naming and kill no longer used $cacheFactory
2015-04-07 13:30:28 +02:00
c266b3b5b7
remove debug code from core
2015-04-07 13:30:28 +02:00
c64e0af4fb
check if recovery key exists and encrypt the file with the recovery key if needed
2015-04-07 13:30:28 +02:00
24c6604388
add public link share key to file if it was shared as public link
2015-04-07 13:30:28 +02:00
bd99042a66
add setting templates
2015-04-07 13:30:28 +02:00
37e8268447
make sharing and unsharing work
2015-04-07 13:30:27 +02:00
8dde932546
Comment duplicate test methods
2015-04-07 13:30:27 +02:00
d15c2e52b0
cleanup and removing cachefactory
2015-04-07 13:30:27 +02:00
2e00acda07
read encrypted files
2015-04-07 13:30:27 +02:00
2244ea998d
core: documentation fixes
2015-04-07 13:30:27 +02:00
6c9251d9f8
make sure that all file keys are written to the key storage
2015-04-07 13:30:27 +02:00
cb9980823d
core: small fixes
2015-04-07 13:30:27 +02:00
198b73fe32
write encrypted file to disc
2015-04-07 13:30:27 +02:00
7ffd77fac9
enable encryption unit test execution
2015-04-07 13:30:27 +02:00
c00e728e5f
encryption app: remove legacy code, we do only server-side encryption
2015-04-07 13:30:27 +02:00
ecb3834554
fixing obvious bugs while testing
2015-04-07 13:30:27 +02:00
810ca9105c
implement rename and delete of encryption keys
2015-04-07 13:30:27 +02:00
0c2f9ca849
Updating keystorage movement and fixing hooks
2015-04-07 13:30:27 +02:00
506222567e
add deleteKey methods to key storage
2015-04-07 13:30:27 +02:00
e2f714263f
fix encryption manager to handle more than one encryption module
2015-04-07 13:30:27 +02:00
5bc9ababeb
fix keystorage and add unit tests
2015-04-07 13:30:27 +02:00
39733c8da1
Initial commit
2015-04-07 13:30:27 +02:00
63e7fe608a
create basic interfaces and wrapper to make encryption more modular
2015-04-07 13:30:27 +02:00
9694dabd5e
Merge pull request #15432 from owncloud/revert-15345-fix_15263
...
Revert "[WIP] Only show SSL table header if there are certificates"
2015-04-07 13:30:14 +02:00
4334cdc973
Revert "[WIP] Only show SSL table header if there are certificates"
2015-04-07 13:30:08 +02:00
44a8160b58
widen displayName input field
2015-04-07 13:28:26 +02:00
2b6e13d088
Merge pull request #15345 from rullzer/fix_15263
...
[WIP] Only show SSL table header if there are certificates
2015-04-07 13:19:36 +02:00
8e1a51731a
apps mgmt: style experimental apps section, small design fixes
2015-04-07 12:27:39 +02:00
81ec1c8a1a
Remove hardcoded link to performance docs
2015-04-07 12:25:30 +02:00
6250365bf4
app mgmt app level design enhancements
2015-04-07 11:55:10 +02:00
1f8e6e78cc
Merge pull request #15424 from owncloud/failing-master-tests
...
Fix failing tests related to timezones on master
2015-04-07 11:13:05 +02:00
0fcd273714
Select the timezone on the right timestamp and assert it
2015-04-07 10:13:51 +02:00
3bde7c2f67
When guessing the timezone, the offset might only be valid on a given timestamp
2015-04-07 10:13:06 +02:00
e16d61e293
Remove server timezone dependency from files list test
2015-04-07 10:12:15 +02:00
95e55aa4ad
[tx-robot] updated from transifex
2015-04-07 01:54:47 -04:00
2bff92ade5
[tx-robot] updated from transifex
2015-04-05 01:54:51 -04:00
8062b906b9
Merge pull request #15403 from Crote/occ-user-add-return
...
Fix occ user:add failure return codes
2015-04-04 16:34:40 +02:00
d9323ca1be
Add password input from env variable for occ user:{add, resetpassword}
...
This commit adds the --password-from-env switch to the `occ user:add` and
`occ user:resetpassword` commands. When this parameter is given, Owncloud
will use the password specified in environment variable OC_PASS. This
is safer than using command line parameters, as those can be read by any
process.
2015-04-04 13:24:57 +02:00
4996706078
Merge pull request #15338 from owncloud/encryption-mount-option
...
Add mount point to disable the encryption wrapper
2015-04-04 12:51:41 +02:00
6ce790ebbc
Fix occ user:add failure return codes
2015-04-04 12:25:34 +02:00
Thomas Müller
Bjoern Schiessle
jknockaert
Clark Tomlinson
Morris Jobke
Jan-Christoph Borchardt
Joas Schilling
Jenkins for ownCloud
Laurens Post