summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* fixed problems with file_get_contents and file_put_contents this problem was ↵Florin Peter2013-05-303-127/+92
| | | | related to text editor with big text files
* Merge branch 'master' into file_encryption_external_storage_fixesFlorin Peter2013-05-3016-718/+757
|\ | | | | | | | | Conflicts: apps/files_encryption/hooks/hooks.php
| * 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
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/proxy.php apps/files_encryption/lib/session.php apps/files_encryption/lib/stream.php
| * \ Merge branch 'master' into remove_unused_varsFlorin Peter2013-05-285-21/+71
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/session.php apps/files_encryption/lib/util.php
| * | | $_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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/crypt.php apps/files_encryption/lib/proxy.php
| * | | | 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/util.php
| * | | | | fix tests, after unused variables are removedBjörn Schießle2013-05-271-1/+1
| | | | | |
| * | | | | remove unused varaiblesBjörn Schießle2013-05-272-4/+2
| | | | | |
* | | | | | fixed typoFlorin Peter2013-05-291-1/+1
| | | | | |
* | | | | | Merge branch 'master' into file_encryption_external_storage_fixesFlorin Peter2013-05-2911-34/+40
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | [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
| | |_|_|/ | |/| | |
* | | | | fix for share folder on external storageFlorin Peter2013-05-292-2/+33
| | | | |
* | | | | check list of users with access to the file from the bottom to the top. This ↵Björn Schießle2013-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages
* | | | | fixed if fopen returns false typically on external storageFlorin Peter2013-05-281-1/+1
| |/ / / |/| | |
* | | | 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
|/ / /
* | | 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
| | | | | | | | | | | | classes
* | | 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
|\ \ | | | | | | fix https://github.com/owncloud/core/issues/3320
| * | 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
|\| | | | | | | | | Conflicts: apps/files_encryption/lib/util.php
| * Merge pull request #3481 from owncloud/firsttime_encBjörn Schießle2013-05-271-23/+12
| |\ | | | | | | fix first time encryption after app was enabled
| | * 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
| | | | | | | | | | | | | | | | reformat code to meet coding guidelines
| * | | improved testFlorin Peter2013-05-267-975/+944
| |/ / | | | | | | | | | | | | | | | - fixed testPermanentDeleteFile sometimes failed - speed optimization - reformat code
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-05-2660-9/+163
| | |
* | | added check by numRows()Florin Peter2013-05-271-335/+387
| | | | | | | | | | | | | | | changed to public api where it was possible reformat code to comply with the coding guidelines
* | | fixed error rising from fetchRowFlorin Peter2013-05-251-22/+27
| | |
* | | added OC_DB::isError and loggingFlorin Peter2013-05-251-2/+36
|/ /