12 Commits

Author	SHA1	Message	Date
Georg Ehrke	849099d724	fix merge conflicts	2012-04-26 18:08:49 +02:00
Thomas Tanghus	f01fc2e855	Contacts: Added import with with file picker.	2012-04-26 03:21:52 +02:00
Georg Ehrke	bb9a090659	fix merge conflicts	2012-04-24 21:59:56 +02:00
Thomas Tanghus	e4eef8a698	Contacts: In app import (for Chrome and Firefox only)	2012-04-24 01:44:07 +02:00
Thomas Tanghus	b543d03321	Contacts: In app import. Cleanup still needed.	2012-04-24 01:44:07 +02:00
Georg Ehrke	c6a0be939b	Merge branch 'master' into movable_apps	2012-04-23 13:03:50 +02:00
Thomas Tanghus	accab72321	Wrong app check.	2012-04-23 10:52:13 +02:00
Georg Ehrke	3863a44589	remove the require_once lib base from all (or nearly all) files	2012-04-17 19:31:29 +02:00
Bart Visscher	c8598c3df1	Contacts: change card parameter type of VCard::edit and VCard::add ... changed to OC_VObject	2012-03-07 21:46:42 +01:00
Bart Visscher	c3e143d700	Cleanup OC_Contacts_Addressbook::find usage ... Use OC_Contacts_App::getAddressbook($id) instead of OC_Contacts_Addressbook::find($id), it contains access checks.	2012-02-12 15:14:23 +01:00
Georg Ehrke	51e7ff2bc2	change comments in import.php	2012-02-05 12:13:53 +01:00
Georg Ehrke	0e1b92aafd	add import function for contacts	2012-02-05 12:13:53 +01:00