| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | remove old encryption app | Bjoern Schiessle | 2015-04-07 | 1 | -700/+0 |
| | | |||||
| * | Update license headers | Jenkins for ownCloud | 2015-03-26 | 1 | -15/+18 |
| | | |||||
| * | again | jknockaert | 2015-02-19 | 1 | -36/+0 |
| | | |||||
| * | try again | jknockaert | 2015-02-19 | 1 | -0/+36 |
| |\ | |||||
| | * | Merge remote-tracking branch 'origin/master' | jknockaert | 2015-02-19 | 1 | -1/+9 |
| | |\ | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/stream.php | ||||
| | | * | OC8 version | jknockaert | 2015-02-19 | 1 | -196/+170 |
| | | | | |||||
| | | * | update enc stream | jknockaert | 2014-12-17 | 1 | -136/+161 |
| | | | | |||||
| | * | | back | jknockaert | 2015-02-19 | 1 | -35/+34 |
| | |/ | |||||
| * | | new try | jknockaert | 2015-02-19 | 1 | -130/+160 |
| | | | |||||
| * | | fix typo of blog -> changed to block | Morris Jobke | 2015-01-19 | 1 | -1/+1 |
| | | | | | | | | | * fixes #13460 | ||||
| * | | if we download a public shared file we need to retrieve the user from the path | Bjoern Schiessle | 2015-01-13 | 1 | -2/+4 |
| | | | |||||
| * | | make versions of shared files downloadable | Bjoern Schiessle | 2015-01-09 | 1 | -34/+31 |
| |/ | |||||
| * | Update OCA\Encryption to OCA\Files_Encryption in the encryption app itself | Joas Schilling | 2014-12-09 | 1 | -11/+12 |
| | | |||||
| * | Fix namespace of files_encryption classes and autoload them | Joas Schilling | 2014-12-09 | 1 | -1/+1 |
| | | |||||
| * | 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 | 1 | -10/+12 |
| |\ \ | | | | | | | [encryption] clean up encryption exceptions | ||||
| | * | | clean up encryption exceptions | Bjoern Schiessle | 2014-11-07 | 1 | -10/+12 |
| | | | | |||||
| * | | | 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 | ||||
| * / | throw exception if private key is missing | Bjoern Schiessle | 2014-11-05 | 1 | -0/+5 |
| |/ | |||||
| * | support aes 256 | Bjoern Schiessle | 2014-07-23 | 1 | -14/+77 |
| | | |||||
| * | Remove all occurences of @brief and @returns from PHPDoc | Morris Jobke | 2014-05-19 | 1 | -5/+5 |
| | | | | | * test case added to avoid adding them later | ||||
| * | Fix whitespace issues | Robin McCorkell | 2014-05-16 | 1 | -1/+1 |
| | | |||||
| * | Fix PHPDoc in /apps | Robin McCorkell | 2014-05-16 | 1 | -10/+10 |
| | | |||||
| * | remove legacy aka deprecated code: OC_FilesystemView | Thomas Müller | 2014-05-12 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled | Morris Jobke | 2014-04-02 | 1 | -1/+1 |
| |\ | | | | | always encrypt files to owner | ||||
| | * | always encrypt files to owner | Bjoern Schiessle | 2014-03-31 | 1 | -1/+1 |
| | | | |||||
| * | | don't call getFileInfo() to avoid to open the same file twice | Bjoern Schiessle | 2014-03-31 | 1 | -12/+16 |
| |/ | |||||
| * | remember original fopen access type in pre-proxy because sometimes they change | Bjoern Schiessle | 2014-02-27 | 1 | -0/+3 |
| | | | | | during the fopen call, e.g. 'r' becomes 'r+' if we open an URL | ||||
| * | Don't use is_array on FileInfo | Robin Appelman | 2014-01-17 | 1 | -1/+1 |
| | | |||||
| * | extend the encryption stream wrapper to handle local files and add a fall ↵ | Bjoern Schiessle | 2013-12-18 | 1 | -6/+19 |
| | | | | | back for file size calculation if the storage doesn't support fseek | ||||
| * | implement ftell stream wrapper and fix return value from fseek stream wrapper | Bjoern Schiessle | 2013-12-18 | 1 | -1/+12 |
| | | |||||
| * | Merge branch 'master' into encryption_enable_public_upload | Bjoern Schiessle | 2013-11-27 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/helper.php apps/files_encryption/lib/keymanager.php apps/files_encryption/lib/stream.php apps/files_encryption/lib/util.php apps/files_encryption/tests/keymanager.php | ||||
| | * | some small changes according to the review comments | Bjoern Schiessle | 2013-11-27 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'encryption_work_with_public_gallery' into ↵ | Bjoern Schiessle | 2013-11-21 | 1 | -1/+2 |
| |\| | | | | | | | encryption_enable_public_upload | ||||
| | * | Merge branch 'master' into encryption_work_with_public_gallery | Bjoern Schiessle | 2013-11-21 | 1 | -1/+2 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/keymanager.php apps/files_encryption/lib/stream.php apps/files_encryption/lib/util.php apps/files_encryption/tests/crypt.php | ||||
| | | * | Merge pull request #5967 from owncloud/encryption-extstorage-fixsizereset | Vincent Petry | 2013-11-20 | 1 | -1/+2 |
| | | |\ | | | | | | | | | Fix for extstorage + encryption where unencrypted size is not kept | ||||
| | | | * | Fix for extstorage + encryption where unencrypted size is not kept | Vincent Petry | 2013-11-20 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for external storage with encryption where the unencrypted size is first written in the DB, then set back to zero, causing performance issue because the file needs to be reopened every time to find out the unencrypted size (and potentially needs a full redownload) | ||||
| | | * | | only check if the key file exists to decide if it is an encrypted file or not. | Bjoern Schiessle | 2013-11-20 | 1 | -1/+1 |
| | | |/ | | | | | | | | | | This solves problems with external storage which doesn't support fseek | ||||
| * | | | Merge branch 'encryption_work_with_public_gallery' into ↵ | Bjoern Schiessle | 2013-11-21 | 1 | -16/+15 |
| |\| | | | | | | | | | | | | | | | | | | | | encryption_enable_public_upload Conflicts: apps/files_encryption/lib/stream.php | ||||
| | * | | better distinction between userID and keyId | Bjoern Schiessle | 2013-11-21 | 1 | -15/+13 |
| | | | | |||||
| * | | | public upload now also works with encryption enabled | Bjoern Schiessle | 2013-11-21 | 1 | -7/+7 |
| |/ / | |||||
| * | | make sure that we always use the correct user id | Bjoern Schiessle | 2013-11-20 | 1 | -3/+9 |
| | | | |||||
| * | | [wip] make encryption work with public gallery sharing | Bjoern Schiessle | 2013-11-20 | 1 | -2/+4 |
| |/ | |||||
| * | Merge pull request #5908 from owncloud/fix_errorpage_call | Vincent Petry | 2013-11-18 | 1 | -1/+1 |
| |\ | | | | | [encryption] fix redirectToErrorPage() call | ||||
| | * | call error page with session as parameter | Bjoern Schiessle | 2013-11-17 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #5833 from owncloud/encryption_fixes | Björn Schießle | 2013-11-15 | 1 | -11/+14 |
| |\ \ | | | | | | | [encryption] preserve timestamps and etags during encryption/decryption | ||||
| | * | | fixPartialFilePath() is now stripPartialFileExtension() | Bjoern Schiessle | 2013-11-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | only update file cache if the file is already indexed to avoid that we ↵ | Bjoern Schiessle | 2013-11-12 | 1 | -11/+14 |
| | |/ | | | | | | | create a incomplete file cache entry | ||||
| * / | instead of writing etmp files we write the dummy file to data/user/cache to ↵ | Bjoern Schiessle | 2013-11-14 | 1 | -1/+1 |
| |/ | | | | avoid that etmp files show up in the users files list | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |