diff --git a/app/views/projects/_project_member_list.html.erb b/app/views/projects/_project_member_list.html.erb index 72dd4ded2..fbaa837ac 100644 --- a/app/views/projects/_project_member_list.html.erb +++ b/app/views/projects/_project_member_list.html.erb @@ -8,8 +8,12 @@ <a href="javascript:" class="st_img"> <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32)) %> </a> + <span class="fr ml10 c_grey"><%= l(:label_user_for_project_grade) %>:<span class="c_orange"><%= format("%.2f" ,read_user_project_scores(member.user,@project)).to_i %></span></span> + <span class="fl ml10 c_grey"><%= l(:label_username)%></span> - <%= link_to(member.user.name, user_path(member.user),:class => "ml10 c_blue02") %> + <%= link_to(member.user.name, user_path(member.user),:class => "ml10 c_blue02") %>(<%= rolesToLanguage(member.roles.sort.collect(&:to_s)).join(', ') %>)<br/> + + <span class="fr c_grey"><%= format_date(member.created_on)%></span> </div> <div class="cl"></div> diff --git a/config/configuration.yml b/config/configuration.yml index a62cb590b..415d4b072 100644 --- a/config/configuration.yml +++ b/config/configuration.yml @@ -83,12 +83,12 @@ default: email_delivery: delivery_method: :smtp smtp_settings: - address: smtp.126.com + address: smtp.163.com port: 25 - domain: smtp.126.com + domain: smtp.163.com authentication: :plain - user_name: "alanlong9278@126.com" - password: 'alanlong8788786' + user_name: "huang.jingquan@163.com" + password: 'xinhu1ji2qu366' # Absolute path to the directory where attachments are stored. # The default is the 'files' directory in your Redmine instance.