summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/lib/util.php
Commit message (Expand)AuthorAgeFilesLines
* normalize path before comparison to make sure that we always find the mount p...Bjoern Schiessle2014-06-271-1/+2
* use oc_preferences instead of oc_encryption to store encyption settingsBjoern Schiessle2014-06-051-122/+17
* Merge pull request #8676 from owncloud/encryption_improvementsMorris Jobke2014-06-021-124/+79
|\
| * ceanup encryption code, improved return codesBjoern Schiessle2014-06-021-124/+79
* | get mount point from mount managerBjoern Schiessle2014-05-281-2/+3
|/
* Remove all occurences of @brief and @returns from PHPDocMorris Jobke2014-05-191-33/+33
* Fix PHPDoc in /appsRobin McCorkell2014-05-161-6/+5
* Merge pull request #8398 from owncloud/enc_backup_keysBjörn Schießle2014-05-131-2/+2
|\
| * backup the encryption key after the encryption was disabled so that the userBjoern Schiessle2014-05-131-2/+2
* | remove legacy aka deprecated code: OC_FilesystemViewThomas Müller2014-05-121-4/+4
* | remove legacy aka deprecated code: OC_FilesystemThomas Müller2014-05-121-1/+1
|/
* some fixes to make the gallery work, this made it necessary to adjust some te...Bjoern Schiessle2014-04-231-95/+6
* fix encryption tests after the removal of the shared folderBjoern Schiessle2014-04-231-3/+2
* Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabledMorris Jobke2014-04-021-9/+7
|\
| * always encrypt files to ownerBjoern Schiessle2014-03-311-9/+7
* | move check if a file should be encrypted to the pre hookBjoern Schiessle2014-03-311-15/+18
|/
* don't create files folder, let ownCloud core handle itBjoern Schiessle2014-03-051-1/+0
* 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