aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* always use '/' as directory seperatorBjoern Schiessle2014-06-241-1/+1
|
* remove unused codeBjoern Schiessle2014-06-181-1/+1
|
* Fix checking for external share in encryptionRobin Appelman2014-06-141-1/+4
|
* if file doesn't exist, check parent folderBjoern Schiessle2014-06-141-0/+6
|
* exclude mounted server-to-server shares from encryptionBjoern Schiessle2014-06-141-4/+28
|
* make sure to enable incognito mode when mounting a public link and update ↵Bjoern Schiessle2014-06-141-0/+2
| | | | init status of the encryption app
* remove encryption keys if user unshares a fileBjoern Schiessle2014-06-061-0/+2
|
* adding unit tests for encryption data migrationThomas Müller2014-06-051-0/+50
|
* use oc_preferences instead of oc_encryption to store encyption settingsBjoern Schiessle2014-06-052-122/+18
|
* don't ask for fileInfo if we already have oneBjoern Schiessle2014-06-041-5/+4
|
* Merge pull request #8729 from owncloud/add-phpseclib-masterThomas Müller2014-06-031-1/+1
|\ | | | | use phpseclib from 3rdparty
| * use phpseclib from 3rdpartyThomas Müller2014-06-031-1/+1
| | | | | | | | rename class Crypt_Blowfish to Legacy_Crypt_Blowfish
* | Merge pull request #8676 from owncloud/encryption_improvementsMorris Jobke2014-06-021-124/+79
|\ \ | |/ |/| cleanup encryption code, improved return codes
| * 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-197-106/+106
| | | | * test case added to avoid adding them later
* Fix whitespace issuesRobin McCorkell2014-05-162-2/+2
|
* Fix more missing or broken PHPDocRobin McCorkell2014-05-161-1/+1
|
* Fix PHPDoc in /appsRobin McCorkell2014-05-167-41/+39
|
* @returns -> @returnThomas Müller2014-05-132-11/+11
|
* 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
| * backup the encryption key after the encryption was disabled so that the userBjoern Schiessle2014-05-131-2/+2
| | | | | | | | can restore them if needed
* | remove legacy aka deprecated code: OC_FilesystemViewThomas Müller2014-05-126-35/+35
| |
* | remove legacy aka deprecated code: OC_FilesystemThomas Müller2014-05-123-5/+5
|/
* only update the values which really changedBjoern Schiessle2014-04-301-8/+6
|
* fix shouldEncrypt() method and improved decryptAll() unit testsBjoern Schiessle2014-04-281-1/+2
|
* some fixes to make the gallery work, this made it necessary to adjust some ↵Bjoern Schiessle2014-04-231-95/+6
| | | | tests and the encryption code
* fix encryption tests after the removal of the shared folderBjoern Schiessle2014-04-231-3/+2
|
* Merge pull request #7807 from sarciszewski/patch-1Lukas Reschke2014-04-111-2/+2
|\ | | | | Update crypt.php
| * Update crypt.phpScott Arciszewski2014-03-241-2/+2
| | | | | | Use a 256-bit random value
| * Update crypt.phpScott Arciszewski2014-03-191-2/+2
| | | | | | | | | | | | | | A 1024 kilobyte key would be obnoxiously slow to operate on. I'm assuming you meant 1024-bit? Also, 183 bytes = 1464 bits. Here's a safe alternative: 2048 bits, with comment-code sanity
* | Merge pull request #7978 from owncloud/enc_cleanupVincent Petry2014-04-021-45/+0
|\ \ | | | | | | there is no need to re-calculate the shares after a touch
| * | there is no need to re-calculate the shares after a touchBjoern Schiessle2014-03-311-45/+0
| | |
* | | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabledMorris Jobke2014-04-022-10/+8
|\ \ \ | | | | | | | | always encrypt files to owner
| * | | always encrypt files to ownerBjoern Schiessle2014-03-312-10/+8
| |/ /
* | | Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hookBjörn Schießle2014-04-013-87/+66
|\ \ \ | |/ / |/| | move check if a file should be encrypted to the pre hook
| * | don't call getFileInfo() to avoid to open the same file twiceBjoern Schiessle2014-03-311-12/+16
| | |
| * | move check if a file should be encrypted to the pre hookBjoern Schiessle2014-03-312-75/+50
| | |
* | | don't write file if opening a stream to encrypt the data failsBjoern Schiessle2014-03-281-0/+2
|/ /
* | Merge pull request #7655 from owncloud/shared-unencryptedsizeVincent Petry2014-03-211-1/+1
|\ \ | | | | | | Fixed warning when browsing Shared folder
| * | Fixed warning when browsing Shared folderVincent Petry2014-03-101-1/+1
| |/ | | | | | | | | The virtual "Shared" folder doesn't have an unencrypted_size field. This fix adds a check to prevent warnings in the log.
* / in case of phpunit executions calling header() and exit() is too badThomas Müller2014-03-141-3/+8
|/
* Return unencrypted_size of folder when queriedVincent Petry2014-03-071-0/+7
| | | | | | This fixes the "used space" to be based on the unencrypted size, not encrypted size, to be consistent with how quota/space is handled when encryption is enabled
* don't create files folder, let ownCloud core handle itBjoern Schiessle2014-03-051-1/+0
|
* Merge pull request #7454 from owncloud/enc_remember_fopen_modeBjörn Schießle2014-02-282-6/+29
|\ | | | | [enc] remember original fopen access type in pre-proxy
| * remember original fopen access type in pre-proxy because sometimes they changeBjoern Schiessle2014-02-272-6/+29
| | | | | | | | during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
* | Fixed wrong field nameVincent Petry2014-02-271-1/+1
|/ | | | | | | This re-fixes an issue where the unencrypted size isn't updated correctly when saving a text file in the UI multiple times. Fixes #7467
* close encryption session after decryption was finishedBjoern Schiessle2014-02-262-0/+16
|
* Scrutinizer Auto-FixesScrutinizer Auto-Fixer2014-02-191-1/+1
| | | | | | | | | | | This patch was automatically generated as part of the following inspection: https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720 Enabled analysis tools: - PHP Analyzer - JSHint - PHP Copy/Paste Detector - PHP PDepend
* Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-184-43/+77
|\ | | | | | | | | Conflicts: lib/private/migration/content.php