summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* fix merge conflictsGeorg Ehrke2012-04-268-16/+92
|\
| * Merge branch 'sabredav_1.6'Georg Ehrke2012-04-253-5/+7
| |\
| | * Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-221-3/+56
| | |\
| | * \ fix merge conflictsGeorg Ehrke2012-04-218-27/+183
| | |\ \
| | * \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-1528-513/+621
| | |\ \ \
| | * \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-1313-160/+498
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-1018-108/+1299
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-305-31/+101
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-293-11/+42
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-273-17/+38
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-255-351/+63
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-221-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-215-170/+203
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-1934-680/+1700
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-02-253-4/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | add empty methods updatePrincipal and searchPrincipals and change method getP...Georg Ehrke2012-02-251-1/+3
| | * | | | | | | | | | | | | | replace Sabre_DAV_Exception_FileNotFound with Sabre_DAV_Exception_NotFoundGeorg Ehrke2012-02-251-1/+1
| | * | | | | | | | | | | | | | replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTimeGeorg Ehrke2012-02-241-3/+3
| | * | | | | | | | | | | | | | Merge branch 'master' into sabredav_1.6Georg Ehrke2012-02-241-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-02-234-5/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | make lib/vobject.php work with sabredav 1.6Georg Ehrke2012-02-231-1/+1
| * | | | | | | | | | | | | | | | | minor filecache improvementsRobin Appelman2012-04-251-5/+10
| * | | | | | | | | | | | | | | | | emit the correct hooks for file_put_contents and some readfile improvementsRobin Appelman2012-04-251-3/+16
| * | | | | | | | | | | | | | | | | initial mount configuration workRobin Appelman2012-04-251-0/+48
* | | | | | | | | | | | | | | | | | fix security check for the path of the requested fileGeorg Ehrke2012-04-262-4/+29
* | | | | | | | | | | | | | | | | | fix loading of css files that are core relatedGeorg Ehrke2012-04-261-5/+5
* | | | | | | | | | | | | | | | | | some fixes fore movable appsGeorg Ehrke2012-04-263-5/+25
* | | | | | | | | | | | | | | | | | add a proper 404Georg Ehrke2012-04-251-1/+2
* | | | | | | | | | | | | | | | | | fix merge conflictsGeorg Ehrke2012-04-241-0/+4
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | OC_App::getStorage() failed if app dir didn't exist.Thomas Tanghus2012-04-241-0/+4
* | | | | | | | | | | | | | | | | | fix php failGeorg Ehrke2012-04-241-1/+1
* | | | | | | | | | | | | | | | | | remove debug messageGeorg Ehrke2012-04-241-1/+1
* | | | | | | | | | | | | | | | | | another fix for linkto functionGeorg Ehrke2012-04-241-1/+1
* | | | | | | | | | | | | | | | | | fix linkto function in OC_HelperGeorg Ehrke2012-04-241-4/+8
* | | | | | | | | | | | | | | | | | remove debug code in lib baseGeorg Ehrke2012-04-231-1/+0
* | | | | | | | | | | | | | | | | | fix bug in lib baseGeorg Ehrke2012-04-231-1/+3
* | | | | | | | | | | | | | | | | | Merge branch 'master' into movable_appsGeorg Ehrke2012-04-232-1/+64
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | first step to an public api of ownCloud for the apps. In the future they shou...Frank Karlitschek2012-04-232-0/+63
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | use native functions of php to parse the string into the VarGeorg Ehrke2012-04-232-8/+7
* | | | | | | | | | | | | | | | | rename var file to getfile to prevent fails in files appGeorg Ehrke2012-04-232-4/+4
* | | | | | | | | | | | | | | | | fix bug in lib/helper.php and fix file uploadGeorg Ehrke2012-04-231-1/+1
* | | | | | | | | | | | | | | | | fix merge conflictsGeorg Ehrke2012-04-222-3/+57
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add a static code checker for evil patterns in apps.Frank Karlitschek2012-04-211-3/+56
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | improve the app installer.Frank Karlitschek2012-04-211-0/+1
* | | | | | | | | | | | | | | | Merge branch 'master' into movable_appsGeorg Ehrke2012-04-203-2/+139
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | support searching the knowledge baseFrank Karlitschek2012-04-201-2/+3
| * | | | | | | | | | | | | | | new OC_Mail class to handle all mail sending. The benefit is that is way mor ...Frank Karlitschek2012-04-201-0/+116
| * | | | | | | | | | | | | | | add function to get mimetype from stringRobin Appelman2012-04-181-0/+20
* | | | | | | | | | | | | | | | support file calls with parameterGeorg Ehrke2012-04-201-2/+6
* | | | | | | | | | | | | | | | optimize codeGeorg Ehrke2012-04-191-1/+0