Commit 1daf9d8e3e9377bbdba05f2330363b5b8a8f5574

Authored by Evandro Junior
2 parents 521668e8 9c6790e1

Merge branch 'staging' of gitlab.com:participa/noosfero into staging

* 'staging' of gitlab.com:participa/noosfero:
  updating gamification plugin
  display email in user list
app/views/users/_users_list.html.erb
@@ -11,11 +11,13 @@ @@ -11,11 +11,13 @@
11 </colgroup> 11 </colgroup>
12 <tr> 12 <tr>
13 <th><%= _('Member') %></th> 13 <th><%= _('Member') %></th>
  14 + <th><%= _('Email') %></th>
14 <th><%= _('Actions') %></th> 15 <th><%= _('Actions') %></th>
15 </tr> 16 </tr>
16 <% @collection.each do |p| %> 17 <% @collection.each do |p| %>
17 <tr title="<%= p.name %>"> 18 <tr title="<%= p.name %>">
18 <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td> 19 <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
  20 + <td><%= link_to_profile p.email, p.identifier, :title => p.email %> </td>
19 <td class='actions'> 21 <td class='actions'>
20 <div class="members-buttons-cell"> 22 <div class="members-buttons-cell">
21 <% if p.is_admin? %> 23 <% if p.is_admin? %>
plugins/gamification
1 -Subproject commit c584e1d2b6393e21a9bd1c163b0ccd7a8df728ea 1 +Subproject commit 97c7b22a9f1d8cec63f8c10d2e563874bbbb51cc