raghunayyar 775e08e0ee Merge branch 'master' into core-em-to-px ... Conflicts: apps/files_sharing/css/public.css apps/user_ldap/css/settings.css core/css/multiselect.css core/css/share.css		2014-01-16 14:42:37 +05:30
..
ajax	LDAP: on testing configuration, set active property to true, otherwise inactive connections cannot be tested properly	2013-12-04 18:58:09 +01:00
appinfo	do not instantiate LDAP Proxy if there are no active configurations	2013-10-17 19:13:28 +02:00
css	Merge branch 'master' into core-em-to-px	2014-01-16 14:42:37 +05:30
js	LDAP Wizard: don't generate filter when not allowed	2013-12-04 18:59:30 +01:00
l10n	remove ru_RU - it has bee removed from transifex	2014-01-13 16:41:10 +01:00
lib	typo, grammar	2014-01-14 16:33:18 +01:00
templates	LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283	2013-12-12 14:15:39 +01:00
tests	LDAP: add tests for countUsers	2014-01-08 12:24:29 +01:00
group_ldap.php	LDAP: coding style	2013-09-27 13:34:15 +02:00
group_proxy.php	LDAP: proxy: configurable return to determine when to try the next LDAP server and when to return (multi server setup)	2013-11-25 22:05:00 +01:00
settings.php	LDAP Wizard: fix couple more or less nasty bugs aka polishing	2013-10-17 19:13:28 +02:00
user_ldap.php	remove unnecessary line	2014-01-08 12:20:56 +01:00
user_proxy.php	LDAP: implement userCount action. This required to (finally) clean up and refactor the search method, which will have a positive performance impact on paged search.	2014-01-08 12:07:57 +01:00