Thomas Tanghus 3ac86ce032 Merge branch 'five_zero_dot_one' into contacts_backends ... Conflicts: contacts/ajax/contact/saveproperty.php contacts/import.php contacts/js/app.js contacts/js/contacts.js contacts/js/groups.js contacts/lib/carddav/backend.php		2013-03-12 09:24:06 +01:00
..
addressbook	Use OCA namespace.	2012-10-25 03:34:12 +02:00
categories	Contacts: Make updating vcards when deleting category optional.	2012-11-23 01:17:53 +01:00
contact	Merge branch 'five_zero_dot_one' into contacts_backends	2013-03-12 09:24:06 +01:00
cropphoto.php	Contacts: Implement CSRF prevention.	2012-06-14 18:00:13 +02:00
currentphoto.php	Contacts: Use Sabre\VObject	2012-11-22 00:14:03 +01:00
indexproperties.php	Contacts: Add missing file.	2013-01-02 01:48:46 +01:00
loghandler.php	Contacts: Remove some debug statements and make an argument check in function.	2013-02-26 20:32:47 +01:00
oc_photo.php	merge master into filesystem	2012-11-30 00:20:16 +01:00
savecrop.php	contacts/ajax/savecrop.php loadFromdata -> loadFromData	2013-02-03 22:06:53 +01:00
setpreference.php	Use OCA namespace.	2012-10-25 03:34:12 +02:00
uploadimport.php	Contacts: Sanitize paths properly this time ;)	2013-03-09 16:30:09 +01:00
uploadphoto.php	Use OCA namespace.	2012-10-25 03:34:12 +02:00