Michael Gapczynski 4c7fd8cd01 Merge branch 'master' into share_api ... Conflicts: lib/group.php lib/group/backend.php lib/group/database.php lib/group/interface.php lib/public/user.php lib/user.php lib/user/backend.php lib/user/database.php lib/user/interface.php		2012-08-14 10:22:13 -04:00
..
ajax	move calendar settings from personal settings to in app settings	2012-08-09 12:37:26 +02:00
appinfo	Merge branch 'master' into share_api	2012-08-14 10:22:13 -04:00
css	Calendar: remove not used style rules	2012-08-12 22:40:36 +02:00
img	removing executable bit from various files	2012-04-30 12:05:57 +02:00
js	Merge branch 'master' into share_api	2012-08-09 11:38:22 -04:00
l10n	[tx-robot] updated from transifex	2012-08-13 23:19:31 +02:00
lib	Calendar: update share backend using contacts backend as template	2012-08-10 14:40:48 +02:00
templates	Merge branch 'master' into share_api	2012-08-14 10:22:13 -04: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
calendar.php	move calendar settings from personal settings to in app settings	2012-08-09 12:37:26 +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	remove debug code from calendar - thanks michael for pointing that out :)	2012-08-09 17:39:16 +02:00
settings.php	move calendar settings from personal settings to in app settings	2012-08-09 12:37:26 +02:00
share.php	fix for previous commit	2012-06-28 19:13:43 +02:00