summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* added our own file extension .part will not work here if we use ↵Florin Peter2013-05-302-5/+5
| | | | file_get_contents so we used our own extension '.etmp'
* prevent files_versions from calling file proxy which calls files_encryption ↵Florin Peter2013-05-301-0/+17
| | | | and do unnecessary load and file operations
* fix share and un-share for single fileFlorin Peter2013-05-301-23/+13
|
* 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-3018-725/+767
|\ | | | | | | | | Conflicts: apps/files_encryption/hooks/hooks.php
| * Merge pull request #3533 from owncloud/signature-delimiterThomas Tanghus2013-05-291-1/+1
| |\ | | | | | | fix wrong signature delimiter - fix #3523
| | * fix wrong signature delimiter - fix #3523Morris Jobke2013-05-291-1/+1
| | |
| * | Merge pull request #3507 from owncloud/remove_unused_varsMorris Jobke2013-05-2916-722/+761
| |\ \ | | |/ | |/| remove unused varaibles
| | * reformat codeFlorin Peter2013-05-292-16/+16
| | |
| | * changed " to 'Florin Peter2013-05-293-13/+13
| | |
| | * Merge branch 'master' into remove_unused_varsFlorin Peter2013-05-292-23/+34
| | |\ | | |/ | |/|
| * | Merge pull request #3532 from owncloud/scan-updateMichael Gapczynski2013-05-291-6/+9
| |\ \ | | | | | | | | Only update metadata that has changed
| | * | Organize conditionals in a better orderMichael Gapczynski2013-05-291-8/+4
| | | |
| | * | Only update metadata that has changedMichael Gapczynski2013-05-291-2/+9
| | | |
| | | * 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
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-28550-1978/+2058
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-273-310/+402
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | |
* | | | | | | | fixes for pgsqlFlorin Peter2013-05-291-4/+4
| | | | | | | |
* | | | | | | | changed deprecated classFlorin Peter2013-05-291-1/+1
| | | | | | | |
* | | | | | | | fixed typoFlorin Peter2013-05-291-1/+1
| | | | | | | |
* | | | | | | | fixes if cache returns falseFlorin Peter2013-05-291-6/+16
| | | | | | | |
* | | | | | | | fix $parent/$source typoFlorin Peter2013-05-291-2/+1
| | | | | | | |
* | | | | | | | Merge branch 'master' into file_encryption_external_storage_fixesFlorin Peter2013-05-29573-2123/+2248
|\| | | | | | |
| * | | | | | | Merge pull request #3530 from owncloud/cache-mimeiconicewind19912013-05-291-17/+25
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | Cache mimetype icons
| | * | | | | | Style fixesMichael Gapczynski2013-05-291-21/+21
| | | | | | | |
| | * | | | | | Cache mimetype iconsRobin Appelman2013-05-291-7/+15
| |/ / / / / /
| * / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-05-29552-1868/+1887
| |/ / / / /
| * | | | | Merge pull request #3511 from owncloud/sessionclassicewind19912013-05-2820-238/+336
| |\ \ \ \ \ | | | | | | | | | | | | | | Abstract session access away in a class
| | * | | | | 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 ↵Florin Peter2013-05-285-8/+548
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | sessionclass
| | | * | | | | 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
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | 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
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-12 11:23:31 +0000