Georg Ehrke 433d15d309 Merge branch 'master' into calendar_import		2012-06-30 12:50:26 +02:00
..
ajax	another fix for oc-1044	2012-06-24 09:41:37 +02:00
appinfo	fix merge conflicts	2012-06-30 12:44:51 +02:00
css	add sharing management for calendars	2012-02-04 21:23:31 +01:00
img	removing executable bit from various files	2012-04-30 12:05:57 +02:00
js	pass progresskey the correct way during calender import	2012-06-29 00:49:37 +02:00
l10n	update translations	2012-06-06 00:29:28 +02:00
lib	Merge branch 'master' into calendar_import	2012-06-30 12:50:26 +02:00
templates	Calendar: Fix caldav url encoding	2012-06-21 23:30:04 +02:00
caldav.php	add caldav and carddav files in their old place for backward compatibility - add rewriterule for caldav and carddav	2012-05-16 21:05:15 +02:00
export.php	Calendar Export: replace spaces with dashes in the name of the calendar / event	2012-06-28 19:04:14 +02:00
index.php	Only create new calendar when there are none. Fix oc-1007.	2012-06-15 01:55:02 +02:00
settings.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
share.php	fix for previous commit	2012-06-28 19:13:43 +02:00