Commit graph

13 commits

Author SHA1 Message Date
Georg Ehrke
fc632b5795 fix merge conflicts 2012-06-16 09:48:07 +02:00
Thomas Mueller
583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Frank Karlitschek
43caa3b3b9 ported oc_json 2012-05-03 12:23:29 +02:00
Georg Ehrke
2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Georg Ehrke
4c2cf35050 fix merge conflicts 2012-04-22 13:19:12 +02:00
Georg Ehrke
0918fc7d91 fix merge conflicts 2012-04-21 23:21:50 +02:00
Georg Ehrke
69ee0efc0b remove the require_once lib base from all (or nearly all) files 2012-04-17 19:31:29 +02:00
Georg Ehrke
64d3301523 make shared events editable and add (empty) classes for alarm and attendees 2012-04-10 16:03:38 -04:00
Georg Ehrke
eef9a1e7ed add access check to ajax files 2012-04-07 22:37:26 -04:00
Georg Ehrke
1d1dfcbc1a replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime 2012-02-24 22:20:40 +01:00
Georg Ehrke
b7de1850a0 add moved files to clean up ajax folder 2012-02-23 21:58:39 +01:00
Georg Ehrke
cff0ac2bf9 better permission check in resize.php 2012-02-22 10:42:33 +01:00
Georg Ehrke
8dff0fb58d add moved files to clean up ajax folder 2012-02-20 11:26:22 +01:00