summaryrefslogtreecommitdiffstats
path: root/apps/contacts/import.php
Commit message (Expand)AuthorAgeFilesLines
* fix merge conflictsGeorg Ehrke2012-04-261-0/+5
|\
| * Contacts: Added import with with file picker.Thomas Tanghus2012-04-261-0/+5
* | fix merge conflictsGeorg Ehrke2012-04-241-3/+18
|\|
| * Contacts: In app import (for Chrome and Firefox only)Thomas Tanghus2012-04-241-6/+11
| * Contacts: In app import. Cleanup still needed.Thomas Tanghus2012-04-241-1/+11
* | Merge branch 'master' into movable_appsGeorg Ehrke2012-04-231-1/+1
|\|
| * Wrong app check.Thomas Tanghus2012-04-231-1/+1
* | remove the require_once lib base from all (or nearly all) filesGeorg Ehrke2012-04-171-1/+1
|/
* Contacts: change card parameter type of VCard::edit and VCard::addBart Visscher2012-03-071-5/+9
* Cleanup OC_Contacts_Addressbook::find usageBart Visscher2012-02-121-5/+1
* change comments in import.phpGeorg Ehrke2012-02-051-3/+3
* add import function for contactsGeorg Ehrke2012-02-051-0/+120