summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* for external storages we never reach the path 'files', instead we need to lea...Björn Schießle2013-05-291-1/+2
* if one public link share was found, we don't have to check it for the other f...Björn Schießle2013-05-291-10/+12
* check list of users with access to the file from the bottom to the top. This ...Björn Schießle2013-05-292-9/+15
* fixed if fopen returns false typically on external storageFlorin Peter2013-05-281-1/+1
* Merge pull request #3179 from pawl/patch-1Jörn Friedrich Dreyer2013-05-281-1/+2
|\
| * Improve IE CompatibilityPaul Brown2013-04-291-1/+2
* | Merge pull request #2778 from Kondou-ger/optimize_picturesJörn Friedrich Dreyer2013-05-28118-30919/+353
|\ \
| * | Add shellscript for optimization.kondou2013-04-131-0/+20
| * | Optimize svgs with scour.kondou2013-04-1261-30919/+333
| * | Optimize pictures with optipng.kondou2013-04-0756-0/+0
* | | Merge pull request #3488 from zafi/masterblizzz2013-05-281-0/+6
|\ \ \
| * | | The "lost password" field depends on OC_USER_BACKEND_SET_PASSWORDzafi2013-05-251-0/+6
* | | | Merge pull request #3512 from owncloud/file_encryption_session_fixFlorinPeter2013-05-283-17/+56
|\ \ \ \
| * | | | 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-28546-1958/+1981
* | | | Merge pull request #3510 from owncloud/publicemitterFrank Karlitschek2013-05-271-0/+20
|\ \ \ \
| * | | | Add PublicEmitter classRobin Appelman2013-05-271-0/+20
|/ / / /
* | | | 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 pull request #3495 from owncloud/file_encryption_util_is_errorThomas Tanghus2013-05-271-310/+397
|\ \ \ \ \
| * | | | | Merge branch 'master' into file_encryption_util_is_errorFlorin Peter2013-05-27689-2005/+2383
| |\| | | |
| * | | | | 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 #3412 from owncloud/fix_2013Michael Gapczynski2013-05-271-1/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Don't set Content-Length header if size is unknownMichael Gapczynski2013-05-171-1/+4
* | | | | | 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
| |_|/ / / / |/| | | | |
* | | | | | 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