1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-29 11:24:11 +01:00
OwncloudContactsOfficial/lib
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
..
backend Contacts: New backends WiP 2013-03-12 09:15:40 +01:00
carddav Contacts: New backends WiP 2013-03-12 09:15:40 +01:00
share Contacts: New backends WiP 2013-03-12 09:15:40 +01:00
vobject Contacts: Avoid double escaping on serialize. 2013-03-10 12:50:02 +01:00
abstractpimcollection.php Contacts: New backends WiP 2013-03-12 09:15:40 +01:00
abstractpimobject.php Contacts: New backends WiP 2013-03-12 09:15:40 +01:00
addressbook.php Contacts: New backends WiP 2013-03-12 09:15:40 +01:00
addressbooklegacy.php Contacts: Temporarily use AddressbookLegacy 2013-03-12 09:14:06 +01:00
addressbookprovider.php Contacts: Only query for properties if contacts matches search criteria. 2013-02-04 02:07:00 +01:00
app.php Merge branch 'five_zero_dot_one' into contacts_backends 2013-03-12 09:24:06 +01:00
contact.php Contacts: New backends WiP 2013-03-12 09:15:40 +01:00
hooks.php fix some PHP Notices and fix birthday calendar - fix #610 2013-03-06 14:47:26 +01:00
ipimobject.php Contacts: New backends WiP 2013-03-12 09:15:40 +01:00
search.php Contacts: Fix undefined indexes on search. 2013-03-05 02:31:14 +01:00
vcard.php Contacts: New backends WiP 2013-03-12 09:15:40 +01:00