Thomas Tanghus 9a38c57df9 Merge branch 'master' into contacts_framework ...

Conflicts:
	contacts/css/contacts.css

2013-04-25 01:11:22 +02:00

..

backend

Contacts: Adjust some class names

2013-04-25 01:03:05 +02:00

carddav

Contacts: Use a backend name/id combo for CardDAV

2013-04-08 01:27:35 +02:00

controller

Contacts: Adjust some class names

2013-04-25 01:03:05 +02:00

share

Contacts: Adjust some class names

2013-04-25 01:03:05 +02:00

utils

Contacts: Add Utils\Properties::generateUID()

2013-04-09 17:20:30 +02:00

vobject

Contacts: Add Utils\Properties::generateUID()

2013-04-09 17:20:30 +02:00

abstractpimcollection.php

Contacts: Adjust some class names

2013-04-25 01:03:05 +02:00

abstractpimobject.php

Contacts: Adjust some class names

2013-04-25 01:03:05 +02:00

addressbook.php

Contacts: Adjust some class names

2013-04-25 01:03:05 +02:00

addressbooklegacy.php

Contacts: Adjustments to backends.

2013-03-12 20:00:22 +01:00

addressbookprovider.php

Merge branch 'master' into contacts_framework

2013-04-25 01:11:22 +02:00

app.php

Contacts: Step 2 in porting to app framework.

2013-04-19 09:59:30 +02:00

contact.php

Fix thumbnail cache key

2013-04-06 02:09:04 +02:00

dicontainer.php

Contacts: Clean directory structure thanks to owncloud/core#2993 \o/

2013-04-25 00:57:45 +02:00

hooks.php

Merge branch 'master' into contacts_framework

2013-04-25 01:11:22 +02:00

imageresponse.php

Contacts: Image- and JSONResponse

2013-04-24 23:38:31 +02:00

ipimobject.php

Contacts: More updates on backends

2013-03-25 17:10:21 +01:00

jsonresponse.php

Contacts: Image- and JSONResponse

2013-04-24 23:38:31 +02:00

request.php

Fixes for Request

2013-04-03 16:52:23 +02:00

search.php

Contacts: Unescape search values

2013-04-19 14:43:50 +02:00

vcard.php

Contacts: Add ownership checks to pics and export.

2013-04-12 13:49:55 +02:00