Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix merge conflicts | Georg Ehrke | 2012-04-26 | 1 | -0/+5 |
|\ | |||||
| * | Contacts: Added import with with file picker. | Thomas Tanghus | 2012-04-26 | 1 | -0/+5 |
* | | fix merge conflicts | Georg Ehrke | 2012-04-24 | 1 | -3/+18 |
|\| | |||||
| * | Contacts: In app import (for Chrome and Firefox only) | Thomas Tanghus | 2012-04-24 | 1 | -6/+11 |
| * | Contacts: In app import. Cleanup still needed. | Thomas Tanghus | 2012-04-24 | 1 | -1/+11 |
* | | Merge branch 'master' into movable_apps | Georg Ehrke | 2012-04-23 | 1 | -1/+1 |
|\| | |||||
| * | Wrong app check. | Thomas Tanghus | 2012-04-23 | 1 | -1/+1 |
* | | remove the require_once lib base from all (or nearly all) files | Georg Ehrke | 2012-04-17 | 1 | -1/+1 |
|/ | |||||
* | Contacts: change card parameter type of VCard::edit and VCard::add | Bart Visscher | 2012-03-07 | 1 | -5/+9 |
* | Cleanup OC_Contacts_Addressbook::find usage | Bart Visscher | 2012-02-12 | 1 | -5/+1 |
* | change comments in import.php | Georg Ehrke | 2012-02-05 | 1 | -3/+3 |
* | add import function for contacts | Georg Ehrke | 2012-02-05 | 1 | -0/+120 |