wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
server/apps/user_ldap
History
Florin Peter 3579ba1e41 Merge branch 'master' into files_encryption 
Conflicts:
	apps/user_ldap/l10n/nn_NO.php
	core/l10n/es.php
	core/l10n/et_EE.php
	core/l10n/ja_JP.php
	core/l10n/nn_NO.php
	l10n/ca/core.po
	l10n/ca/files_external.po
	l10n/ca/settings.po
	l10n/cy_GB/core.po
	l10n/cy_GB/files.po
	l10n/cy_GB/files_encryption.po
	l10n/cy_GB/files_external.po
	l10n/cy_GB/files_sharing.po
	l10n/cy_GB/files_trashbin.po
	l10n/cy_GB/lib.po
	l10n/cy_GB/settings.po
	l10n/de_DE/core.po
	l10n/es/core.po
	l10n/et_EE/core.po
	l10n/et_EE/files.po
	l10n/et_EE/settings.po
	l10n/et_EE/user_ldap.po
	l10n/gl/core.po
	l10n/it/core.po
	l10n/ja_JP/core.po
	l10n/ja_JP/settings.po
	l10n/nn_NO/core.po
	l10n/nn_NO/user_ldap.po
	l10n/pt_BR/core.po
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/files_encryption.pot
	l10n/templates/files_external.pot
	l10n/templates/files_sharing.pot
	l10n/templates/files_trashbin.pot
	l10n/templates/files_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/templates/user_webdavauth.pot
	l10n/zh_TW/files_sharing.po
	settings/l10n/et_EE.php
2013-05-01 09:31:26 +02:00
..
ajax Merge pull request #1708 from owncloud/style-cleanup-user_ldap 2013-02-17 07:02:45 -08:00
appinfo LDAP: fancy version for release, no code change 2013-03-10 18:34:56 +01:00
css Switch to textarea to enable configuration of multiple DNs 2013-01-03 14:07:01 +01:00
js LDAP: settings Advanced tab has grown too long by far. Structure it using accordion 2013-02-01 23:48:22 +01:00
l10n Merge branch 'master' into files_encryption 2013-05-01 09:31:26 +02:00
lib LDAP: avoid irritating log output 2013-03-19 14:40:30 +01:00
templates LDAP: move more settings stuff to template file 2013-03-06 08:26:33 +01:00
tests drop SimpleTest compatibility 2013-01-24 16:47:17 +01:00
group_ldap.php Typo, fixes #2690 2013-04-03 17:52:34 +02:00
group_proxy.php LDAP: reset user/group-config association only after exists-check, may performance in some cases 2013-04-23 01:00:27 +02:00
settings.php LDAP: move more settings stuff to template file 2013-03-06 08:26:33 +01:00
user_ldap.php LDAP: user exists check on getHome, otherwise check will be performed with wrong configs on a multi LDAP server setup. 2013-03-19 14:40:36 +01:00
user_proxy.php LDAP: reset user/group-config association only after exists-check, may performance in some cases 2013-04-23 01:00:27 +02:00