[software/adminpanel] 02/02: Merge branch 'master' of ssh://git.mageia.org/software/adminpanel

[root-odJJhXpcy38dnm+]

This is an automated email from the git hooks/post-receive script.

anaselli pushed a commit to branch master
in repository software/adminpanel.

commit d26eb6352e4bf90a8424eb2168b511d740f513c1
Merge: ef7e8c2 4bb4a6b
Author: Angelo Naselli <anaselli-***@public.gmane.org>
Date: Wed Mar 19 21:26:07 2014 +0100

Merge branch 'master' of ssh://git.mageia.org/software/adminpanel

MODULE_HACKING | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 113 insertions(+), 0 deletions(-)

[root-odJJhXpcy38dnm+]

This is an automated email from the git hooks/post-receive script.

anaselli pushed a commit to branch master
in repository software/adminpanel.

commit ef7e8c20bde02835dfc445c351111b79ceba042d
Author: Angelo Naselli <anaselli-***@public.gmane.org>
Date: Wed Mar 19 21:24:20 2014 +0100

Missed status column
---
Commit Link:
http://gitweb.mageia.org/software/adminpanel/commit/?id=ef7e8c20bde02835dfc445c351111b79ceba042d

lib/AdminPanel/Module/Users.pm | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lib/AdminPanel/Module/Users.pm b/lib/AdminPanel/Module/Users.pm
index 6061e11..92d2f65 100644
--- a/lib/AdminPanel/Module/Users.pm
+++ b/lib/AdminPanel/Module/Users.pm
@@ -1,4 +1,4 @@
-# vim: set et ts=4 sw=4:
+# vim: set et ts=4 sw=4:
#*****************************************************************************
#
# Copyright (c) 2013 Angelo Naselli <anaselli-***@public.gmane.org>
@@ -941,6 +941,7 @@ sub _createUserTable {
$yTableHeader->addColumn(N("Full Name"), $yui::YAlignBegin);
$yTableHeader->addColumn(N("Login Shell"), $yui::YAlignBegin);
$yTableHeader->addColumn(N("Home Directory"), $yui::YAlignBegin);
+ $yTableHeader->addColumn(N("Status"), $yui::YAlignBegin);
$yTableHeader->DISOWN();

$self->set_widget(table => $factory->createTable($parent, $yTableHeader));