summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/lib/util.php
Commit message (Expand)AuthorAgeFilesLines
* close encryption session after decryption was finishedBjoern Schiessle2014-02-261-0/+8
* Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-181-36/+67
|\
| * Merge pull request #7190 from owncloud/appconfig-legacy-appsThomas Müller2014-02-181-4/+8
| |\
| | * Remove usage of legacy OC_AppconfigRobin Appelman2014-02-131-4/+8
| * | catch errors during decryptionBjoern Schiessle2014-02-171-14/+26
| * | catch errors during initial encryptionBjoern Schiessle2014-02-171-18/+33
| |/
* / polish documentation based on scrutinizer patchesJörn Friedrich Dreyer2014-02-061-2/+3
|/
* don't expect OC_FilesystemView, this is depreciatedBjoern Schiessle2014-01-311-1/+1
* fix infinite loop if folder and subfolder has the same nameBjoern Schiessle2014-01-221-39/+13
* Merge pull request #6512 from owncloud/master-failingoracletestsVincent Petry2013-12-191-29/+17
|\
| * Removed numRows usage from encryption appVincent Petry2013-12-191-29/+17
* | Merge pull request #6495 from owncloud/enc_fseek_fallbackBjörn Schießle2013-12-191-3/+30
|\ \ | |/ |/|
| * extend the encryption stream wrapper to handle local files and add a fall bac...Bjoern Schiessle2013-12-181-2/+17
| * fall back to getLocalFile if storage doesn't support fseekBjoern Schiessle2013-12-171-2/+14
* | Merge pull request #6469 from owncloud/enc_cleanupThomas Müller2013-12-181-43/+0
|\ \ | |/ |/|
| * remove unused method tail()Bjoern Schiessle2013-12-171-43/+0
* | reliable detect encrypted filesBjoern Schiessle2013-12-171-10/+12
|/
* Merge pull request #6220 from owncloud/debug_oracle_errorsBjörn Schießle2013-12-061-18/+21
|\
| * Don't try to encrypt a file when the temp file isn't createdBart Visscher2013-12-061-18/+21
* | set unencrypted_size to 0 after decryption... so that the unencrypted_size ge...Bjoern Schiessle2013-12-061-1/+1
|/
* fix typoBjoern Schiessle2013-12-061-1/+1
* add method to check if users private/public key existsBjoern Schiessle2013-12-061-4/+13
* Merge branch 'master' into encryption_initial_enc_indicatorBjoern Schiessle2013-11-271-48/+38
|\
| * Merge branch 'master' into encryption_enable_public_uploadBjoern Schiessle2013-11-271-1/+1
| |\
| | * some small changes according to the review commentsBjoern Schiessle2013-11-271-1/+1
| * | Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub...Bjoern Schiessle2013-11-211-1/+1
| |\|
| | * fix getFileKey() callBjoern Schiessle2013-11-211-1/+1
| * | Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub...Bjoern Schiessle2013-11-211-12/+9
| |\|
| | * Merge branch 'master' into encryption_work_with_public_galleryBjoern Schiessle2013-11-211-12/+9
| | |\
| * | | Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub...Bjoern Schiessle2013-11-211-13/+19
| |\| |
| | * | better distinction between userID and keyIdBjoern Schiessle2013-11-211-13/+19
| * | | public upload now also works with encryption enabledBjoern Schiessle2013-11-211-2/+2
| |/ /
| * | make sure that we always use the correct user idBjoern Schiessle2013-11-201-1/+1
| * | fix some getShareKey() and getFileKey() callsBjoern Schiessle2013-11-201-3/+3
| * | [wip] make encryption work with public gallery sharingBjoern Schiessle2013-11-201-39/+23
* | | with the latest changes in master $this-userID is always the correct ID, so w...Bjoern Schiessle2013-11-271-24/+20
* | | fix typo in var nameBjoern Schiessle2013-11-261-1/+1
* | | show a message at the log-in screen if inital encryption take placeBjoern Schiessle2013-11-251-5/+11
| |/ |/|
* | check if it is a cached file or a version to resolve the correct path to the ...Bjoern Schiessle2013-11-201-1/+5
* | only check if the key file exists to decide if it is an encrypted file or not.Bjoern Schiessle2013-11-201-15/+8
|/
* make sure that the owners home is mounted correctlyBjoern Schiessle2013-11-191-0/+4
* Merge branch 'master' into encryption_fixesBjoern Schiessle2013-11-131-4/+1
|\
| * Merge pull request #5447 from owncloud/fixing-5117-masterVincent Petry2013-11-131-4/+1
| |\
| | * rename fixPartialFilePath() to stripPartialFileExtension(), this name describ...Bjoern Schiessle2013-11-121-1/+1
| | * let encryption app detect transfer id in path and handle it correctlyBjoern Schiessle2013-11-111-4/+1
* | | make sure that we keep the correct timestamp and etag after encryoption/decry...Bjoern Schiessle2013-11-121-11/+11
|/ /
* | Fixed encryption migration when entry is missing in DBVincent Petry2013-10-251-1/+12
* | files_encryption: Fix getFileSize()Markus Goetz2013-10-231-2/+9
* | set the init status to "NOT_INITIALIZED" if the encryption app gets enabledBjoern Schiessle2013-10-221-1/+1
|/
* Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-231-1/+2
|\