summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into fix_for_2377Florin Peter2013-05-24733-6873/+12278
|\
| * Merge pull request #3482 from owncloud/fix_helperThomas Müller2013-05-241-1/+1
| |\ | | | | | | use the recoveryPassword var instead of accessing the POST array
| | * no use the recoveryPassword var instead of accessing the POST arrayBjörn Schießle2013-05-241-1/+1
| | |
| * | Merge pull request #3479 from owncloud/testing-oracle-on-masterThomas Müller2013-05-241-4/+55
| |\ \ | | |/ | |/| adding Oracle support to autotest.sh
| | * adding Oracle support to autotest.shThomas Mueller2013-05-241-4/+55
| |/
| * Merge pull request #3416 from owncloud/files_encryptionThomas Müller2013-05-2478-2750/+7481
| |\ | | | | | | New files encryption app
| | * 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 ↵Björn Schießle2013-05-232-25/+6
| | | | | | | | | | | | user is logged in
| | * 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-2319-73/+85
| | |\
| | * | added trash bin testsFlorin Peter2013-05-221-0/+269
| | | |
| | * | added static function registerHooks() for better unit tests handlingFlorin Peter2013-05-222-5/+12
| | | |
| | * | revert changes to .gitmodules, they were applied by accidentBjörn Schießle2013-05-221-1/+1
| | | |
| | * | revert submodule changesBjörn Schießle2013-05-221-0/+0
| | | |
| | * | 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-2228-361/+324
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: lib/files/cache/cache.php
| | * | | fix pgsql errorFlorin Peter2013-05-221-2/+5
| | | | |
| | * | | Merge branch 'master' into files_encryptionFlorin Peter2013-05-2214-16/+541
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/files/cache/cache.php
| | * | | | 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-2154-214/+388
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_trashbin/l10n/nn_NO.php
| | * | | | | 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-20444-6627/+13411
| | |\ \ \ \ \
| | * | | | | | fix for webdav because initMounts() is triggered twice so we lost the root pathFlorin Peter2013-05-201-1/+3
| | | | | | | |
| | * | | | | | Revert "fix for webdav and wrong reference for findByStorageId"Florin Peter2013-05-202-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 079f918d5ca0d242e77717aaeac82bcf011dc745.
| | * | | | | | reformat code added and changed phpdocFlorin Peter2013-05-2011-2914/+3154
| | | | | | | |
| | * | | | | | removed /l10n/.tx/ from .gitignoreFlorin Peter2013-05-201-2/+1
| | | | | | | |
| | * | | | | | changed recovery_enabled and migration_status columns to integer and fix testsFlorin Peter2013-05-202-8/+8
| | | | | | | |
| | * | | | | | update phpdocFlorin Peter2013-05-192-3/+5
| | | | | | | |
| | * | | | | | fix for webdav and wrong reference for findByStorageIdFlorin Peter2013-05-192-2/+4
| | | | | | | |
| | * | | | | | cleanup testsFlorin Peter2013-05-194-41/+101
| | | | | | | |
| | * | | | | | changed database column 'recovery' to 'recovery_enabled' because recovery is ↵Florin Peter2013-05-192-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a pgsql keyword more info about pgsql keywords http://www.postgresql.org/docs/9.1/static/sql-keywords-appendix.html
| | * | | | | | 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
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-22 20:38:23 +0000