Michael Gapczynski 78cd1153f0 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/vcard.php apps/files_sharing/sharedstorage.php		2012-08-09 11:38:22 -04:00
..
calendar.php	move calendar settings from personal settings to in app settings	2012-08-09 12:37:26 +02:00
part.choosecalendar.php	move calendar settings from personal settings to in app settings	2012-08-09 12:37:26 +02:00
part.choosecalendar.rowfields.php	Initial calendar sharing backend	2012-08-07 14:57:52 -04:00
part.choosecalendar.rowfields.shared.php	Removed double sanitization	2012-06-11 19:47:42 +02:00
part.editcalendar.php	removed description field for calendar	2011-10-08 13:28:01 +02:00
part.editevent.php	Change hardcoded urls to use linkTo function	2012-08-06 18:51:41 +02:00
part.eventform.php	Removed double sanitization	2012-06-11 19:47:42 +02:00
part.import.php	some more work on calendar import - new import is (nearly) done	2012-07-04 21:14:40 +02:00
part.newevent.php	Change hardcoded urls to use linkTo function	2012-08-06 18:51:41 +02:00
part.showevent.php	fix another ui bug of calendar	2012-06-13 22:20:43 +02:00
settings.php	move calendar settings from personal settings to in app settings	2012-08-09 12:37:26 +02:00
share.dropdown.php	fix paths to images and set height for calendar management dialog	2012-05-17 21:51:38 +02:00