summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-05-293-2/+12
* fixed missing convert to new session handlerFlorin Peter2013-05-281-3/+2
* fixed encryption session namespace to avoid problemsFlorin Peter2013-05-285-11/+11
* merge master into sessionclassRobin Appelman2013-05-285-15/+70
|\
| * fix for undefined indexFlorin Peter2013-05-281-1/+1
| * fix for losing private key while being logged in and accessing a public linkFlorin Peter2013-05-283-16/+55
| * [tx-robot] updated from transifexJenkins for ownCloud2013-05-282-1/+14
* | fix syntax errorRobin Appelman2013-05-281-1/+1
* | Use the new session wrapperRobin Appelman2013-05-284-20/+14
|/
* legacyBlockDecryprt() needs to be publicBjörn Schießle2013-05-271-1/+1
* make legacyDecrypt() private als always call legacyBlockDecrypt() from other ...Björn Schießle2013-05-274-6/+6
* fix migration from old to new encryptionBjörn Schießle2013-05-272-3/+1
* Merge pull request #3506 from owncloud/fix_3320Björn Schießle2013-05-271-0/+2
|\
| * add event.preventDefault to undelete functionGeorg Ehrke2013-05-271-0/+1
| * fix https://github.com/owncloud/core/issues/3320Georg Ehrke2013-05-271-0/+1
* | Merge branch 'master' into file_encryption_util_is_errorFlorin Peter2013-05-2770-611/+949
|\|
| * 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 branch 'master' into file_encryption_testsFlorin Peter2013-05-273-2/+25
| |\ \
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-05-273-2/+25
| * | | added users for testsFlorin Peter2013-05-269-891/+1098
| * | | improved testFlorin Peter2013-05-267-975/+944
| |/ /
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-05-2660-9/+163
* | | 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
| |/
* | 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
| |\ \ \