diff options
| author | Jonathan Sharp <forjsharp@gmail.com> | 2014-10-07 17:42:20 -0700 |
|---|---|---|
| committer | Jonathan Sharp <forjsharp@gmail.com> | 2014-10-07 17:42:20 -0700 |
| commit | 448d88877d877dcf0249b324c959268106794584 (patch) | |
| tree | 222303457f8046689bd999c1ba7d15e6233a7009 | |
| parent | af88382fbcfaddbf4dc5dbb7a6204a328e4dacb0 (diff) | |
| download | archiva-448d88877d877dcf0249b324c959268106794584.tar.gz archiva-448d88877d877dcf0249b324c959268106794584.zip | |
MRM-1810 removed properties filter, added i18n help content
2 files changed, 2 insertions, 2 deletions
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties index 6609be99d..fd6a5b91d 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties @@ -630,6 +630,8 @@ security.rememberme.path.help.content=Path for rememberme cookie. security.rememberme.secure.help.content=rememberme cookie secured. security.rememberme.domain.help.content=rememberme cookie domain. security.policy.unlockable.accounts.help.content=Non lockable accounts. +ldap.config.groups.class.help.content=The name of the objectClass in the ldap server used to identify groups. The default is groupOfUniqueNames. +ldap.config.groups.member.help.content=The name of the attribute on a group that contains the user DN of group members. The default is uniqueMember. ldap.config.mapper.attribute.fullname.help.content=The name of the attribute on a user that contains the users fullName. security.policy.password.rule.characterlength.enabled.help.content=Character length password rule enabled. security.policy.password.rule.musthave.enabled.help.content=Password mandatory rule enabled. diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html index 1397b4eaf..08467d7fd 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html @@ -1269,8 +1269,6 @@ <tbody> {{each(i, row) itemsOnCurrentPage()}} {{var key = row.key}} - <!-- do not display mapped ldap groups as keys --> - {{if !key.startsWith('ldap.config.groups.')}} <tr> <td> <a class="popover-doc" |