mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
24,078 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

24078 Commits

Author SHA1 Message Date
jknockaert 3e6eb28ee3 Applying diff as of https://github.com/owncloud/core/pull/15303 2015-04-07 13:30:28 +02:00
Bjoern Schiessle a85e2e0bfd make recovery settings work 2015-04-07 13:30:28 +02:00
Thomas Müller 4aa125cc0a fix unit test execution 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 2331298380 fix parameter declaration and class initialisation 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 937efe856d fix lib/private/encryption/util.php call 2015-04-07 13:30:28 +02:00
Thomas Müller 48fc3f3afe fix unit test execution, variable naming and kill no longer used $cacheFactory 2015-04-07 13:30:28 +02:00
Bjoern Schiessle c266b3b5b7 remove debug code from core 2015-04-07 13:30:28 +02:00
Bjoern Schiessle c64e0af4fb check if recovery key exists and encrypt the file with the recovery key if needed 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 24c6604388 add public link share key to file if it was shared as public link 2015-04-07 13:30:28 +02:00
Bjoern Schiessle bd99042a66 add setting templates 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 37e8268447 make sharing and unsharing work 2015-04-07 13:30:27 +02:00
Thomas Müller 8dde932546 Comment duplicate test methods 2015-04-07 13:30:27 +02:00
Clark Tomlinson d15c2e52b0 cleanup and removing cachefactory 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 2e00acda07 read encrypted files 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 2244ea998d core: documentation fixes 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 6c9251d9f8 make sure that all file keys are written to the key storage 2015-04-07 13:30:27 +02:00
Bjoern Schiessle cb9980823d core: small fixes 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 198b73fe32 write encrypted file to disc 2015-04-07 13:30:27 +02:00
Thomas Müller 7ffd77fac9 enable encryption unit test execution 2015-04-07 13:30:27 +02:00
Bjoern Schiessle c00e728e5f encryption app: remove legacy code, we do only server-side encryption 2015-04-07 13:30:27 +02:00
Thomas Müller ecb3834554 fixing obvious bugs while testing 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 810ca9105c implement rename and delete of encryption keys 2015-04-07 13:30:27 +02:00
Clark Tomlinson 0c2f9ca849 Updating keystorage movement and fixing hooks 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 506222567e add deleteKey methods to key storage 2015-04-07 13:30:27 +02:00
Bjoern Schiessle e2f714263f fix encryption manager to handle more than one encryption module 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 5bc9ababeb fix keystorage and add unit tests 2015-04-07 13:30:27 +02:00
Clark Tomlinson 39733c8da1 Initial commit 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 63e7fe608a create basic interfaces and wrapper to make encryption more modular 2015-04-07 13:30:27 +02:00
Morris Jobke 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
Morris Jobke 4334cdc973 Revert "[WIP] Only show SSL table header if there are certificates" 2015-04-07 13:30:08 +02:00
Jan-Christoph Borchardt 44a8160b58 widen displayName input field 2015-04-07 13:28:26 +02:00
Jan-Christoph Borchardt 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
Joas Schilling 81ec1c8a1a Remove hardcoded link to performance docs 2015-04-07 12:25:30 +02:00
Thomas Müller 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
Joas Schilling 0fcd273714 Select the timezone on the right timestamp and assert it 2015-04-07 10:13:51 +02:00
Joas Schilling 3bde7c2f67 When guessing the timezone, the offset might only be valid on a given timestamp 2015-04-07 10:13:06 +02:00
Joas Schilling e16d61e293 Remove server timezone dependency from files list test 2015-04-07 10:12:15 +02:00
Jenkins for ownCloud 95e55aa4ad [tx-robot] updated from transifex 2015-04-07 01:54:47 -04:00
Jenkins for ownCloud 2bff92ade5 [tx-robot] updated from transifex 2015-04-05 01:54:51 -04:00
Thomas Müller 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
Thomas Müller 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
Laurens Post 6ce790ebbc Fix occ user:add failure return codes 2015-04-04 12:25:34 +02:00
Jenkins for ownCloud 9b250baf9e [tx-robot] updated from transifex 2015-04-04 01:54:43 -04:00
Thomas Müller 3bf269e565 Merge pull request #15229 from owncloud/response-setContentLengthHeader 
Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround...
 2015-04-03 22:51:36 +02:00
Thomas Müller b2b3e1ac94 Merge pull request #15391 from owncloud/fix-language-caching 
fix caching of preferred language
 2015-04-03 22:51:13 +02:00
Thomas Müller 3d2116dfe7 Merge pull request #15386 from oparoz/yaml-cnf-mediatype 
Introducing media types for yml, yaml, cnf, conf
 2015-04-03 22:49:41 +02:00
Robin Appelman 712e478cb2 fix caching of preferred language 2015-04-03 15:36:24 +02:00
Morris Jobke a2087f30d1 Merge pull request #15383 from owncloud/fix-exception-message 
Update exception messages to better reflect and describe the problem
 2015-04-03 10:15:23 +02:00
Jenkins for ownCloud 23f1702f24 [tx-robot] updated from transifex 2015-04-03 01:54:53 -04:00
Olivier Paroz 70ec74e88b Introducing media types for yml, yaml, cnf, conf 2015-04-02 21:37:57 +02:00