| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | fix typo in comment | Bjoern Schiessle | 2013-11-25 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Merge branch 'encryption_work_with_public_gallery' into ↵ | Bjoern Schiessle | 2013-11-21 | 1 | -4/+10 | |
| | |\ \ | | | | | | | | | | | | | encryption_enable_public_upload | |||||
| | | * | | check HTTP Referer to check if we come from public.php or from a internal page. | Bjoern Schiessle | 2013-11-21 | 1 | -4/+10 | |
| | | |/ | | | | | | | | | | Necessary to detect public access also if a user is logged in. | |||||
| | * | | Merge branch 'encryption_work_with_public_gallery' into ↵ | Bjoern Schiessle | 2013-11-21 | 1 | -1/+1 | |
| | |\| | | | | | | | | | | encryption_enable_public_upload | |||||
| | | * | fix getFileKey() call | Bjoern Schiessle | 2013-11-21 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Merge branch 'encryption_work_with_public_gallery' into ↵ | Bjoern Schiessle | 2013-11-21 | 4 | -13/+15 | |
| | |\| | | | | | | | | | | encryption_enable_public_upload | |||||
| | | * | Merge branch 'master' into encryption_work_with_public_gallery | Bjoern Schiessle | 2013-11-21 | 4 | -13/+15 | |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'encryption_work_with_public_gallery' into ↵ | Bjoern Schiessle | 2013-11-21 | 2 | -29/+34 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | encryption_enable_public_upload Conflicts: apps/files_encryption/lib/stream.php | |||||
| | | * | | better distinction between userID and keyId | Bjoern Schiessle | 2013-11-21 | 2 | -28/+32 | |
| | | | | | ||||||
| | * | | | public upload now also works with encryption enabled | Bjoern Schiessle | 2013-11-21 | 4 | -22/+17 | |
| | |/ / | ||||||
| | * | | make sure that we always use the correct user id | Bjoern Schiessle | 2013-11-20 | 3 | -11/+21 | |
| | | | | ||||||
| | * | | fix some getShareKey() and getFileKey() calls | Bjoern Schiessle | 2013-11-20 | 1 | -3/+3 | |
| | | | | ||||||
| | * | | [wip] make encryption work with public gallery sharing | Bjoern Schiessle | 2013-11-20 | 5 | -56/+65 | |
| | | | | ||||||
| * | | | with the latest changes in master $this-userID is always the correct ID, so ↵ | Bjoern Schiessle | 2013-11-27 | 1 | -24/+20 | |
| | | | | | | | | | | | | | we no longer need the extra parameter | |||||
| * | | | fix typo in var name | Bjoern Schiessle | 2013-11-26 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | show a message at the log-in screen if inital encryption take place | Bjoern Schiessle | 2013-11-25 | 1 | -5/+11 | |
| | |/ |/| | ||||||
| * | | Merge pull request #5967 from owncloud/encryption-extstorage-fixsizereset | Vincent Petry | 2013-11-20 | 2 | -1/+5 | |
| |\ \ | | | | | | | 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 | 2 | -1/+5 | |
| | |/ | | | | | | | | | | | | | 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) | |||||
| * | | check if it is a cached file or a version to resolve the correct path to the ↵ | Bjoern Schiessle | 2013-11-20 | 1 | -1/+5 | |
| | | | | | | | | | file key | |||||
| * | | only check if the key file exists to decide if it is an encrypted file or not. | Bjoern Schiessle | 2013-11-20 | 3 | -18/+10 | |
| |/ | | | | This solves problems with external storage which doesn't support fseek | |||||
| * | make sure that the owners home is mounted correctly | Bjoern Schiessle | 2013-11-19 | 1 | -0/+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 | 2 | -22/+25 | |
| |\ \ | | | | | | | [encryption] preserve timestamps and etags during encryption/decryption | |||||
| | * | | Merge branch 'master' into encryption_fixes | Bjoern Schiessle | 2013-11-13 | 4 | -55/+53 | |
| | |\| | ||||||
| | * | | 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 | |||||
| | * | | make sure that we keep the correct timestamp and etag after ↵ | Bjoern Schiessle | 2013-11-12 | 1 | -11/+11 | |
| | | | | | | | | | | | | | encryoption/decryption | |||||
| * | | | instead of writing etmp files we write the dummy file to data/user/cache to ↵ | Bjoern Schiessle | 2013-11-14 | 3 | -15/+50 | |
| | |/ |/| | | | | | avoid that etmp files show up in the users files list | |||||
| * | | Merge pull request #5447 from owncloud/fixing-5117-master | Vincent Petry | 2013-11-13 | 4 | -55/+53 | |
| |\ \ | |/ |/| | No data corruption duriing parallel upload | |||||
| | * | rename fixPartialFilePath() to stripPartialFileExtension(), this name ↵ | Bjoern Schiessle | 2013-11-12 | 3 | -6/+6 | |
| | | | | | | | | | describes better what the method actually does | |||||
| | * | fixing tests for the new part file handling | Bjoern Schiessle | 2013-11-12 | 3 | -25/+25 | |
| | | | ||||||
| | * | let encryption app detect transfer id in path and handle it correctly | Bjoern Schiessle | 2013-11-11 | 3 | -36/+34 | |
| | | | ||||||
| * | | Fixed encryption migration when entry is missing in DB | Vincent Petry | 2013-10-25 | 1 | -1/+12 | |
| | | | | | | | | | | | | | | | | | | | | | When resetting the DB and some users still have encrypted files, the migration state isn't read properly becaue the migration entries are missing. This causes the wrong file size to be returned. This fix inserts the missing migration entry when this condition is met. Fixes #5541 | |||||
| * | | files_encryption: Fix getFileSize() | Markus Goetz | 2013-10-23 | 1 | -2/+9 | |
| | | | | | | | | | | | | | | | | | | | For certain file sizes, we rounded to the wrong chunk number and the returned bogus results. This should fix https://github.com/owncloud/mirall/issues/1009 Conflicts: apps/files_encryption/tests/util.php | |||||
| * | | set the init status to "NOT_INITIALIZED" if the encryption app gets enabled | Bjoern Schiessle | 2013-10-22 | 2 | -1/+2 | |
| |/ | ||||||
| * | Merge pull request #5329 from owncloud/enc_fix_unencrypted_size | Björn Schießle | 2013-10-16 | 1 | -2/+19 | |
| |\ | | | | | try to fix unencrypted file size if it doesn't look plausible | |||||
| | * | revert last changes | Bjoern Schiessle | 2013-10-16 | 1 | -3/+1 | |
| | | | ||||||
| | * | added another test, if unencrypted size and encrypted size are equal we can ↵ | Bjoern Schiessle | 2013-10-15 | 1 | -1/+3 | |
| | | | | | | | | | also assume that something is wrong | |||||
| | * | fix array key | Bjoern Schiessle | 2013-10-14 | 1 | -1/+1 | |
| | | | ||||||
| | * | try to fix unencrypted file size if it doesn't look plausible | Bjoern Schiessle | 2013-10-14 | 1 | -2/+19 | |
| | | | ||||||
| * | | check if we are writing to user/files, otherwise skip encryption | Bjoern Schiessle | 2013-10-14 | 1 | -1/+2 | |
| |/ | ||||||
| * | block file access if share keys are missing | Bjoern Schiessle | 2013-10-11 | 3 | -13/+35 | |
| | | ||||||
| * | don't cache if the encryption is enabled, this can lead to problems during ↵ | Bjoern Schiessle | 2013-10-10 | 1 | -27/+1 | |
| | | | | | unit testing | |||||
| * | only encrypt file to users with encryption keys | Bjoern Schiessle | 2013-10-09 | 1 | -1/+2 | |
| | | ||||||
| * | Merge pull request #4877 from owncloud/ocs_share_api | Björn Schießle | 2013-10-04 | 1 | -1/+1 | |
| |\ | | | | | OCS Share API | |||||
| | * | check if encryption app is enabled before trying to calculate file size | Bjoern Schiessle | 2013-09-26 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-30 | 2 | -5/+7 | |
| |\| | ||||||
| | * | fix check if app is enabled | Bjoern Schiessle | 2013-09-25 | 1 | -4/+3 | |
| | | | ||||||
| | * | check if key exists before reading it | Bjoern Schiessle | 2013-09-25 | 1 | -1/+4 | |
| | | | ||||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |