summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into file_encryption_util_is_errorFlorin Peter2013-05-27689-2005/+2383
|\
| * Merge pull request #3481 from owncloud/firsttime_encBjörn Schießle2013-05-271-23/+12
| |\
| | * fix first time encryption after app was enabledBjörn Schießle2013-05-241-23/+12
| * | Merge pull request #3496 from owncloud/file_encryption_testsFlorinPeter2013-05-279-574/+750
| |\ \
| | * \ Merge branch 'master' into file_encryption_testsFlorin Peter2013-05-27551-1103/+1134
| | |\ \ | | |/ / | |/| |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-27551-1103/+1134
| | * | added users for testsFlorin Peter2013-05-269-891/+1098
| | * | improved testFlorin Peter2013-05-267-975/+944
| |/ /
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-05-26664-1349/+1535
* | | added check by numRows()Florin Peter2013-05-271-335/+387
* | | fixed error rising from fetchRowFlorin Peter2013-05-251-22/+27
* | | added OC_DB::isError and loggingFlorin Peter2013-05-251-2/+36
|/ /
* | Merge pull request #3478 from davidak/masterMichael Gapczynski2013-05-251-2/+2
|\ \
| * | small typo fix: added 2 whitespacesdavidak2013-05-241-2/+2
| |/
* | Merge pull request #3388 from roha4000/masterMichael Gapczynski2013-05-252-2/+29
|\ \
| * | New tests to assure that a move will not affect another users cache entriesRoland Hager2013-05-221-0/+27
| * | Fixing UPDATE error in filecache table when renaming files by calling move()....Roland Hager2013-05-221-2/+2
* | | Merge pull request #3493 from owncloud/bumpversionMichael Gapczynski2013-05-251-1/+1
|\ \ \
| * | | Bump version for files_encryption changesMichael Gapczynski2013-05-251-1/+1
* | | | increase version and add warningFrank Karlitschek2013-05-252-2/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-25931-4912/+10526
* | | | improved trashbin test againFlorin Peter2013-05-241-0/+1
* | | | improved trashbin testFlorin Peter2013-05-241-1/+1
* | | | meanwhile phpunit is seq faulting with mysql as wellThomas Mueller2013-05-241-4/+4
* | | | Merge pull request #3482 from owncloud/fix_helperThomas Müller2013-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 #3479 from owncloud/testing-oracle-on-masterThomas Müller2013-05-241-4/+55
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \
| * | | 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-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
| |\ \ \
| * | | | fix pgsql errorFlorin Peter2013-05-221-2/+5
| * | | | Merge branch 'master' into files_encryptionFlorin Peter2013-05-2214-16/+541
| |\ \ \ \
| * | | | | 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
| |\ \ \ \ \
| * | | | | | 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