aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Collapse)AuthorAgeFilesLines
...
| * | fix grammarVolkan Gezer2014-05-251-2/+2
| | |
* | | Adjust core apps to use "requiremin" instead of "require"Vincent Petry2014-05-271-1/+1
| |/ |/| | | | | Also added a few missing authors.
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-261-13/+13
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-251-1/+1
|
* Merge pull request #8637 from owncloud/enc_improved_error_handlingVincent Petry2014-05-212-3/+49
|\ | | | | [encryption] improved error handling during password change
| * only start migration if the encryption was initialized; allow to overwrite ↵Bjoern Schiessle2014-05-192-3/+49
| | | | | | | | keys if no files exists
* | Remove all occurences of @brief and @returns from PHPDocMorris Jobke2014-05-1921-149/+149
|/ | | | * test case added to avoid adding them later
* Fix whitespace issuesRobin McCorkell2014-05-162-2/+2
|
* Fix more missing or broken PHPDocRobin McCorkell2014-05-162-2/+2
|
* Fix PHPDoc in /appsRobin McCorkell2014-05-1610-45/+43
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-162-0/+5
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-151-1/+1
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-141-7/+38
|
* @returns -> @returnThomas Müller2014-05-132-11/+11
|
* Merge pull request #8398 from owncloud/enc_backup_keysBjörn Schießle2014-05-132-2/+13
|\ | | | | backup the encryption key after the encryption was disabled
| * backup the encryption key after the encryption was disabled so that the userBjoern Schiessle2014-05-132-2/+13
| | | | | | | | can restore them if needed
* | remove legacy aka deprecated code: OC_FilesystemViewThomas Müller2014-05-1221-80/+80
| |
* | 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-282-10/+52
|
* merge master into webdav-injectionRobin Appelman2014-04-259-257/+64
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2014-04-253-0/+6
| |
| * some fixes to make the gallery work, this made it necessary to adjust some ↵Bjoern Schiessle2014-04-232-207/+21
| | | | | | | | tests and the encryption code
| * fix encryption tests after the removal of the shared folderBjoern Schiessle2014-04-235-60/+46
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2014-04-231-0/+1
| |
* | Prevent error if previously cached data doesn't have an etagRobin Appelman2014-04-221-0/+1
| |
* | merge master into webdav-injectionRobin Appelman2014-04-1515-266/+224
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2014-04-141-0/+11
| |
| * 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
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-04-091-0/+13
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-04-061-0/+2
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-04-031-0/+1
| | |
| * | 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
| | |/ /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-021-0/+1
| | | |
| * | | Merge pull request #7997 from owncloud/correct-remember-trashbin-stateBart Visscher2014-04-011-3/+3
| |\ \ \ | | | | | | | | | | Correct the remembering of the trashbin app state in encryption test
| | * | | Remember before change works betterBart Visscher2014-04-011-3/+3
| | |/ /
| * | | 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
| | | | |
| * | | | Merge pull request #7915 from owncloud/replace-personalblockVincent Petry2014-04-012-119/+113
| |\ \ \ \ | | | | | | | | | | | | Replace personalblock with .section
| | * \ \ \ external storage: fix merge conflict, indentationJan-Christoph Borchardt2014-03-312-0/+3
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | replace personalblock fieldset with section class in files appsJan-Christoph Borchardt2014-03-272-119/+113
| | | |/ / | | |/| |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-011-0/+1
| | |/ / | |/| |
| * | | don't write file if opening a stream to encrypt the data failsBjoern Schiessle2014-03-281-0/+2
| | | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-281-0/+1
| |/ /