1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-30 12:24:11 +01:00
OwncloudContactsOfficial/ajax
Thomas Tanghus ec86736336 Merge branch 'master' of github.com:owncloud/apps into contacts_rework
Fix conflicts:
	contacts/ajax/contact/saveproperty.php
	contacts/js/contacts.js
	contacts/lib/hooks.php
	contacts/lib/search.php
	contacts/lib/vcard.php
2012-10-30 07:19:56 +01:00
..
addressbook Use OCA namespace. 2012-10-25 03:34:12 +02:00
categories Make groups sortable. 2012-10-26 01:57:16 +02:00
contact Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-30 07:19:56 +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 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-30 07:19:56 +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