jbtbnl a9ade3079d Merge remote-tracking branch 'origin/master' into import-new-ui ...

Conflicts:
	css/contacts.css
	lib/controller/importcontroller.php

2014-08-26 17:42:14 +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

2014

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

groupcontroller.php

Rename $this->tagMgr to $this->tags as that's what they are.

2014-08-19 14:29:46 +02:00

importcontroller.php

Merge remote-tracking branch 'origin/master' into import-new-ui

2014-08-26 17:42:14 +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