babelouest 229c49d43e Merge branch 'master' of https://github.com/owncloud/contacts into import-new-ui ...

Conflicts:
	js/addressbooks.js
	templates/contacts.php

2014-05-10 12:09:23 -04:00

..

backend

fixed scrutinizer issues

2014-05-09 15:18:44 -04:00

carddav

Line break for readability

2014-04-10 20:29:34 +02:00

connector

Merge branch 'master' of https://github.com/owncloud/contacts into import-new-ui

2014-05-10 12:09:23 -04:00

controller

Merge branch 'master' of https://github.com/owncloud/contacts into import-new-ui

2014-05-10 12:09:23 -04:00

middleware

Misc. code cleanups

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

share

Shared address books wasn't shown. Fix #471

2014-04-22 15:39:14 +02:00

utils

Change displayname of ownCloud username field

2014-05-09 09:50:50 +02: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

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

2014-05-09 14:54:49 -04:00

addressbookprovider.php

Some cleanups. cc @LEDfan

2014-04-17 04:59:14 +02:00

app.php

after a painful rebase

2014-05-09 14:30:14 -04:00

contact.php

Code style

2014-04-24 18:32:33 +02:00

controller.php

Align controllers to owncloud/core#8017

2014-04-07 22:29:24 +02:00

dispatcher.php

after a painful rebase

2014-05-09 14:30:14 -04: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

Use realpath() for import connectors. Refs. #469

2014-04-18 03:46:27 +02: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

localusersaddressbookprovider.php

Implement getKey() for the localusers backend provider

2014-05-06 13:50:18 +02:00

searchprovider.php

Misc. code cleanups

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

textdownloadresponse.php

DownloadResponse now in public namespace

2014-04-26 00:41:22 +02:00