You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2014/07/01 16:15:07 UTC
[1/2] git commit: [#6834] Made display of user just added to group on
User Permissions match display after page refresh
Repository: allura
Updated Branches:
refs/heads/master ab0ff8846 -> 8f51a1889
[#6834] Made display of user just added to group on User Permissions match display after page refresh
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/8f51a188
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/8f51a188
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/8f51a188
Branch: refs/heads/master
Commit: 8f51a1889ee807d4cf87867d68b4666c4ced0b8d
Parents: 751525b
Author: Cory Johns <jo...@gmail.com>
Authored: Sat Jun 28 21:42:21 2014 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Jul 1 14:14:54 2014 +0000
----------------------------------------------------------------------
Allura/allura/public/nf/js/project_groups.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/8f51a188/Allura/allura/public/nf/js/project_groups.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/project_groups.js b/Allura/allura/public/nf/js/project_groups.js
index da17b8b..a4c9ab9 100644
--- a/Allura/allura/public/nf/js/project_groups.js
+++ b/Allura/allura/public/nf/js/project_groups.js
@@ -85,7 +85,7 @@ $(function() {
}
else{
holder.attr('data-user', data.username).addClass('deleter');
- holder.html(perm_delete_ico+' '+data.displayname);
+ holder.html(perm_delete_ico+' '+data.displayname+' ('+data.username+')');
holder.children('b').click(delete_user);
}
});
[2/2] git commit: [#6834] Added missing minus icon class
Posted by br...@apache.org.
[#6834] Added missing minus icon class
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/751525b0
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/751525b0
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/751525b0
Branch: refs/heads/master
Commit: 751525b03c68a56eeb0ccd8bba09a680d7620182
Parents: ab0ff88
Author: Cory Johns <jo...@gmail.com>
Authored: Sat Jun 28 21:38:16 2014 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Jul 1 14:14:54 2014 +0000
----------------------------------------------------------------------
Allura/allura/nf/allura/css/allura.css | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/751525b0/Allura/allura/nf/allura/css/allura.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/allura.css b/Allura/allura/nf/allura/css/allura.css
index ddf27cc..b7579bf 100644
--- a/Allura/allura/nf/allura/css/allura.css
+++ b/Allura/allura/nf/allura/css/allura.css
@@ -45,6 +45,8 @@ b.ico.ico-pencil { background-position: -64px -112px; }
b.ico.ico-search { background-position: -160px -112px; }
b.ico.ico-admin { background-position: -192px -112px; }
b.ico.ico-plus { background-position: -16px -128px; }
+b.ico.ico-minus { background-position: -48px -128px; }
+b.ico.ico-minuscirc { background-position: -48px -128px; }
b.ico.ico-undelete { background-position: 0px -64px; }
b.ico.ico-delete { background-position: -80px -128px; }
b.ico.ico-help { background-position: -48px -144px; }