Georg Ehrke 849099d724 fix merge conflicts

2012-04-26 18:08:49 +02:00

..

categories

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

activation.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

addbook.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

addcontact.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

addproperty.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

chooseaddressbook.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

contactdetails.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

contacts.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

createaddressbook.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

cropphoto.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

currentphoto.php

Contacts:

2012-04-22 20:47:24 +02:00

deletebook.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

deletecard.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

deleteproperty.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

editaddress.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

editaddressbook.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

editname.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

getdetails.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

importaddressbook.php

Contacts: In app import. Cleanup still needed.

2012-04-24 01:44:07 +02:00

importdialog.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

loadcard.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

loadintro.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

loadphoto.php

Merge branch 'master' into movable_apps

2012-04-23 13:03:50 +02:00

newcontact.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

oc_photo.php

Contacts:

2012-04-22 20:47:24 +02:00

savecrop.php

Merge branch 'master' into movable_apps

2012-04-23 13:03:50 +02:00

saveproperty.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

updateaddressbook.php

remove the require_once lib base from all (or nearly all) files

2012-04-17 19:31:29 +02:00

uploadimport.php

Contacts: Added import with with file picker.

2012-04-26 03:21:52 +02:00

uploadphoto.php

Merge branch 'master' into movable_apps

2012-04-23 13:03:50 +02:00