summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-05-2660-9/+163
* Merge pull request #3478 from davidak/masterMichael Gapczynski2013-05-251-2/+2
|\
| * small typo fix: added 2 whitespacesdavidak2013-05-241-2/+2
* | increase version and add warningFrank Karlitschek2013-05-252-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2013-05-2562-243/+96
* | improved trashbin test againFlorin Peter2013-05-241-0/+1
* | improved trashbin testFlorin Peter2013-05-241-1/+1
* | no use the recoveryPassword var instead of accessing the POST arrayBjörn Schießle2013-05-241-1/+1
|/
* Merge pull request #3416 from owncloud/files_encryptionThomas Müller2013-05-2463-2728/+7274
|\
| * fixes after review from @DeepDiver1975Florin Peter2013-05-2313-876/+752
| * added l10n support in apps/files_encryption/ajax/adminrecovery.phpFlorin Peter2013-05-231-2/+4
| * code clean up; nicer solution to solve the public link share problem if a use...Björn Schießle2013-05-232-25/+6
| * fix public link share if a user is logged inBjörn Schießle2013-05-233-7/+32
| * Merge branch 'master' into files_encryptionBjörn Schießle2013-05-234-9/+11
| |\
| * | added trash bin testsFlorin Peter2013-05-221-0/+269
| * | added static function registerHooks() for better unit tests handlingFlorin Peter2013-05-222-5/+12
| * | settings clean-up; There is no blacklist in the new encryption appBjörn Schießle2013-05-222-34/+1
| * | improved error messagesBjörn Schießle2013-05-222-6/+12
| * | Merge branch 'master' into files_encryptionBjörn Schießle2013-05-222-0/+9
| |\ \
| * | | fix pgsql errorFlorin Peter2013-05-221-2/+5
| * | | improved testsFlorin Peter2013-05-226-388/+301
| * | | fixed finding encrypted files in subfolders and removed unused codeFlorin Peter2013-05-224-200/+61
| * | | added webdav testFlorin Peter2013-05-211-0/+251
| * | | fixed postFileSizeFlorin Peter2013-05-211-11/+19
| * | | Merge branch 'master' into files_encryptionBjörn Schießle2013-05-2112-3/+72
| |\ \ \
| * | | | fix path to 3rdparty appsBjörn Schießle2013-05-211-1/+2
| * | | | fix path, needs to be relative to data/Björn Schießle2013-05-211-1/+1
| * | | | move 3rdparty dependencies to appBjörn Schießle2013-05-215-3/+647
| * | | | fix broken testsFlorin Peter2013-05-211-9/+0
| * | | | cleanup unused code optimize testsFlorin Peter2013-05-213-15/+17
| * | | | improved testsFlorin Peter2013-05-202-41/+13
| * | | | added test for failed sharingFlorin Peter2013-05-204-1/+70
| * | | | removed dead code for delShareKeyFlorin Peter2013-05-202-37/+15
| * | | | key creation should never override a private or public keyFlorin Peter2013-05-201-1/+11
| * | | | added legacy encryption testFlorin Peter2013-05-202-3/+46
| * | | | Merge branch 'master' into files_encryptionFlorin Peter2013-05-2087-155/+364
| |\ \ \ \
| * | | | | reformat code added and changed phpdocFlorin Peter2013-05-2011-2914/+3154
| * | | | | changed recovery_enabled and migration_status columns to integer and fix testsFlorin Peter2013-05-202-8/+8
| * | | | | update phpdocFlorin Peter2013-05-192-3/+5
| * | | | | cleanup testsFlorin Peter2013-05-194-41/+101
| * | | | | changed database column 'recovery' to 'recovery_enabled' because recovery is ...Florin Peter2013-05-192-6/+6
| * | | | | updated authors infoFlorin Peter2013-05-181-1/+1
| * | | | | fixed again key-manager testsFlorin Peter2013-05-181-20/+14
| * | | | | changed migrationStatus to migration_status for pgsqlFlorin Peter2013-05-182-4/+4
| * | | | | fixed key-manager testsFlorin Peter2013-05-181-8/+15
| * | | | | removed mockery from tests and changed class namesFlorin Peter2013-05-183-171/+12
| * | | | | fixed typosFlorin Peter2013-05-182-2/+2
| * | | | | improved testsFlorin Peter2013-05-171-2/+10
| * | | | | remove unused codeFlorin Peter2013-05-171-114/+9
| * | | | | added folder move testFlorin Peter2013-05-171-1/+34