babelouest 440fce7ca8 Merge branch 'master' of https://github.com/owncloud/contacts into ldap ...

Conflicts:
	formats/backend_ldap_connector.xml
	lib/backend/abstractbackend.php
	lib/backend/database.php
	lib/backend/ldap.php
	lib/controller/addressbookcontroller.php

2014-03-28 10:39:25 -04:00

..

backend

Merge branch 'master' of https://github.com/owncloud/contacts into ldap

2014-03-28 10:39:25 -04:00

carddav

Merge branch 'master' of https://github.com/owncloud/contacts into ldap

2014-03-28 10:39:25 -04:00

connector

Merge branch 'master' of https://github.com/owncloud/contacts into ldap

2014-03-28 10:39:25 -04:00

controller

Merge branch 'master' of https://github.com/owncloud/contacts into ldap

2014-03-28 10:39:25 -04:00

middleware

Misc. code cleanups

2014-03-23 19:02:16 +01:00

share

2014

2014-01-26 00:40:22 +01:00

utils

Misc. code cleanups

2014-03-23 19:02:16 +01:00

vobject

Correct types for VCard properties

2014-03-21 15:19:31 +01:00

abstractpimcollection.php

Finally actually implement the interfaces I claim to.

2014-03-10 15:16:15 +01:00

abstractpimobject.php

Scrutinizer cleanup

2014-03-08 16:22:51 +01:00

addressbook.php

Misc. code cleanups

2014-03-23 19:02:16 +01:00

addressbookprovider.php

Correct call to AddressBook->getChild()

2014-03-21 15:19:32 +01:00

app.php

More fixes

2014-03-08 19:09:17 +01:00

contact.php

Misc. code cleanups

2014-03-23 19:02:16 +01:00

controller.php

2014

2014-01-26 00:40:22 +01:00

dispatcher.php

Remove wrong argument to HttpMiddleware ctor

2014-03-11 12:59:06 +01:00

hooks.php

Misc. fixes after refactoring

2014-03-18 23:51:32 +01:00

imageresponse.php

Misc. code cleanups

2014-03-23 19:02:16 +01:00

importmanager.php

Import from multiple formats

2014-03-11 16:43:32 +01:00

ipimobject.php

2014

2014-01-26 00:40:22 +01:00

jsonresponse.php

Misc. code cleanups

2014-03-23 19:02:16 +01:00

searchprovider.php

Misc. code cleanups

2014-03-23 19:02:16 +01:00

textdownloadresponse.php

More cleanups

2014-03-09 15:03:29 +01:00