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

Conflicts:
	admin.php
	lib/backend/ldap.php
	lib/dispatcher.php

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

..

backend_ldap_inet_org_person_connector.xml

use ocdialog

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

backend_ldap_vcard_unassigned_connector.xml

first batch of a working of add/update addressbook dialog window

2014-04-03 17:35:58 -04:00

import_csv_gmail_connector.xml

Removed executable bit from import connectors

2014-04-18 02:33:56 +02:00

import_csv_outlook_connector.xml

Removed executable bit from import connectors

2014-04-18 02:33:56 +02:00

import_csv_thunderbird_connector.xml

Removed executable bit from import connectors

2014-04-18 02:33:56 +02:00

import_csv_yahoo_connector.xml

Removed executable bit from import connectors

2014-04-18 02:33:56 +02:00

import_ldif_phpldapadmin_connector.xml

Removed executable bit from import connectors

2014-04-18 02:33:56 +02:00

import_vcard_gmail_connector.xml

Removed executable bit from import connectors

2014-04-18 02:33:56 +02:00

import_vcard_standard_connector.xml

added standard vcard connector

2014-03-21 01:59:19 -04:00

import_vcard_yahoo_connector.xml

Removed executable bit from import connectors

2014-04-18 02:33:56 +02:00

vcardunassigned.schema

to use the connector vcardunassigned

2014-05-09 13:58:52 -04:00