rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-02 14:24:10 +01:00
Code Issues Releases Activity
3,320 Commits 18 Branches 95 Tags 40 MiB
cd2d7573d9
Commit Graph

10 Commits

Author SHA1 Message Date
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
Thomas Tanghus
f699812f69 Move instantiation of ImportManager to PageController 2014-05-09 13:39:17 +02:00
babelouest
03cf95f37c Merge branch 'master' of https://github.com/owncloud/contacts into ldap 2014-04-09 13:45:48 -04:00
babelouest
c674b8db00 code clean in js config dialog 
distinction between a ldap addressbook edition and a local addressbook edition in the UI
several bug fixes
 2014-04-09 13:38:09 -04:00
Thomas Tanghus
70438c997d Align controllers to owncloud/core#8017 2014-04-07 22:29:24 +02:00
babelouest
ec8053c915 Several corrections and improvements, thanks to the feedbacks on the PR 2014-04-04 18:50:55 -04:00
Thomas Tanghus
868bf088b3 camelCase variables 2014-03-18 00:58:01 +01:00
Thomas Tanghus
394d15350e Remove use of %webroot%. Closes #406 2014-02-26 23:23:01 +01:00
Thomas Tanghus
9abdeb75ce 2014 2014-01-26 00:40:22 +01:00
Thomas Tanghus
1d29b943ae Finally works with core master 2013-10-17 02:10:50 +02:00