Thomas Tanghus 0f02508121 Merge branch 'master' of github.com:owncloud/apps into contacts_rework ... Conflicts: contacts/ajax/contact/details.php contacts/lib/addressbook.php contacts/lib/vcard.php		2012-11-12 00:46:15 +01:00
..
addressbook	Use OCA namespace.	2012-10-25 03:34:12 +02:00
categories	app:contacts: Add/remove multiple contacts to/from group.	2012-11-01 15:31:58 +01:00
contact	Merge branch 'master' of github.com:owncloud/apps into contacts_rework	2012-11-12 00:46:15 +01:00
cropphoto.php	Contacts: Implement CSRF prevention.	2012-06-14 18:00:13 +02:00
currentphoto.php	Use OCA namespace.	2012-10-25 03:34:12 +02:00
editaddress.php	Use OCA namespace.	2012-10-25 03:34:12 +02:00
editname.php	Use OCA namespace.	2012-10-25 03:34:12 +02:00
importdialog.php	Fix whitespace in contacts	2012-09-07 14:32:45 +02:00
loghandler.php	Remove stray error_log statement.	2012-10-16 22:24:03 +02:00
oc_photo.php	Use OCA namespace.	2012-10-25 03:34:12 +02:00
savecrop.php	Contacts: Use correct TYPE parameter when saving PHOTO.	2012-11-11 20:45:45 +01:00
selectaddressbook.php	Use OCA namespace.	2012-10-25 03:34:12 +02:00
setpreference.php	Use OCA namespace.	2012-10-25 03:34:12 +02:00
uploadimport.php	Use OCA namespace.	2012-10-25 03:34:12 +02:00
uploadphoto.php	Use OCA namespace.	2012-10-25 03:34:12 +02:00