Georg Ehrke
|
2b10371bde
|
fix merge conflicts
|
2012-04-26 18:08:49 +02:00 |
Thomas Tanghus
|
5dbf362623
|
Contacts: Added import with with file picker.
|
2012-04-26 03:21:52 +02:00 |
|
Georg Ehrke
|
f17eea506a
|
fix merge conflicts
|
2012-04-24 21:59:56 +02:00 |
|
Thomas Tanghus
|
22f4acadc0
|
Contacts: In app import (for Chrome and Firefox only)
|
2012-04-24 01:44:07 +02:00 |
|
Thomas Tanghus
|
dfc94cbe84
|
Contacts: In app import. Cleanup still needed.
|
2012-04-24 01:44:07 +02:00 |
|
Georg Ehrke
|
1b084cc120
|
Merge branch 'master' into movable_apps
|
2012-04-23 13:03:50 +02:00 |
|
Thomas Tanghus
|
82ba2151d1
|
Wrong app check.
|
2012-04-23 10:52:13 +02:00 |
|
Georg Ehrke
|
69ee0efc0b
|
remove the require_once lib base from all (or nearly all) files
|
2012-04-17 19:31:29 +02:00 |
Bart Visscher
|
9599548203
|
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
|
c4ee924869
|
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
|
89073970d3
|
change comments in import.php
|
2012-02-05 12:13:53 +01:00 |
|
Georg Ehrke
|
8337eaa1ec
|
add import function for contacts
|
2012-02-05 12:13:53 +01:00 |