Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move keys instead of copy during encryption key migration | Vincent Petry | 2015-02-27 | 1 | -2/+2 |
| | |||||
* | Disable the cache updater when doing the encryption migration | Robin Appelman | 2015-02-27 | 1 | -9/+15 |
| | |||||
* | Revert "Updating license headers" | Morris Jobke | 2015-02-26 | 10 | -201/+171 |
| | | | | This reverts commit 6a1a4880f0d556fb090f19a5019fec31916f5c36. | ||||
* | Updating license headers | Jenkins for ownCloud | 2015-02-23 | 10 | -171/+201 |
| | |||||
* | Merge pull request #13954 from owncloud/fix-enc-mig-user-retrieval | Thomas Müller | 2015-02-06 | 1 | -4/+9 |
|\ | | | | | Fix enc mig user retrieval | ||||
| * | always specify limit, except you do like questionable surprises | Arthur Schiwon | 2015-02-06 | 1 | -4/+9 |
| | | | | | | | | always specify limit, except you do like questionable surprises, part 2 | ||||
* | | don't check if we have a valid user | Bjoern Schiessle | 2015-02-06 | 1 | -5/+1 |
|/ | |||||
* | get correct user for paths to the trash bin, needed for remote shares if the ↵ | Bjoern Schiessle | 2015-01-30 | 1 | -2/+2 |
| | | | | size of of trash gets calculated | ||||
* | Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares | Morris Jobke | 2015-01-29 | 1 | -1/+1 |
|\ | | | | | make sure that we always create a public share key for remote shares | ||||
| * | make sure that we always create a public share key for remote shares | Bjoern Schiessle | 2015-01-29 | 1 | -1/+1 |
| | | |||||
* | | user fs must be setup up, so that the real user folder is mounted on the ↵ | Arthur Schiwon | 2015-01-22 | 1 | -0/+1 |
| | | | | | | | | username based path | ||||
* | | adding console command to migrate encryption keys - refs #13450 | Thomas Müller | 2015-01-22 | 1 | -21/+28 |
|/ | |||||
* | Bypass the view when storing encryption keys | Robin Appelman | 2015-01-20 | 1 | -12/+9 |
| | |||||
* | fix typo of blog -> changed to block | Morris Jobke | 2015-01-19 | 1 | -1/+1 |
| | | | | * fixes #13460 | ||||
* | Add class attribute types in encryption Util class | Vincent Petry | 2015-01-19 | 1 | -0/+51 |
| | |||||
* | Skip stray part files during initial encryption | Vincent Petry | 2015-01-19 | 1 | -0/+4 |
| | |||||
* | Merge pull request #13288 from owncloud/enc_fix_public_download | Lukas Reschke | 2015-01-14 | 2 | -13/+13 |
|\ | | | | | [encryption] fix download of public shared files | ||||
| * | if we download a public shared file we need to retrieve the user from the path | Bjoern Schiessle | 2015-01-13 | 2 | -13/+13 |
| | | |||||
* | | adapt decrypt all and restore/delete key backups to the new folder structure ↵ | Bjoern Schiessle | 2015-01-13 | 1 | -7/+52 |
| | | | | | | | | for encryption key introduced with OC8 | ||||
* | | Check array size, before using the 3rd element from it | Joas Schilling | 2015-01-12 | 1 | -0/+9 |
|/ | |||||
* | Merge pull request #13182 from owncloud/download_versions | Björn Schießle | 2015-01-12 | 5 | -80/+131 |
|\ | | | | | make versions of shared files downloadable | ||||
| * | make versions of shared files downloadable | Bjoern Schiessle | 2015-01-09 | 5 | -80/+131 |
| | | |||||
* | | don't move encryption keys if a mount point was renamed | Bjoern Schiessle | 2015-01-09 | 1 | -626/+628 |
|/ | |||||
* | Merge pull request #12961 from owncloud/try_to_cache_keys | Morris Jobke | 2014-12-22 | 1 | -10/+46 |
|\ | | | | | cache keys to read them only once from the hard disc | ||||
| * | cache keys to read them only once from the hard disc | Bjoern Schiessle | 2014-12-19 | 1 | -10/+46 |
| | | |||||
* | | Next step in server-to-server sharing next generation, see #12285 | Bjoern Schiessle | 2014-12-19 | 2 | -14/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Beside some small improvements and bug fixes this will probably the final state for OC8. To test this you need to set up two ownCloud instances. Let's say: URL: myPC/firstOwnCloud user: user1 URL: myPC/secondOwnCloud user: user2 Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud". The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined. If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him. | ||||
* | | first step to drop \OCP\Config:: in favour of IConfig | Morris Jobke | 2014-12-17 | 1 | -2/+2 |
|/ | |||||
* | Update OCA\Encryption to OCA\Files_Encryption in the encryption app itself | Joas Schilling | 2014-12-09 | 9 | -85/+83 |
| | |||||
* | Fix namespace of files_encryption classes and autoload them | Joas Schilling | 2014-12-09 | 9 | -8/+635 |
| | |||||
* | reduce OC_Preferences, OC_Config and \OCP\Config usage | Morris Jobke | 2014-12-08 | 1 | -5/+15 |
| | | | | | | | | | | * files_encryption * files_versions * files_trashbin * tests * status.php * core * server container | ||||
* | OC8 and later requires PHP >= 5.4, so we can remove the check from the ↵ | Bjoern Schiessle | 2014-12-04 | 1 | -5/+1 |
| | | | | encryption app | ||||
* | fix typo | Bjoern Schiessle | 2014-12-03 | 1 | -1/+1 |
| | |||||
* | upgrade to new folder structure | Bjoern Schiessle | 2014-12-02 | 4 | -33/+268 |
| | |||||
* | change private/public key names for consistency reasons | Bjoern Schiessle | 2014-11-26 | 4 | -187/+172 |
| | |||||
* | harmonize copyright notice | Bjoern Schiessle | 2014-11-26 | 6 | -16/+24 |
| | |||||
* | new folder structure for keys | Bjoern Schiessle | 2014-11-26 | 4 | -361/+132 |
| | | | | | | all keys are now in files_encryption/key/path_to_file/filename/ share keys are named: user.shareKey file key is named: fileKey | ||||
* | replace \OC:: with \OC::->getSession() | Bjoern Schiessle | 2014-11-25 | 1 | -2/+2 |
| | |||||
* | don't store private public-share-key in session | Bjoern Schiessle | 2014-11-25 | 1 | -17/+10 |
| | |||||
* | remove unused variable | Bjoern Schiessle | 2014-11-25 | 1 | -1/+0 |
| | |||||
* | Fix file upload to ext storage when recovery key is enabled | Vincent Petry | 2014-11-20 | 1 | -9/+21 |
| | | | | | | | | Fixes an issue when uploading files to external storage when recovery keys are enabled The Util class only works with real users, so instantiating it with the virtual recovery key user or public key user can cause issues. | ||||
* | listen to the post_passwordReset hook, backup the old keys and create a new ↵ | Bjoern Schiessle | 2014-11-17 | 2 | -0/+13 |
| | | | | key pair for the user | ||||
* | Merge pull request #12218 from owncloud/issue/10991-fixes | Morris Jobke | 2014-11-17 | 1 | -0/+1 |
|\ | | | | | Issue/10991 Make unit tests pass on windows | ||||
| * | Fix single run of encryption tests and usages of uniqid() and fopen() | Joas Schilling | 2014-11-17 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #12027 from owncloud/cleanup_exceptions | Vincent Petry | 2014-11-10 | 4 | -90/+34 |
|\ \ | | | | | | | [encryption] clean up encryption exceptions | ||||
| * | | clean up encryption exceptions | Bjoern Schiessle | 2014-11-07 | 4 | -90/+34 |
| | | | |||||
* | | | only set the values we need and make sure that we write the file info for both | Bjoern Schiessle | 2014-11-07 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | the real file and the part file, because some information from the part file might be needed later | ||||
* | | | also try to get file info from part file | Bjoern Schiessle | 2014-11-07 | 1 | -2/+2 |
|/ / | |||||
* | | throw exception if private key is missing | Bjoern Schiessle | 2014-11-05 | 2 | -0/+13 |
| | | |||||
* | | still try to encrypt files, even if the session is not initialized. The ↵ | Bjoern Schiessle | 2014-11-04 | 1 | -2/+1 |
|/ | | | | stream wrapper will throw an error which is better than silently continue. | ||||
* | Merge pull request #11659 from jknockaert/master | Vincent Petry | 2014-10-30 | 1 | -38/+54 |
|\ | | | | | rework getFileSize |