summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2013-01-161-1/+1
|\
| * Merge branch 'master' into fixing-unused-and-undefined-in-masterThomas Mueller2013-01-142-0/+12
| |\
| * | fixing <input> tagThomas Mueller2013-01-071-1/+1
* | | merge master into filesystemRobin Appelman2013-01-152-0/+12
|\ \ \ | | |/ | |/|
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-111-0/+6
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-101-0/+6
| |/
* | merge master into filesystemRobin Appelman2013-01-034-2/+20
|\|
| * [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 master into filesystemRobin Appelman2012-12-253-7/+15
|\|
| * 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
| |/
* | Merge branch 'master' into filesystemRobin Appelman2012-12-111-1/+1
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-101-1/+1
* | merge master into filesystemRobin Appelman2012-12-061-0/+1
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-051-0/+1
* | merge master into filesystemRobin Appelman2012-12-038-61/+73
|\|
| * 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
* | | merge master into filesystemRobin Appelman2012-12-021-0/+5
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-12-021-0/+5
| |/
* | merge master into filesystemRobin Appelman2012-11-213-4/+10
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-213-4/+10
* | merge master into filesystemRobin Appelman2012-11-181-0/+6
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-181-0/+6
* | merge master into filesystemRobin Appelman2012-11-152-0/+7
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-151-0/+1
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-131-0/+6
* | merge master into filesystemRobin Appelman2012-11-071-17/+22
|\|
| * Checkstyle: Fix the last 25 NoSpaceAfterCommaFelix Moeller2012-11-041-1/+1
* | merge master into filesystemRobin Appelman2012-11-047-73/+73
|\|
| * Checkstyle fixes: NoSpaceAfterCommaFelix Moeller2012-11-048-34/+34
| * Checkstyle: many fixesFelix Moeller2012-11-027-70/+70
* | merge master into filesystemRobin Appelman2012-10-302-32/+32
|\|
| * NoSpaceAfterCommaFelix Moeller2012-10-282-31/+31
* | move some stuff to the new apiRobin Appelman2012-10-262-6/+6
* | merge master into filesystemRobin Appelman2012-10-256-22/+22
|\|
| * NoSpaceAfterComma IIFelix Moeller2012-10-232-4/+4
| * Checkstyle: NoSpaceAfterCommaFelix Moeller2012-10-235-18/+18
* | merge master into filesystemRobin Appelman2012-10-241-2/+2
|\|
| * More Checkstyle cleanupFelix Moeller2012-10-231-2/+2
* | merge master into filesystemRobin Appelman2012-10-232-1/+7
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-232-1/+7
* | Merge branch 'master' into filesystemRobin Appelman2012-10-211-0/+6
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-211-0/+6
* | Merge branch 'master' into filesystemRobin Appelman2012-10-201-0/+6
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-201-0/+6