summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-0650-186/+1
* Fixed comment typo, wrapped return value conditional on var assignment in ses...Sam Tuke2013-02-052-3/+5
* Added missing translation wrappingSam Tuke2013-02-051-1/+3
* Added notice to personal settings indicating what filetypes are not encryptedSam Tuke2013-02-053-48/+23
* Removed debugging outputSam Tuke2013-02-052-12/+0
* Fixed bug relating to Filesystem{} that prevented webdav logins with files_en...Sam Tuke2013-02-051-50/+52
* Cleaned up path formatting with new method stripUserFilesPath()Sam Tuke2013-02-052-20/+22
* Recryption of legacy encrypted files now working on loginSam Tuke2013-02-052-7/+20
* Merge github.com:owncloud/coreSam Tuke2013-02-053-0/+27
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-02-051-0/+16
| * [tx-robot] updated from transifexJenkins for ownCloud2013-02-031-0/+4
| * [tx-robot] updated from transifexJenkins for ownCloud2013-02-021-0/+7
* | Added debugging output relating to recrypting legacy filesSam Tuke2013-02-012-3/+16
* | Improved support for detecting and recrypting legacy files. Bugs remain.Sam Tuke2013-01-314-17/+37
* | Fixed compatibility with filecache rewrite mergeSam Tuke2013-01-311-1/+1
* | Fixed incompatibilities with filecache rewrite mergeSam Tuke2013-01-312-7/+7
* | Merge github.com:owncloud/coreSam Tuke2013-01-3126-34/+260
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-312-0/+20
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-313-3/+31
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-306-1/+48
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-291-0/+11
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-281-0/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-273-0/+25
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-262-0/+14
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-253-0/+24
| * drop SimpleTest compatibilityThomas Mueller2013-01-244-34/+34
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-246-0/+55
* | Fixed handling of keyfile subdir creationSam Tuke2013-01-302-84/+24
* | Working on support for deleting directories (removing all keyfiles)Sam Tuke2013-01-301-13/+19
* | Made encyrption keyfiles be deleted when their parents areSam Tuke2013-01-295-34/+142
* | Fixed many coding guidelines issuesSam Tuke2013-01-2412-177/+282
* | Work on util: findFiles() and encryptAll(); both close to workingSam Tuke2013-01-239-181/+213
* | Merge branch 'files_encryption'Sam Tuke2013-01-238-53/+139
|\ \ | |/ |/|
| * Adding sharing support: added new method in Keymanager setShareKey()Sam Tuke2013-01-146-50/+125
| * Merge branch 'master' into files_encryptionSam Tuke2013-01-141-0/+6
| |\
| * | Added creation of dir for shared file env encryption keysSam Tuke2013-01-142-3/+14
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2349-107/+59
* | | Added localisation for encryption settingsSam Tuke2013-01-222-27/+114
* | | Merge branch 'master' into files_encryptionSam Tuke2013-01-221-0/+6
|\ \ \ | |/ / |/| / | |/
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-111-0/+6
* | Removed debugging commentsSam Tuke2013-01-141-49/+0
* | Removed old and unnecessary commentsSam Tuke2013-01-101-7/+0
* | Removed misleading crypto gen commentSam Tuke2013-01-101-2/+0
* | Merge branch 'master' into files_encryptionSam Tuke2013-01-101-0/+6
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-101-0/+6
* | Re-added 'checkAdminUser'Sam Tuke2013-01-101-6/+10
* | All in-use unit tests now passing after mergeSam Tuke2013-01-0615-540/+513
* | Removed debugging lineSam Tuke2013-01-061-1/+1
* | Made Keymanager::getFileKey() dependencies explicit, fixed client code and te...Sam Tuke2013-01-064-7/+11
* | Development snapshotSam Tuke2013-01-057-77/+95