You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/10/09 03:10:24 UTC
[1/2] git commit: MRM-1810 removed properties filter,
added i18n help content
Repository: archiva
Updated Branches:
refs/heads/master af88382fb -> f3ed08b69
MRM-1810 removed properties filter, added i18n help content
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/448d8887
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/448d8887
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/448d8887
Branch: refs/heads/master
Commit: 448d88877d877dcf0249b324c959268106794584
Parents: af88382
Author: Jonathan Sharp <fo...@gmail.com>
Authored: Tue Oct 7 17:42:20 2014 -0700
Committer: Jonathan Sharp <fo...@gmail.com>
Committed: Tue Oct 7 17:42:20 2014 -0700
----------------------------------------------------------------------
.../src/main/resources/org/apache/archiva/i18n/default.properties | 2 ++
.../src/main/webapp/js/templates/archiva/general-admin.html | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/448d8887/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
----------------------------------------------------------------------
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 6609be9..fd6a5b9 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.
http://git-wip-us.apache.org/repos/asf/archiva/blob/448d8887/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
----------------------------------------------------------------------
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 1397b4e..08467d7 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"
[2/2] git commit: MRM-1810 remove group filter
Posted by ol...@apache.org.
MRM-1810 remove group filter
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/f3ed08b6
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/f3ed08b6
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/f3ed08b6
Branch: refs/heads/master
Commit: f3ed08b69508570a3da0786df2546a957d679cd3
Parents: 448d888
Author: Jonathan Sharp <fo...@gmail.com>
Authored: Tue Oct 7 18:50:50 2014 -0700
Committer: Jonathan Sharp <fo...@gmail.com>
Committed: Tue Oct 7 18:50:50 2014 -0700
----------------------------------------------------------------------
.../src/main/webapp/js/templates/archiva/general-admin.html | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/f3ed08b6/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
----------------------------------------------------------------------
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 08467d7..4756519 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
@@ -1280,7 +1280,6 @@
<td>${row.key}</td>
<td><input type="text" class="input-xxlarge" data-bind="value: row.value"></td>
</tr>
- {{/if}}
{{/each}}
</tbody>