| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-18 | 1 | -36/+67 | |
| |\ | | | | | | | | | Conflicts: lib/private/migration/content.php | |||||
| | * | Merge pull request #7190 from owncloud/appconfig-legacy-apps | Thomas Müller | 2014-02-18 | 1 | -4/+8 | |
| | |\ | | | | | | | Remove usage of legacy OC_Appconfig | |||||
| | | * | Remove usage of legacy OC_Appconfig | Robin Appelman | 2014-02-13 | 1 | -4/+8 | |
| | | | | ||||||
| | * | | catch errors during decryption | Bjoern Schiessle | 2014-02-17 | 1 | -14/+26 | |
| | | | | ||||||
| | * | | catch errors during initial encryption | Bjoern Schiessle | 2014-02-17 | 1 | -18/+33 | |
| | |/ | ||||||
| * / | polish documentation based on scrutinizer patches | Jörn Friedrich Dreyer | 2014-02-06 | 1 | -2/+3 | |
| |/ | ||||||
| * | don't expect OC_FilesystemView, this is depreciated | Bjoern Schiessle | 2014-01-31 | 1 | -1/+1 | |
| | | ||||||
| * | fix infinite loop if folder and subfolder has the same name | Bjoern Schiessle | 2014-01-22 | 1 | -39/+13 | |
| | | ||||||
| * | Merge pull request #6512 from owncloud/master-failingoracletests | Vincent Petry | 2013-12-19 | 1 | -29/+17 | |
| |\ | | | | | Removed numRows usage from encryption app | |||||
| | * | Removed numRows usage from encryption app | Vincent Petry | 2013-12-19 | 1 | -29/+17 | |
| | | | | | | | | | | | | | | | | | | | numRows on Oracle always seem to return 0. This fix removes numRows usage from the encryption and sharing app. This fixes unit tests and potentially the encryption app itself (migration status) when running on Oracle | |||||
| * | | Merge pull request #6495 from owncloud/enc_fseek_fallback | Björn Schießle | 2013-12-19 | 1 | -3/+30 | |
| |\ \ | |/ |/| | Added fseek fallback to the encryption app | |||||
| | * | extend the encryption stream wrapper to handle local files and add a fall ↵ | Bjoern Schiessle | 2013-12-18 | 1 | -2/+17 | |
| | | | | | | | | | back for file size calculation if the storage doesn't support fseek | |||||
| | * | fall back to getLocalFile if storage doesn't support fseek | Bjoern Schiessle | 2013-12-17 | 1 | -2/+14 | |
| | | | ||||||
| * | | Merge pull request #6469 from owncloud/enc_cleanup | Thomas Müller | 2013-12-18 | 1 | -43/+0 | |
| |\ \ | |/ |/| | remove duplicated code | |||||
| | * | remove unused method tail() | Bjoern Schiessle | 2013-12-17 | 1 | -43/+0 | |
| | | | ||||||
| * | | reliable detect encrypted files | Bjoern Schiessle | 2013-12-17 | 1 | -10/+12 | |
| |/ | ||||||
| * | Merge pull request #6220 from owncloud/debug_oracle_errors | Björn Schießle | 2013-12-06 | 1 | -18/+21 | |
| |\ | | | | | cherry-picks from #5884, just for debugging purpose | |||||
| | * | Don't try to encrypt a file when the temp file isn't created | Bart Visscher | 2013-12-06 | 1 | -18/+21 | |
| | | | ||||||
| * | | set unencrypted_size to 0 after decryption... so that the unencrypted_size ↵ | Bjoern Schiessle | 2013-12-06 | 1 | -1/+1 | |
| |/ | | | | gets re-calculated if encryption was enabled again | |||||
| * | fix typo | Bjoern Schiessle | 2013-12-06 | 1 | -1/+1 | |
| | | ||||||
| * | add method to check if users private/public key exists | Bjoern Schiessle | 2013-12-06 | 1 | -4/+13 | |
| | | ||||||
| * | Merge branch 'master' into encryption_initial_enc_indicator | Bjoern Schiessle | 2013-11-27 | 1 | -48/+38 | |
| |\ | ||||||
| | * | Merge branch 'master' into encryption_enable_public_upload | Bjoern Schiessle | 2013-11-27 | 1 | -1/+1 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -1/+1 | |
| | | | | ||||||
| | * | | 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 | 1 | -12/+9 | |
| | |\| | | | | | | | | | | encryption_enable_public_upload | |||||
| | | * | Merge branch 'master' into encryption_work_with_public_gallery | Bjoern Schiessle | 2013-11-21 | 1 | -12/+9 | |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -13/+19 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | encryption_enable_public_upload Conflicts: apps/files_encryption/lib/stream.php | |||||
| | | * | | better distinction between userID and keyId | Bjoern Schiessle | 2013-11-21 | 1 | -13/+19 | |
| | | | | | ||||||
| | * | | | public upload now also works with encryption enabled | Bjoern Schiessle | 2013-11-21 | 1 | -2/+2 | |
| | |/ / | ||||||
| | * | | make sure that we always use the correct user id | Bjoern Schiessle | 2013-11-20 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | 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 | 1 | -39/+23 | |
| | | | | ||||||
| * | | | 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 | |
| | |/ |/| | ||||||
| * | | 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 | 1 | -15/+8 | |
| |/ | | | | 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 branch 'master' into encryption_fixes | Bjoern Schiessle | 2013-11-13 | 1 | -4/+1 | |
| |\ | ||||||
| | * | Merge pull request #5447 from owncloud/fixing-5117-master | Vincent Petry | 2013-11-13 | 1 | -4/+1 | |
| | |\ | | | | | | | No data corruption duriing parallel upload | |||||
| | | * | rename fixPartialFilePath() to stripPartialFileExtension(), this name ↵ | Bjoern Schiessle | 2013-11-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | describes better what the method actually does | |||||
| | | * | let encryption app detect transfer id in path and handle it correctly | Bjoern Schiessle | 2013-11-11 | 1 | -4/+1 | |
| | | | | ||||||
| * | | | make sure that we keep the correct timestamp and etag after ↵ | Bjoern Schiessle | 2013-11-12 | 1 | -11/+11 | |
| |/ / | | | | | | | encryoption/decryption | |||||
| * | | 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 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-23 | 1 | -1/+2 | |
| |\ | | | | | | | | | Conflicts: settings/ajax/changepassword.php | |||||
| | * | Merge pull request #4708 from owncloud/encryption_fixes | Björn Schießle | 2013-09-18 | 1 | -1/+2 | |
| | |\ | | | | | | | make sure that initial encryption also starts for a fresh installation | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |