summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into calendar_importGeorg Ehrke2012-06-295-15/+54
|\
| * typo fixedBjoern Schiessle2012-06-291-1/+1
| * - when creating a new text file or directory which name already exist use the...Bjoern Schiessle2012-06-291-1/+3
| * Spelling fixBart Visscher2012-06-281-1/+1
| * Remember the app root information.Bart Visscher2012-06-281-1/+5
| * Remove redundant code from OC_Helper::linkToBart Visscher2012-06-281-6/+3
| * Pg setup enhancementBrice Maron2012-06-281-2/+32
| * Return login errors for PostgreSQL setupMichael Gapczynski2012-06-271-0/+1
| * Migration: fix app pathsTom Needham2012-06-271-3/+3
| * Set table prefix if not set in postgresql installBrice Maron2012-06-271-1/+1
| * Fix recursion when running an update scriptBart Visscher2012-06-271-0/+5
* | Merge branch 'master' into calendar_importGeorg Ehrke2012-06-275-29/+45
|\|
| * fix running tests from cliRobin Appelman2012-06-272-3/+8
| * fix webdav errors for empty foldersRobin Appelman2012-06-271-9/+11
| * Cache result of OC_App::getAppVersionsBart Visscher2012-06-271-0/+4
| * Move app upgrade check to loading of appsBart Visscher2012-06-272-16/+12
| * Make Categories a bit quieter.Thomas Tanghus2012-06-271-1/+10
* | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-2610-47/+84
|\|
| * All is good ;-)Thomas Tanghus2012-06-261-0/+1
| * Cache: try to set the fast cache in the BrokerBart Visscher2012-06-251-5/+3
| * Fix setting ETag header on cache missBart Visscher2012-06-251-1/+4
| * Cache: Add APC and XCache to global cache handlerBart Visscher2012-06-253-2/+30
| * Cache: Use getUserCache cache in OC_CacheBart Visscher2012-06-251-37/+24
| * Cache: Create global cache in OC_CacheBart Visscher2012-06-252-1/+15
| * Trim url and path of appsroot to have and standart type of path fix oc-1107Brice Maron2012-06-251-5/+7
| * write sql errors into the error log for better debuggingFrank Karlitschek2012-06-251-0/+2
| * Fix the fix about filecache and postgresBrice Maron2012-06-241-2/+1
| * Correct File cache error with postgresqlBrice Maron2012-06-241-0/+3
| * Trim trailing whitespace from version.Thomas Tanghus2012-06-241-1/+1
* | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-236-21/+22
|\|
| * remove trailing slash in %appswebroot% placeholderFlorian Hülsmann2012-06-231-1/+1
| * close only if existFrank Karlitschek2012-06-231-1/+1
| * work with non existing apps directory. thanks to Antonio for the hintFrank Karlitschek2012-06-231-10/+11
| * Remove references to /apps/ and correct inclusion of settingsBrice Maron2012-06-221-3/+3
| * Do not close php tag on config fileBrice Maron2012-06-221-1/+1
| * Correction of path looking for apps and cssBrice Maron2012-06-222-5/+5
* | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-2219-142/+378
|\|
| * Add compatability function for APC cacheBart Visscher2012-06-221-0/+8
| * Fix initialization of OC_Filesystem setup from DAVBart Visscher2012-06-221-1/+1
| * Convert OC_L10N_String to a string in OC_JSON::encodedPrintBart Visscher2012-06-221-0/+10
| * Spelling fixesBart Visscher2012-06-221-3/+4
| * Avoid fetch ocs info if the appstore is disabledBrice Maron2012-06-221-22/+31
| * Correct css inclusion with minimizerBrice Maron2012-06-221-2/+1
| * Enhance hint about writable app directoryBrice Maron2012-06-221-1/+2
| * Correct image path and apps path replacementBrice Maron2012-06-221-1/+2
| * Correct OC_Config writer. Use var_export (has support for array,...)Brice Maron2012-06-221-14/+3
| * Fixes for multi app dir :Brice Maron2012-06-221-2/+2
| * some path fixes for multi-dir appThomas Mueller2012-06-222-3/+3
| * Provide solution for smoother migration for apps to multi-app dirBrice Maron2012-06-211-1/+5
| * Do not search apps if oc is not yet installedBrice Maron2012-06-211-0/+2