githubFork/roundcubemail.git

Roundcubemail devel

Merge branch 'dev-advanced-ldap-groups': - Refactoring: separated address b...

Thomas Bruederli

2013-06-18 dd54725b21bf1a5a2c617b70c05ef6fb1681505d

refs
author	Thomas Bruederli <thomas@roundcube.net>
	Tuesday, June 18, 2013 07:49 -0400
committer	Thomas Bruederli <thomas@roundcube.net>
	Tuesday, June 18, 2013 07:49 -0400
commit	dd54725b21bf1a5a2c617b70c05ef6fb1681505d
tree	2dc5c88aefc0db0cc8da0431896bb520e9bbdb6e tree \| zip \| gz
parent	b531277d039c0649736310c9b84efe4758b39537 view \| diff 03c73fa1c59812d95c843ff63aa692a54521f264 view \| diff

Merge branch 'dev-advanced-ldap-groups':
- Refactoring: separated address book implementation from generic LDAP wrapper class
- Auto-detect and use VLV indices for all search operations
- Additional group configuration options for LDAP address books
- Allow address books to display a multi-level group hierarchy in the contacts list

4 files added

22 files modified

	config/main.inc.php.dist	55 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcmail.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/js/app.js	114 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_ldap.php	994 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_ldap_generic.php	1059 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_ldap_result.php	130 ●●●●● diff \| view \| raw \| blame \| history
	program/localization/en_US/labels.inc	1 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/func.inc	66 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/list.inc	5 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/save.inc	4 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/show.inc	5 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/list_contacts.inc	29 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/addressbook.css	31 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/images/contactgroup.png	diff \| view \| raw \| blame \| history
	skins/classic/mail.css	8 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/templates/addressbook.html	2 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/templates/contact.html	2 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/addressbook.css	49 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/ie7hacks.css	1 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/images/contactgroup.png	diff \| view \| raw \| blame \| history
	skins/larry/images/listicons.png	diff \| view \| raw \| blame \| history
	skins/larry/mail.css	13 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/styles.css	4 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/templates/addressbook.html	2 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/templates/contact.html	2 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/ui.js	33 ●●●●● diff \| view \| raw \| blame \| history