jbtbnl 18c7e95380 Merge branch 'master' into import-new-ui ...

Conflicts:
	css/contacts.css

2014-09-15 11:14:31 +02:00

..

addressbookcontroller.php

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

2014-04-11 07:56:06 -04:00

backendcontroller.php

after a painful rebase

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

contactcontroller.php

use ocdialog

2014-04-07 19:40:21 -04:00

contactphotocontroller.php

Instead of throwing error, give a JSON result when there isn't a photo

2014-07-02 17:25:34 +02:00

exportcontroller.php

Fix export of contacts

2014-08-29 17:52:51 +02:00

groupcontroller.php

Fix typos in variable names that broke stuff.

2014-08-29 00:45:56 +02:00

importcontroller.php

Hide upload iframe and fix merge flaws

2014-08-26 19:28:45 +02:00

pagecontroller.php

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

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

settingscontroller.php

Align controllers to owncloud/core#8017

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