aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-011-0/+1
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-314-0/+5
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-302-0/+2
* Merge pull request #8771 from owncloud/enc_get_mount_from_mountmanagerRobin McCorkell2014-05-292-18/+9
|\
| * get mount point from mount managerBjoern Schiessle2014-05-282-18/+9
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-2910-1/+17
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-2833-33/+0
* Merge pull request #8713 from owncloud/typo-files-encrThomas Müller2014-05-271-2/+2
|\
| * fix grammarVolkan Gezer2014-05-251-2/+2
* | Adjust core apps to use "requiremin" instead of "require"Vincent Petry2014-05-271-1/+1
* | [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
|\
| * only start migration if the encryption was initialized; allow to overwrite ke...Bjoern Schiessle2014-05-192-3/+49
* | Remove all occurences of @brief and @returns from PHPDocMorris Jobke2014-05-1921-149/+149
|/
* 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 so that the userBjoern Schiessle2014-05-132-2/+13
* | 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 te...Bjoern Schiessle2014-04-232-207/+21
| * 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.phpScott Arciszewski2014-03-241-2/+2
| | * Update crypt.phpScott Arciszewski2014-03-191-2/+2
| * | [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 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 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
| |\ \ \
| | * | | 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
| |\ \ \