Michael Gapczynski 82d81e8d39 Merge branch 'share_api' ... Conflicts: apps/contacts/lib/vcard.php apps/files/index.php lib/files.php		2012-08-19 22:29:01 -04:00
..
share	Calendar: update share backend using contacts backend as template	2012-08-10 14:40:48 +02:00
alarm.php	make shared events editable and add (empty) classes for alarm and attendees	2012-04-10 16:03:38 -04:00
app.php	Calendar: remove double html encoding	2012-08-03 16:18:33 +02:00
attendees.php	make shared events editable and add (empty) classes for alarm and attendees	2012-04-10 16:03:38 -04:00
calendar.php	use light grey instead of white	2012-07-01 01:02:54 +02:00
connector_sabre.php	Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/owncloud into merge-requests/76	2012-07-27 14:17:55 +02:00
export.php	fix documentation style	2012-06-30 17:09:20 +02:00
hooks.php	Added hook for postCreateUser. Probably fix for oc-1265.	2012-07-17 03:04:04 +02:00
import.php	fix fail in sql query of isDuplicate method of OC_Calendar_Import	2012-08-17 21:29:26 +02:00
object.php	DRY for getting calendar timezone setting	2012-07-21 00:45:30 +02:00
repeat.php	fix documentation style	2012-06-30 17:09:20 +02:00
search.php	DRY for getting calendar timezone setting	2012-07-21 00:45:30 +02:00
share.php	Use new sharing API in OC_Calendar_Share::allSharedwithuser	2012-08-07 23:31:06 +02:00
share_backend.php	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00