aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
| * some indention fixesRobin Appelman2012-07-249-183/+152
| * add option to clear user backendsRobin Appelman2012-07-231-1/+7
| * make it generic and implement a dummy call for quota setFrank Karlitschek2012-07-231-27/+74
| * first part of the new new OCS CLOUD module. So far only quota is implemented.Frank Karlitschek2012-07-231-419/+470
| * fix broken properties in the databaseBjoern Schiessle2012-07-231-1/+1
| * quick fix for broken propertiesBjoern Schiessle2012-07-231-0/+1
| * Fix oc-1163: gzdecode function not always definedBart Visscher2012-07-221-0/+10
| * CSRF protection for eventsourceRobin Appelman2012-07-221-0/+3
| * cache fileid's in oc_cacheRobin Appelman2012-07-221-3/+29
| * add option to only get fast cacheRobin Appelman2012-07-221-16/+41
| * add prefix option to OC_Cache::clearRobin Appelman2012-07-225-12/+16
| * add method to OC_Cache to check whether a fast cache (apc/xdebug/etc) is avai...Robin Appelman2012-07-221-0/+46
| * use file extension for determining mimetypes on defaultRobin Appelman2012-07-223-39/+25
| * Code style. One down...Thomas Tanghus2012-07-211-174/+262
| * Merge branch 'master' into calendar_importGeorg Ehrke2012-07-2140-199/+279
| |\
| * \ Merge branch 'master' into calendar_importGeorg Ehrke2012-07-153-29/+31
| |\ \
| * \ \ Merge branch 'master' into calendar_importGeorg Ehrke2012-07-1120-61/+278
| |\ \ \
| * \ \ \ Merge branch 'master' into calendar_importGeorg Ehrke2012-07-061-8/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into calendar_importGeorg Ehrke2012-07-052-19/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into calendar_importGeorg Ehrke2012-07-041-0/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into calendar_importGeorg Ehrke2012-07-032-1/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into calendar_importGeorg Ehrke2012-07-031-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_importGeorg Ehrke2012-07-037-42/+149
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_importGeorg Ehrke2012-06-301-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_importGeorg Ehrke2012-06-295-15/+54
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_importGeorg Ehrke2012-06-275-29/+45
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-2610-47/+84
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-236-21/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-2219-142/+378
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-211-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-206-21/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-2011-82/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-195-8/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-186-260/+211
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-184-4/+126
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-176-29/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-165-55/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-1522-485/+551
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-134-6/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-1017-61/+213
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ fix merge conflictsGeorg Ehrke2012-06-088-40/+116
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-0626-167/+606
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-0419-100/+233
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-05-312-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-05-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-05-2637-39/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-05-2516-40/+138
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-05-1715-29/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-05-1343-203/+2359
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \