summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-05-316-0/+19
* LDAP: fix generation of alternate internal name on conflicts. Use also smalle...Arthur Schiwon2013-05-301-2/+2
* Merge pull request #3529 from owncloud/folder-permissionsicewind19912013-05-302-1/+31
|\
| * Implement getDirectoryPermissions() in Shared Permissions, fixes #2846Michael Gapczynski2013-05-292-1/+31
* | [tx-robot] updated from transifexJenkins for ownCloud2013-05-3013-18/+44
* | reformat codeFlorin Peter2013-05-292-16/+16
* | changed " to 'Florin Peter2013-05-293-13/+13
* | 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-2911-39/+45
|\|
| * [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 syntax errorRobin Appelman2013-05-281-1/+1
| * | Use the new session wrapperRobin Appelman2013-05-284-20/+14
* | | Merge branch 'master' into remove_unused_varsFlorin Peter2013-05-285-21/+71
|\ \ \ | | |/ | |/|
| * | 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
| |/
* | $_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-272-309/+398
|\|
| * 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
| |\|
| * | 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
* | | fix tests, after unused variables are removedBjörn Schießle2013-05-271-1/+1
* | | remove unused varaiblesBjörn Schießle2013-05-272-4/+2
| |/ |/|
* | 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
| |/ |/|
* | Merge pull request #3478 from davidak/masterMichael Gapczynski2013-05-251-2/+2
|\ \
| * | small typo fix: added 2 whitespacesdavidak2013-05-241-2/+2
| |/