summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Cache mimetype iconsRobin Appelman2013-05-291-7/+15
|/ / / / / /
| | * | | | changed l10n to full sentencesFlorin Peter2013-05-291-14/+25
| | * | | | changes l10n after reviewFlorin Peter2013-05-291-5/+5
| | * | | | changes after reviewFlorin Peter2013-05-291-1/+5
| | * | | | Merge branch 'master' into remove_unused_varsFlorin Peter2013-05-29692-33031/+2589
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-29552-1868/+1887
|/ / / / /
* | | | | Merge pull request #3511 from owncloud/sessionclassicewind19912013-05-2820-238/+336
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | didn't mean to commit this yetRobin Appelman2013-05-285-670/+0
| * | | | fixed missing convert to new session handlerFlorin Peter2013-05-281-3/+2
| * | | | Merge branch 'sessionclass' of https://github.com/owncloud/core into sessionc...Florin Peter2013-05-285-8/+548
| |\ \ \ \
| | * | | | implement ArrayInterface with SessionRobin Appelman2013-05-285-8/+548
| * | | | | fixed encryption session namespace to avoid problemsFlorin Peter2013-05-285-11/+11
| |/ / / /
| * | | | merge master into sessionclassRobin Appelman2013-05-28669-32892/+2398
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | 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
| | | | * | | | fix syntax errorRobin Appelman2013-05-281-1/+1
| | | | * | | | provide a dummy session for CLIRobin Appelman2013-05-281-0/+2
| | | | * | | | check fix if session start is successfullRobin Appelman2013-05-281-1/+2
| | | | * | | | Fix session not working errorRobin Appelman2013-05-282-2/+4
| | | | * | | | Use the new session wrapperRobin Appelman2013-05-288-57/+57
| | | | * | | | Abstract the session away in a classRobin Appelman2013-05-285-0/+221
| | | | | * | | Merge branch 'master' into remove_unused_varsFlorin Peter2013-05-28550-1978/+2058
| | | | | |\ \ \ | |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | 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
|/ / / / / /
| | | | * | $_POST["adminEnableRecovery"] is a stringBjörn Schießle2013-05-281-1/+1
| | | | * | changed to public log apiFlorin Peter2013-05-274-16/+16
| | | | * | replace == with === and replace != with !==Florin Peter2013-05-279-58/+52
| | | | * | changed basic auth to test userFlorin Peter2013-05-271-3/+3
| | | | * | Merge branch 'master' into remove_unused_varsBjörn Schießle2013-05-274-15/+13
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | 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
| | | | * | replace == with ===Björn Schießle2013-05-272-3/+3
| | | | * | reformat codeFlorin Peter2013-05-2711-660/+694
| | | | * | Merge branch 'master' into remove_unused_varsFlorin Peter2013-05-273-310/+402
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | 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
| |\| | | | | |