Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | always use '/' as directory seperator | Bjoern Schiessle | 2014-06-24 | 1 | -1/+1 | |
| | ||||||
* | remove unused code | Bjoern Schiessle | 2014-06-18 | 1 | -1/+1 | |
| | ||||||
* | Fix checking for external share in encryption | Robin Appelman | 2014-06-14 | 1 | -1/+4 | |
| | ||||||
* | if file doesn't exist, check parent folder | Bjoern Schiessle | 2014-06-14 | 1 | -0/+6 | |
| | ||||||
* | exclude mounted server-to-server shares from encryption | Bjoern Schiessle | 2014-06-14 | 1 | -4/+28 | |
| | ||||||
* | make sure to enable incognito mode when mounting a public link and update ↵ | Bjoern Schiessle | 2014-06-14 | 1 | -0/+2 | |
| | | | | init status of the encryption app | |||||
* | remove encryption keys if user unshares a file | Bjoern Schiessle | 2014-06-06 | 1 | -0/+2 | |
| | ||||||
* | adding unit tests for encryption data migration | Thomas Müller | 2014-06-05 | 1 | -0/+50 | |
| | ||||||
* | use oc_preferences instead of oc_encryption to store encyption settings | Bjoern Schiessle | 2014-06-05 | 2 | -122/+18 | |
| | ||||||
* | don't ask for fileInfo if we already have one | Bjoern Schiessle | 2014-06-04 | 1 | -5/+4 | |
| | ||||||
* | Merge pull request #8729 from owncloud/add-phpseclib-master | Thomas Müller | 2014-06-03 | 1 | -1/+1 | |
|\ | | | | | use phpseclib from 3rdparty | |||||
| * | use phpseclib from 3rdparty | Thomas Müller | 2014-06-03 | 1 | -1/+1 | |
| | | | | | | | | rename class Crypt_Blowfish to Legacy_Crypt_Blowfish | |||||
* | | Merge pull request #8676 from owncloud/encryption_improvements | Morris Jobke | 2014-06-02 | 1 | -124/+79 | |
|\ \ | |/ |/| | cleanup encryption code, improved return codes | |||||
| * | ceanup encryption code, improved return codes | Bjoern Schiessle | 2014-06-02 | 1 | -124/+79 | |
| | | ||||||
* | | get mount point from mount manager | Bjoern Schiessle | 2014-05-28 | 1 | -2/+3 | |
|/ | ||||||
* | Remove all occurences of @brief and @returns from PHPDoc | Morris Jobke | 2014-05-19 | 7 | -106/+106 | |
| | | | | * test case added to avoid adding them later | |||||
* | Fix whitespace issues | Robin McCorkell | 2014-05-16 | 2 | -2/+2 | |
| | ||||||
* | Fix more missing or broken PHPDoc | Robin McCorkell | 2014-05-16 | 1 | -1/+1 | |
| | ||||||
* | Fix PHPDoc in /apps | Robin McCorkell | 2014-05-16 | 7 | -41/+39 | |
| | ||||||
* | @returns -> @return | Thomas Müller | 2014-05-13 | 2 | -11/+11 | |
| | ||||||
* | Merge pull request #8398 from owncloud/enc_backup_keys | Björn Schießle | 2014-05-13 | 1 | -2/+2 | |
|\ | | | | | backup the encryption key after the encryption was disabled | |||||
| * | backup the encryption key after the encryption was disabled so that the user | Bjoern Schiessle | 2014-05-13 | 1 | -2/+2 | |
| | | | | | | | | can restore them if needed | |||||
* | | remove legacy aka deprecated code: OC_FilesystemView | Thomas Müller | 2014-05-12 | 6 | -35/+35 | |
| | | ||||||
* | | remove legacy aka deprecated code: OC_Filesystem | Thomas Müller | 2014-05-12 | 3 | -5/+5 | |
|/ | ||||||
* | only update the values which really changed | Bjoern Schiessle | 2014-04-30 | 1 | -8/+6 | |
| | ||||||
* | fix shouldEncrypt() method and improved decryptAll() unit tests | Bjoern Schiessle | 2014-04-28 | 1 | -1/+2 | |
| | ||||||
* | some fixes to make the gallery work, this made it necessary to adjust some ↵ | Bjoern Schiessle | 2014-04-23 | 1 | -95/+6 | |
| | | | | tests and the encryption code | |||||
* | fix encryption tests after the removal of the shared folder | Bjoern Schiessle | 2014-04-23 | 1 | -3/+2 | |
| | ||||||
* | Merge pull request #7807 from sarciszewski/patch-1 | Lukas Reschke | 2014-04-11 | 1 | -2/+2 | |
|\ | | | | | Update crypt.php | |||||
| * | Update crypt.php | Scott Arciszewski | 2014-03-24 | 1 | -2/+2 | |
| | | | | | | Use a 256-bit random value | |||||
| * | Update crypt.php | Scott Arciszewski | 2014-03-19 | 1 | -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_cleanup | Vincent Petry | 2014-04-02 | 1 | -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 touch | Bjoern Schiessle | 2014-03-31 | 1 | -45/+0 | |
| | | | ||||||
* | | | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled | Morris Jobke | 2014-04-02 | 2 | -10/+8 | |
|\ \ \ | | | | | | | | | always encrypt files to owner | |||||
| * | | | always encrypt files to owner | Bjoern Schiessle | 2014-03-31 | 2 | -10/+8 | |
| |/ / | ||||||
* | | | Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook | Björn Schießle | 2014-04-01 | 3 | -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 twice | Bjoern Schiessle | 2014-03-31 | 1 | -12/+16 | |
| | | | ||||||
| * | | move check if a file should be encrypted to the pre hook | Bjoern Schiessle | 2014-03-31 | 2 | -75/+50 | |
| | | | ||||||
* | | | don't write file if opening a stream to encrypt the data fails | Bjoern Schiessle | 2014-03-28 | 1 | -0/+2 | |
|/ / | ||||||
* | | Merge pull request #7655 from owncloud/shared-unencryptedsize | Vincent Petry | 2014-03-21 | 1 | -1/+1 | |
|\ \ | | | | | | | Fixed warning when browsing Shared folder | |||||
| * | | Fixed warning when browsing Shared folder | Vincent Petry | 2014-03-10 | 1 | -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 bad | Thomas Müller | 2014-03-14 | 1 | -3/+8 | |
|/ | ||||||
* | Return unencrypted_size of folder when queried | Vincent Petry | 2014-03-07 | 1 | -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 it | Bjoern Schiessle | 2014-03-05 | 1 | -1/+0 | |
| | ||||||
* | Merge pull request #7454 from owncloud/enc_remember_fopen_mode | Björn Schießle | 2014-02-28 | 2 | -6/+29 | |
|\ | | | | | [enc] remember original fopen access type in pre-proxy | |||||
| * | remember original fopen access type in pre-proxy because sometimes they change | Bjoern Schiessle | 2014-02-27 | 2 | -6/+29 | |
| | | | | | | | | during the fopen call, e.g. 'r' becomes 'r+' if we open an URL | |||||
* | | Fixed wrong field name | Vincent Petry | 2014-02-27 | 1 | -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 finished | Bjoern Schiessle | 2014-02-26 | 2 | -0/+16 | |
| | ||||||
* | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2014-02-19 | 1 | -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_patches | Thomas Müller | 2014-02-18 | 4 | -43/+77 | |
|\ | | | | | | | | | Conflicts: lib/private/migration/content.php |