summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* [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
* [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
* | Development snapshot, mocking out Session{} for crypt unit testsSam Tuke2013-01-025-20/+35
* | Merge branch 'master' into files_encryptionSam Tuke2013-01-027-0/+42
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-312-2/+8
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-281-0/+6
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-271-0/+6
| * Merge pull request #913 from owncloud/fix_settingsFrank Karlitschek2012-12-181-6/+6
| |\
| | * cleaning up the settings. standardize the format, add missing I10N and other ...Frank Karlitschek2012-12-151-6/+6
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-12-181-0/+6
| * | check if adminFrank Karlitschek2012-12-171-1/+3
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-101-1/+1
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-051-0/+1
| * Merge pull request #654 from butonic/checkstyle_fixesThomas Müller2012-12-028-64/+76
| |\
| | * fix checkstyle for files_encryption app, add whitespace for readabilityJörn Friedrich Dreyer2012-11-308-64/+76
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-12-021-0/+5
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-213-4/+10
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-181-0/+6
* | Merge branch 'master' into files_encryptionSam Tuke2012-12-1212-29/+62
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-151-0/+1
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-131-0/+6
| * Checkstyle: Fix the last 25 NoSpaceAfterCommaFelix Moeller2012-11-041-1/+1
| * Checkstyle fixes: NoSpaceAfterCommaFelix Moeller2012-11-048-34/+34
| * Checkstyle: many fixesFelix Moeller2012-11-027-70/+70
| * NoSpaceAfterCommaFelix Moeller2012-10-282-31/+31
| * NoSpaceAfterComma IIFelix Moeller2012-10-232-4/+4
| * Checkstyle: NoSpaceAfterCommaFelix Moeller2012-10-235-18/+18
| * More Checkstyle cleanupFelix Moeller2012-10-231-2/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-232-1/+7
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-211-0/+6