From f9cecbee5c3d64358607fcf3291118907ecd1136 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jul 2015 09:20:27 +0800
Subject: [PATCH 01/22] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=9B=9E=E5=A4=8D=E5=92=8C=E7=95=99=E8=A8=80=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_edit.html.erb | 2 +-
 config/locales/projects/zh.yml  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index e4c1290aa..8ae40623a 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -20,7 +20,7 @@
           <%= render :partial => 'history', :locals => {:issue => @issue, :journals => @journals} %>
         </div>
     <% end %>
-    <fieldset><legend>回复</legend>
+    <fieldset><legend><%= l(:label_project_issue_feedback) %></legend>
     <%= f.text_area :notes, :style => "width:99%;", :rows => "5", :no_label => true %>
     </fieldset>
     <!--<%# if @issue.safe_attribute? 'private_notes' %>-->
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 5bf8957bf..92e3cdc28 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -399,6 +399,7 @@ zh:
   label_issue_number: issue的数量
   label_issue_journal_number: issue的留言数量
   label_project_mail_feedback: 项目留言
+  label_project_issue_feedback: 留言
   
   label_news_score: 新闻得分
   label_new_number: 新闻的数量

From faf019b326d9bc4a4da6abb4b91fe6a4b525f0d9 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jul 2015 14:32:06 +0800
Subject: [PATCH 02/22] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=E7=BB=99=E5=87=BA=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/create.js.erb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/files/create.js.erb b/app/views/files/create.js.erb
index 87bf5b864..2d99941dd 100644
--- a/app/views/files/create.js.erb
+++ b/app/views/files/create.js.erb
@@ -21,9 +21,13 @@
 $("#attachments_fields").children().remove();
 $("#upload_file_count").text("未上传文件");
 $('#upload_file_div').slideToggle('slow');
-  <% if @project%>
+  <% if @project %>
     closeModal();
     $("#resource_list").html('<%= j(render partial:  "project_file_new" ,locals: {project: @project}) %>');
+//    添加文件上传成功提示,
+    var div = $('<div id="addBox">文件上传成功！</div>');
+    $("#course_list").prepend(div);
+    setTimeout( function(){div.remove();},30000)
   <%elsif  @course%>
     closeModal();
     $("#resource_list").html('<%= j(render partial:  "course_file" ,locals: {course: @course}) %>');

From 288cc5397e0fa3e834ab10b1be80eeb2df160978 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jul 2015 14:39:36 +0800
Subject: [PATCH 03/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8F=90=E9=86=92=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/create.js.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/files/create.js.erb b/app/views/files/create.js.erb
index 2d99941dd..6abbeeb44 100644
--- a/app/views/files/create.js.erb
+++ b/app/views/files/create.js.erb
@@ -25,9 +25,9 @@ $('#upload_file_div').slideToggle('slow');
     closeModal();
     $("#resource_list").html('<%= j(render partial:  "project_file_new" ,locals: {project: @project}) %>');
 //    添加文件上传成功提示,
-    var div = $('<div id="addBox">文件上传成功！</div>');
+    var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
     $("#course_list").prepend(div);
-    setTimeout( function(){div.remove();},30000)
+    setTimeout( function(){div.remove();},3000)
   <%elsif  @course%>
     closeModal();
     $("#resource_list").html('<%= j(render partial:  "course_file" ,locals: {course: @course}) %>');

From ea139128524725f950c08081f55fa72c4772aa85 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jul 2015 14:56:44 +0800
Subject: [PATCH 04/22] =?UTF-8?q?=E8=A7=A3=E5=86=B3issue=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=B7=AE=E5=88=AB=E7=82=B9=E5=87=BB=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=90=8E=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/journals/diff.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/journals/diff.html.erb b/app/views/journals/diff.html.erb
index 5bc823c76..190459b71 100644
--- a/app/views/journals/diff.html.erb
+++ b/app/views/journals/diff.html.erb
@@ -1,5 +1,5 @@
 <h3><%=h @issue.tracker %> #<%= @issue.id %></h3>
-<p><%= authoring @journal.created_on, @journal.user, :label => :label_updated_time_by %></p>
+<p>由<%= @journal.user %> 更新于 <%= format_time @journal.created_on %></p>
 
 <div class="text-diff">
   <%= simple_format_without_paragraph @diff.to_html %>

From c0b3e27c1b382a3d40e197bbc799716400ac300a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jul 2015 15:02:05 +0800
Subject: [PATCH 05/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=88=90=E5=8A=9F=E6=8F=90?=
 =?UTF-8?q?=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/create.js.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/files/create.js.erb b/app/views/files/create.js.erb
index 6abbeeb44..07d0c06f2 100644
--- a/app/views/files/create.js.erb
+++ b/app/views/files/create.js.erb
@@ -33,6 +33,10 @@ $('#upload_file_div').slideToggle('slow');
     $("#resource_list").html('<%= j(render partial:  "course_file" ,locals: {course: @course}) %>');
     $("#courses_files_count_info").html("<%= @all_attachments.count%>");
     $("#courses_files_count_nav").html("(<%= @all_attachments.count%>)")
+    //    添加文件上传成功提示,
+    var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+    $("#course_list").prepend(div);
+    setTimeout( function(){div.remove();},3000)
   <% end %>
 <% end %>
 $(document).ready(img_thumbnails);

From 081a0cedf7aafcb386fa48dd0aa0e9879f96a087 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jul 2015 15:16:07 +0800
Subject: [PATCH 06/22] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=88=97=E8=A1=A8=E4=B8=AD=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?atom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/search.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/search.html.erb b/app/views/projects/search.html.erb
index ccffce775..fedc9f846 100644
--- a/app/views/projects/search.html.erb
+++ b/app/views/projects/search.html.erb
@@ -116,9 +116,9 @@
 </p>
 <% end %>
 
-<% other_formats_links do |f| %>
-<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
-<% end %>
+<%# other_formats_links do |f| %>
+<%#= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+<%# end %>
 
 <% content_for :sidebar do %>
 <%= form_tag({}, :method => :get) do %>

From 5a950b227abe29ead41166e2b9e143b6d8f6bbb7 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jul 2015 15:53:12 +0800
Subject: [PATCH 07/22] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E3=80=81=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E6=97=B6=E7=BB=99=E5=87=BA=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/create.js.erb | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/views/files/create.js.erb b/app/views/files/create.js.erb
index 07d0c06f2..a7e92ca2f 100644
--- a/app/views/files/create.js.erb
+++ b/app/views/files/create.js.erb
@@ -25,16 +25,25 @@ $('#upload_file_div').slideToggle('slow');
     closeModal();
     $("#resource_list").html('<%= j(render partial:  "project_file_new" ,locals: {project: @project}) %>');
 //    添加文件上传成功提示,
-    var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
-    $("#course_list").prepend(div);
-    setTimeout( function(){div.remove();},3000)
+    <% if params[:attachments].nil? %>
+        var div = $('<div id="addBox" class="flash warning">您上传了一个空文件！</div>');
+    <% else %>
+        var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+
+    <% end %>
+        $("#course_list").prepend(div);
+        setTimeout( function(){div.remove();},3000)
   <%elsif  @course%>
     closeModal();
     $("#resource_list").html('<%= j(render partial:  "course_file" ,locals: {course: @course}) %>');
     $("#courses_files_count_info").html("<%= @all_attachments.count%>");
     $("#courses_files_count_nav").html("(<%= @all_attachments.count%>)")
     //    添加文件上传成功提示,
-    var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+    <% if params[:attachments].nil? %>
+        var div = $('<div id="addBox" class="flash warning">您上传了一个空文件！</div>');
+    <% else %>
+        var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+    <% end %>
     $("#course_list").prepend(div);
     setTimeout( function(){div.remove();},3000)
   <% end %>

From a3070e06e89bec8bd378d2b2b3aac28ab34b4831 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jul 2015 16:03:06 +0800
Subject: [PATCH 08/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E7=A9=BA=E6=96=87=E4=BB=B6=E4=B8=8D=E7=BB=99=E5=87=BA?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/create.js.erb | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/views/files/create.js.erb b/app/views/files/create.js.erb
index a7e92ca2f..a1c278a7a 100644
--- a/app/views/files/create.js.erb
+++ b/app/views/files/create.js.erb
@@ -24,28 +24,23 @@ $('#upload_file_div').slideToggle('slow');
   <% if @project %>
     closeModal();
     $("#resource_list").html('<%= j(render partial:  "project_file_new" ,locals: {project: @project}) %>');
-//    添加文件上传成功提示,
-    <% if params[:attachments].nil? %>
-        var div = $('<div id="addBox" class="flash warning">您上传了一个空文件！</div>');
-    <% else %>
+//    添加文件上传成功提示
+    <% unless params[:attachments].nil? %>
         var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
-
-    <% end %>
         $("#course_list").prepend(div);
         setTimeout( function(){div.remove();},3000)
+    <% end %>
   <%elsif  @course%>
     closeModal();
     $("#resource_list").html('<%= j(render partial:  "course_file" ,locals: {course: @course}) %>');
     $("#courses_files_count_info").html("<%= @all_attachments.count%>");
     $("#courses_files_count_nav").html("(<%= @all_attachments.count%>)")
     //    添加文件上传成功提示,
-    <% if params[:attachments].nil? %>
-        var div = $('<div id="addBox" class="flash warning">您上传了一个空文件！</div>');
-    <% else %>
+    <% unless params[:attachments].nil? %>
         var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+        $("#course_list").prepend(div);
+        setTimeout( function(){div.remove();},3000)
     <% end %>
-    $("#course_list").prepend(div);
-    setTimeout( function(){div.remove();},3000)
   <% end %>
 <% end %>
 $(document).ready(img_thumbnails);

From def0e892af837734af40624cbb3a71c7aa63d585 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jul 2015 16:38:28 +0800
Subject: [PATCH 09/22] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E8=B4=B4=E5=90=A7=E5=8F=91=E5=B8=83=E5=86=85=E5=AE=B9=E8=BF=87?=
 =?UTF-8?q?=E9=95=BF500=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/memo.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/memo.rb b/app/models/memo.rb
index 2831effe3..e0abaa19f 100644
--- a/app/models/memo.rb
+++ b/app/models/memo.rb
@@ -9,7 +9,7 @@ class Memo < ActiveRecord::Base
 	# 若是主题帖，则内容可以是空
 	#validates :content, presence: true, if: Proc.new{|o| !o.parent_id.nil? }
 	validates_length_of :subject, maximum: 50
-	#validates_length_of :content, maximum: 3072
+	validates_length_of :content, maximum: 5000
 	validate :cannot_reply_to_locked_topic, :on => :create
 
 	acts_as_tree :counter_cache => :replies_count, :order => "#{Memo.table_name}.created_at ASC"

From f3e71450ee62064cc1c0348e3b6fd8235e656ba2 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jul 2015 17:20:09 +0800
Subject: [PATCH 10/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9issue=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=9C=A8IE=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=8B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_list.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 616e205c4..0fcb37021 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -11,7 +11,7 @@
             <div class="problem_txt fl">
                 <%= link_to issue.author.name, user_path(issue.author), :class => "problem_name c_orange fl" %>
                 <span class="fl"><%= l(:label_post_on_issue) %>(<%= "#{raw column_content[2]}" %>)：</span>
-              <div class="problem_tit_div fl">
+              <div class="problem_tit_div fl break_word">
                 <%=link_to "#{column_content[4]}<span class = '#{get_issue_type(column_content[1])[0]}'>#{get_issue_type(column_content[1])[1]}</span>".html_safe, issue_path(issue.id), :class => "problem_tit_a break_word",:target => "_blank" %>
               </div>
               <div class="cl"></div>

From b16e19096f7d0e6725de18948f39a527e2fd0091 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jul 2015 10:25:21 +0800
Subject: [PATCH 11/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E9=97=BB?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/news/_course_news.html.erb  | 1 +
 app/views/news/_project_news.html.erb | 3 ++-
 public/stylesheets/courses.css        | 1 +
 public/stylesheets/project.css        | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/news/_course_news.html.erb b/app/views/news/_course_news.html.erb
index 28eb5c805..4d6328c48 100644
--- a/app/views/news/_course_news.html.erb
+++ b/app/views/news/_course_news.html.erb
@@ -34,6 +34,7 @@
                 <%= l(:label_release_news) %>：
               </span>
               <%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %>
+              <%=link_to "<span class = 'pic_mes'>#{news.comments.all.count}</span>".html_safe, news_path(news.id), :class => "pro_mes_w" %>
               <br />
               <div class="cl mb5"></div>
               <script>
diff --git a/app/views/news/_project_news.html.erb b/app/views/news/_project_news.html.erb
index 7b6a16e38..04fdb6dac 100644
--- a/app/views/news/_project_news.html.erb
+++ b/app/views/news/_project_news.html.erb
@@ -27,7 +27,8 @@
             <%= link_to image_tag(url_to_avatar(news.author),:width => 42,:height => 42), user_path(news.author), :class => "problem_pic fl" %>
             <div class="problem_txt fl mt5">
               <%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %>
-              <span class="fl"> <%= l(:label_add_news) %>：</span><%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %><br />
+              <span class="fl"> <%= l(:label_add_news) %>：</span><%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %>
+              <%=link_to "<span class = 'pic_mes'>#{news.comments.all.count}</span>".html_safe, news_path(news.id), :class => "pro_mes_w_news" %><br />
               <div class="cl mb5"></div>
               <p  id="news_description_<%= news.id %>" class="mt5 break_word"><%=textAreailizable news.description %><br /> </p>
               <div class="news_foot" style="display: none;" onclick="news_show_more_des(<%= news.id %>);" id="news_foot_<%= news.id %>"><%= l(:label_expend_information) %> <span class="g-arr-down"><img src="/images/jiantou.jpg" width="12" height="6" /></span></div>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 0bd28bea7..348878759 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -52,6 +52,7 @@ a:hover.problem_pic{border:1px solid #64bdd9;}
 a.problem_name{ color:#ff5722;max-width:60px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
 a:hover.problem_name{ color:#d33503;}
 a.problem_tit{ color:#0781b4; max-width:410px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+a.pro_mes_w{ height:20px; float:right;display:block; color:#999999;}
 a:hover.problem_tit{ color:#09658c; }
 .problem_main{ border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
 /****翻页***/
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 38c263579..5574dc82a 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -84,6 +84,7 @@ a:hover.problem_tit,a:hover.problem_tit02{ color:#09658c; }
 .problem_main{ border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
 a.pro_mes{ float:left; color:#a0a0a0; display:block; width:100px; height:20px;  }
 a.pro_mes_w{ height:20px; float:left;display:block; color:#999999;}
+a.pro_mes_w_news{ height:20px; float:right;display:block; color:#999999;}
 
 .pro_page_top{ font-size:14px; border-bottom:2px solid #64bdd9; margin-bottom:10px; padding-bottom:5px;}
 .pro_page_tit{color:#3e4040;  font-weight:bold;width:480px; float:left; font-size:14px; margin-bottom:5px;}

From fe55258349e6cdee4c906e16b604ea203da34a7f Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 3 Jul 2015 12:22:33 +0800
Subject: [PATCH 12/22] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8C=BF=E8=AF=84?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E8=A7=A3=E9=87=8A=20api=20=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E5=8C=BF=E8=AF=84=20api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/courses.rb      | 13 ++++++++
 app/api/mobile/entities/homework.rb |  5 ++-
 app/helpers/api_helper.rb           | 30 +++++++++++++++++-
 app/services/courses_service.rb     | 47 ++++++++++++++++++++++++++---
 4 files changed, 88 insertions(+), 7 deletions(-)

diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index 0d34cecaf..3d05ab3f3 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -336,6 +336,19 @@ module Mobile
           student_works = cs.student_work_list params,current_user
           present :data,student_works.all,with:Mobile::Entities::StudentWork
         end
+
+        desc '开启匿评'
+        params do
+          requires :token,type:String
+          requires :course_id,type:Integer,desc:'课程id'
+          requires :homework_id,type:Integer,desc:'作业id'
+        end
+        get ':course_id/start_anonymous_comment' do
+          cs = CoursesService.new
+          status = cs.start_anonymous_comment params,current_user
+          present :data,status
+          present :status,0
+        end
       end
     end
   end
diff --git a/app/api/mobile/entities/homework.rb b/app/api/mobile/entities/homework.rb
index 2ea9404b8..e78689bfb 100644
--- a/app/api/mobile/entities/homework.rb
+++ b/app/api/mobile/entities/homework.rb
@@ -28,6 +28,8 @@ module Mobile
                     get_homework_status f
                   when :homework_times
                     f.course.homework_commons.index(f) + 1
+                  when :homework_status_desc
+                    homework_status_desc f
                 end
             end
           end
@@ -80,7 +82,8 @@ module Mobile
       expose :submit_student_list ,using: Mobile::Entities::User do |f,opt|
         get_submit_sutdent_list f
       end
-      homework_expose :homework_status
+      homework_expose :homework_status       #作业的状态
+      homework_expose :homework_status_desc  #状态的解释
 
     end
   end
diff --git a/app/helpers/api_helper.rb b/app/helpers/api_helper.rb
index 916383b05..6c17f8566 100644
--- a/app/helpers/api_helper.rb
+++ b/app/helpers/api_helper.rb
@@ -89,6 +89,29 @@ module ApiHelper
     homework_status
   end
 
+  #获取作业的是否可以匿评的描述
+  def homework_status_desc homework
+    if homework.homework_type == 1 && homework.homework_detail_manual #匿评作业
+      if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+        link = "<span class='fr mr10 pr_join_span ' title='作业截止日期之前不可以启动匿评'>启动匿评</span>".html_safe
+      elsif homework.student_works.count >= 2 #作业份数大于2
+        case homework.homework_detail_manual.comment_status
+          when 1
+            link =  '启动匿评'
+          when 2
+            link =  '关闭匿评'
+          when 3
+            link = " 匿评结束"
+        end
+      else
+        link = "学生提交作业数大于2时才可以启动匿评"
+      end
+    else
+      link = "未开启匿评作业不可以启动匿评"
+    end
+    link
+  end
+
   #获取
   def get_submit_sutdent_list homework
     studentlist = []
@@ -104,6 +127,11 @@ module ApiHelper
 
   #计算作业的截止日期，剩余日期
   def show_homework_deadline homework
-    "距作业截止还有" << (Date.parse(Time.now.to_s) - Date.parse(homework.end_time.to_s)).to_i.to_s << "天"
+   day = 0
+    if (day = (Date.parse(homework.end_time.to_s) - Date.parse(Time.now.to_s)).to_i) > 0
+      "距作业截止还有" << (Date.parse(Time.now.to_s) - Date.parse(homework.end_time.to_s)).to_i.to_s << "天"
+    else
+      "已截止，但可补交"
+    end
   end
 end
\ No newline at end of file
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index b77703a37..81cf339dd 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -651,9 +651,9 @@ class CoursesService
       return
     end
     if current_user == @user || current_user.admin?
-      membership = @user.coursememberships.page(1).per(10)
+      membership = @user.coursememberships.page(1).per(15)
     else
-      membership = @user.coursememberships.page(1).per(10).all(:conditions => Course.visible_condition(current_user))
+      membership = @user.coursememberships.page(1).per(15).all(:conditions => Course.visible_condition(current_user))
     end
     if membership.nil? || membership.count == 0
       raise l(:label_no_courses, :locale => get_user_language(current_user))
@@ -669,10 +669,11 @@ class CoursesService
       dynamics_count = 0
       # 课程学霸 学生总分数排名靠前的5个人
       homework_count = course.homework_commons.count
-      unless homework_count == 0
-         sql = "select users.*,sum(IFNULL(0,student_works.final_score))/#{homework_count} score from student_works left outer join users on student_works.user_id = users.id" <<
+      sql = "select users.*,sum(IFNULL(0,student_works.final_score))/#{homework_count} score from student_works left outer join users on student_works.user_id = users.id" <<
          " where  homework_common_id in ( select id from homework_commons where homework_commons.course_id = #{course.id}) GROUP BY student_works.user_id ORDER BY score limit 0,6"
-         latest_course_dynamics <<{:type=> 6,:time=>Time.now.to_s,:count=> 6,:better_students=> User.find_by_sql(sql)}
+      better_students = User.find_by_sql(sql)
+      if homework_count != 0  &&  !better_students.empty?
+         latest_course_dynamics <<{:type=> 6,:time=>Time.now.to_s,:count=> 6,:better_students=> better_students}
          dynamics_count += 1
       end
       # 课程通知
@@ -754,5 +755,41 @@ class CoursesService
     student_works
   end
 
+  # 开启匿评
+  #statue 1:启动成功，2：启动失败，作业总数大于等于2份时才能启动匿评，3:已开启匿评，请务重复开启,4:没有开启匿评的权限
+  def start_anonymous_comment params,current_user
+    homework = HomeworkCommon.find(params[:homework_id])
+    return {:status=>4}  unless current_user.admin? || current_user.allowed_to?(:as_teacher,Course.find(params[:course_id]))
+    return {:status=>5}   if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+    homework_detail_manual = homework.homework_detail_manual
+    if homework_detail_manual.comment_status == 1
+      student_works = homework.student_works
+      if student_works && student_works.size >=2
+        student_works.each_with_index do |work, index|
+          user = work.user
+          n = homework_detail_manual.evaluation_num
+          n = n < student_works.size ? n : student_works.size - 1
+          assigned_homeworks = get_assigned_homeworks(student_works, n, index)
+          assigned_homeworks.each do |h|
+            student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: user.id, student_work_id: h.id)
+            student_works_evaluation_distributions.save
+          end
+        end
+        homework_detail_manual.update_column('comment_status', 2)
+        statue = 1
+      else
+        statue = 2
+      end
+    else
+      statue = 3
+    end
+    {:status => statue}
+  end
+
+  def get_assigned_homeworks(student_works, n, index)
+    student_works += student_works
+    student_works[index + 1 .. index + n]
+  end
+
 end
 

From 17280e78abf47b7f8799244a3c6cf79200801521 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jul 2015 15:00:15 +0800
Subject: [PATCH 13/22] =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/journals_controller.rb |  2 +-
 app/views/journals/new.js.erb          |  6 +++---
 config/configuration.yml               | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index d8cd8eeec..6cebfef7a 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -74,7 +74,7 @@ class JournalsController < ApplicationController
     text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]')
     @content = "> #{ll(Setting.default_language, :text_user_wrote, user)}\n> "
     @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
-    @content = "<blockquote style='word-break: break-all;word-wrap: break-word;'>" << @content
+    # @content = "<blockquote style='word-break: break-all;word-wrap: break-word;'>" << @content
     @id = user.id
   rescue ActiveRecord::RecordNotFound
     render_404
diff --git a/app/views/journals/new.js.erb b/app/views/journals/new.js.erb
index d02568426..ae2574595 100644
--- a/app/views/journals/new.js.erb
+++ b/app/views/journals/new.js.erb
@@ -1,11 +1,11 @@
-$('#journal_issue_note').html("<%= raw escape_javascript(@content.html_safe) %>");
-$("input[name='issue_quote_new']").val("<%= raw escape_javascript(@content.html_safe) %>");
+$('#issue_notes').val("<%= raw escape_javascript(@content) %>");
 <%
   # when quoting a private journal, check the private checkbox
-  if @journal && @journal.private_notes?
+  if @journal && @journal.private_notes? 
 %>
 $('#issue_private_notes').attr('checked', true);
 <% end %>
+
 showAndScrollTo("update", "notes");
 $('#notes').scrollTop = $('#notes').scrollHeight - $('#notes').clientHeight;
 
diff --git a/config/configuration.yml b/config/configuration.yml
index 390754a87..111efc8b4 100644
--- a/config/configuration.yml
+++ b/config/configuration.yml
@@ -103,7 +103,7 @@ default:
   # autologin_cookie_name: the name of the cookie (default: autologin)
   # autologin_cookie_path: the cookie path (default: /)
   # autologin_cookie_secure: true sets the cookie secure flag (default: false)
-  autologin_cookie_name: "autologin_trustie"
+  autologin_cookie_name:
   autologin_cookie_path:
   autologin_cookie_secure:
 
@@ -200,7 +200,7 @@ default:
 # specific configuration options for production environment
 # that overrides the default ones
 production:
-  cookie_domain: ".trustie.net"
+  # CJK support
   rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
   email_delivery:
     delivery_method: :smtp
@@ -218,9 +218,9 @@ development:
   email_delivery:
     delivery_method: :smtp
     smtp_settings:
-      address: mail.trustie.net
+      address: smtp.163.com
       port: 25
-      domain: mail.trustie.net
-      authentication: :login
-      user_name: "mail@trustie.net"
-      password: "loong2010"
+      domain: smtp.163.com
+      authentication: :plain
+      user_name: huang.jingquan@163.com
+      password: 'xinhu1ji2qu366'

From 0a0f5d98dbe413900f5006d137565404c6832353 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Fri, 3 Jul 2015 15:03:53 +0800
Subject: [PATCH 14/22] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81=20?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=20=E4=B8=8E=E6=88=91=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity_notifys_controller.rb            |  1 +
 app/controllers/comments_controller.rb        | 14 +++++++++++++
 app/controllers/news_controller.rb            | 15 +++++++++++++
 app/models/comment.rb                         | 21 +++++++++++++++++++
 app/models/news.rb                            | 15 +++++++++++++
 5 files changed, 66 insertions(+)

diff --git a/app/controllers/activity_notifys_controller.rb b/app/controllers/activity_notifys_controller.rb
index 01e4260ea..ad9818fcc 100644
--- a/app/controllers/activity_notifys_controller.rb
+++ b/app/controllers/activity_notifys_controller.rb
@@ -6,6 +6,7 @@ class ActivityNotifysController < ApplicationController
 #  accept_rss_auth :index, :show
 
   helper :activities
+  helper :attachments
   def index
     query = nil
     if @course
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index d226000c0..c10f8bc84 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -34,6 +34,20 @@ class CommentsController < ApplicationController
         ids = params[:asset_id].split(',')
         update_kindeditor_assets_owner ids,@comment.id,OwnerTypeHelper::COMMENT
       end
+      # ������ض�̬�ļ�¼add start
+      if( @comment.id && @news.course )
+        if(@news.author_id != User.current.id)
+          notify = ActivityNotify.new()
+          notify.activity_container_id = @news.course.id
+          notify.activity_container_type = 'Course'
+          notify.activity_id = @comment.id
+          notify.activity_type = 'Comment'
+          notify.notify_to = @news.author_id
+          notify.is_read = 0
+          notify.save()
+        end
+      end
+      # ������ض�̬�ļ�¼add end
       flash[:notice] = l(:label_comment_added)
     end
 
diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index f71a77ca7..56b4a30fc 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -141,6 +141,21 @@ class NewsController < ApplicationController
           ids = params[:asset_id].split(',')
           update_kindeditor_assets_owner ids,@news.id,OwnerTypeHelper::NEWS
         end
+        # ������ض�̬�ļ�¼add start
+        teachers = searchTeacherAndAssistant(@course)
+        for teacher in teachers
+          if(teacher.user_id != User.current.id)
+            notify = ActivityNotify.new()
+            notify.activity_container_id = @course.id
+            notify.activity_container_type = 'Course'
+            notify.activity_id = @news.id
+            notify.activity_type = 'News'
+            notify.notify_to = teacher.user_id
+            notify.is_read = 0
+            notify.save()
+          end
+        end
+        # ������ض�̬�ļ�¼add end
         render_attachment_warning_if_needed(@news)
         flash[:notice] = l(:notice_successful_create)
         redirect_to course_news_index_url(@course)
diff --git a/app/models/comment.rb b/app/models/comment.rb
index bdb642d3c..a4842a23f 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -19,6 +19,14 @@ class Comment < ActiveRecord::Base
   include Redmine::SafeAttributes
   include ApplicationHelper
   has_many_kindeditor_assets :assets, :dependent => :destroy
+
+  has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
+  acts_as_event :datetime => :updated_on,
+                :description => :comments,
+                :type => 'news',
+                :title=>Proc.new {|o| "RE: #{o.commented.title}" },
+                :url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.commented.id} }
+
   belongs_to :commented, :polymorphic => true, :counter_cache => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
   validates_presence_of :commented, :author, :comments
@@ -38,4 +46,17 @@ class Comment < ActiveRecord::Base
   def delete_kindeditor_assets
     delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::COMMENT
   end
+
+  def set_notify_id(notify_id)
+    @notify_id= notify_id
+  end
+  def get_notify_id()
+    return @notify_id
+  end
+  def set_notify_is_read(notify_is_read)
+    @notify_is_read = notify_is_read
+  end
+  def get_notify_is_read()
+    return @notify_is_read
+  end
 end
diff --git a/app/models/news.rb b/app/models/news.rb
index 7e809cbfd..7d33d760e 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -30,6 +30,8 @@ class News < ActiveRecord::Base
   has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
   # end
 
+  has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
+
   validates_presence_of :title, :description
   validates_length_of :title, :maximum => 60
   validates_length_of :summary, :maximum => 255
@@ -85,6 +87,19 @@ class News < ActiveRecord::Base
     #description
   end
 
+  def set_notify_id(notify_id)
+    @notify_id= notify_id
+  end
+  def get_notify_id()
+    return @notify_id
+  end
+  def set_notify_is_read(notify_is_read)
+    @notify_is_read = notify_is_read
+  end
+  def get_notify_is_read()
+    return @notify_is_read
+  end
+
   private
 
   def add_author_as_watcher

From d882a3c5eea306a54e220eb232a7fd15d29614df Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Fri, 3 Jul 2015 15:20:53 +0800
Subject: [PATCH 15/22] =?UTF-8?q?bug#2948:=E5=9C=A8=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=92=8C=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=8C=E8=A2=AB=E7=95=99=E8=A8=80=E7=9A=84=E4=BA=BA=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E8=83=BD=E7=9C=8B=E5=88=B0=E7=95=99=E8=A8=80=E4=BA=BA?=
 =?UTF-8?q?=E7=9A=84=E6=98=B5=E7=A7=B0=E5=92=8C=E7=9C=9F=E5=AE=9E=E5=A7=93?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_history.html.erb           | 2 +-
 app/views/users/_history.html.erb             | 2 +-
 app/views/words/_journal_reply_items.html.erb | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb
index e9639f4f0..043bac947 100644
--- a/app/views/courses/_history.html.erb
+++ b/app/views/courses/_history.html.erb
@@ -9,7 +9,7 @@
                 <div class="ping_distop">
                   <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
                   <span>
-                    <%= link_to journal.user.show_name, user_path(journal.user),:class => 'c_blue fb fl mb10', :target => "_blank"%>
+                    <%= link_to "#{journal.user.show_name}(#{journal.user.login})", user_path(journal.user),:class => 'c_blue fb fl mb10', :target => "_blank"%>
                   </span>
                   <span class="c_grey fr">
                     <%= format_time(journal.created_on) %>
diff --git a/app/views/users/_history.html.erb b/app/views/users/_history.html.erb
index d69b6b25b..a87c2d8e4 100644
--- a/app/views/users/_history.html.erb
+++ b/app/views/users/_history.html.erb
@@ -9,7 +9,7 @@
               <div class="ping_discon" style="width: 85%;">
                 <div class="ping_distop">
                   <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
-                  <span><%= link_to journal.user, user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= format_time(journal.created_on) %></span>
+                  <span><%= link_to "#{journal.user.show_name}(#{journal.user.login})", user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= format_time(journal.created_on) %></span>
                   <div class="cl"></div>
                   <!--<p><%#= textilizable journal.notes%></p>-->
                   <p><%=journal.notes.html_safe%></p>
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index f93254218..5e9d6ef46 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -13,10 +13,10 @@
       </div>
       <div class="recall_con">
         <% id = 'project_respond_form_'+ reply.id.to_s %>
-        <%= link_to reply.user.show_name, user_path(reply.user) %>
+        <%= link_to "#{reply.user.show_name}(#{reply.user.login})", user_path(reply.user) %>
         <%= l(:label_reply_to)%>
         <% if show_name %>
-            <%= link_to parent_jour.user.show_name, user_path(parent_jour.user) %>
+            <%= link_to "#{parent_jour.user.show_name}(#{parent_jour.user.login})", user_path(parent_jour.user) %>
         <% else %>
             <%= l(:label_anonymous) %>
         <% end %>

From f8a35d2f9702c90a42b4c48670e59a7a10b7e414 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jul 2015 15:22:24 +0800
Subject: [PATCH 16/22] =?UTF-8?q?=E9=82=AE=E4=BB=B6=EF=BC=9A=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E6=8C=89=E9=A1=B9=E7=9B=AE=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 0d0b82752..4981d12f1 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -104,7 +104,7 @@ class Mailer < ActionMailer::Base
 
     # 查询user的缺陷，项目中成员都能收到
     sql = "select DISTINCT * from members m, issues i where i.project_id = m.project_id and m.user_id='#{user.id}'
-     and (i.updated_on between '#{date_from}' and '#{date_to}') order by i.updated_on desc"
+     and (i.updated_on between '#{date_from}' and '#{date_to}') order by i.project_id, i.updated_on desc"
     @issues = Issue.find_by_sql(sql)
 
     # issue回复
@@ -125,7 +125,7 @@ class Mailer < ActionMailer::Base
         @bids += bids if bids.count > 0
         @attachments += attachments if attachments.count > 0
       end
-      @bids.sort {|a, b| a.created_at <=> b.created_at}
+      @bids  = @bids.sort_by { |obj| obj.created_at }
     end
 
     # 项目附件

From 5c648c9284a709a2d7c02aa877101648d592c14a Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 3 Jul 2015 15:32:57 +0800
Subject: [PATCH 17/22] =?UTF-8?q?Attachment=E6=B7=BB=E5=8A=A0file=5Fdir=20?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/attachment.rb |  8 +++++---
 app/services/courses_service.rb       | 19 +++++--------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/app/api/mobile/entities/attachment.rb b/app/api/mobile/entities/attachment.rb
index b7424fac9..bb67b6d28 100644
--- a/app/api/mobile/entities/attachment.rb
+++ b/app/api/mobile/entities/attachment.rb
@@ -14,9 +14,10 @@ module Mobile
                 f.send(field)
               end
             else
-              #case field
-              #  when ""
-              #end
+              case field
+                when :file_dir
+                  "attachments/download/" << f.send(:id).to_s << '/'
+              end
             end
           end
         end
@@ -27,6 +28,7 @@ module Mobile
       attachment_expose :downloads
       attachment_expose :quotes
       attachment_expose :created_on
+      attachment_expose :file_dir
     end
   end
 end
\ No newline at end of file
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 81cf339dd..7efe76b3a 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -434,24 +434,15 @@ class CoursesService
    # 课程课件
    def course_attachments params
      result = []
-     @course = Course.find(params[:course_id])
-     @attachments = @course.attachments.order("created_on desc")
+     course = Course.find(params[:course_id])
+     attachments = course.attachments.order("created_on ")
      if !params[:name].nil? && params[:name] != ""
-       @attachments.each do |atta|
-         result << {:filename => atta.filename,
-                    :description => atta.description,
-                    :downloads => atta.downloads,
-                    :quotes => atta.quotes.nil? ? 0 :atta.quotes  } if atta.filename.include?(params[:name])
+       attachments.each do |atta|
+         result << atta if atta.filename.include?(params[:name])
 
        end
      else
-       @attachments.each do |atta|
-         result << {:filename => atta.filename,
-                    :description => atta.description,
-                    :downloads => atta.downloads,
-                    :quotes => atta.quotes.nil? ? 0 :atta.quotes  }
-
-       end
+       result = attachments
      end
      result
    end

From b5badbd25f5691dc12f53b9af6e9270f22325a63 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jul 2015 15:33:22 +0800
Subject: [PATCH 18/22] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=AD=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E9=80=9A=E7=9F=A5=E6=8C=89=E9=A1=B9=E7=9B=AE=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 4981d12f1..507ead3b1 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -110,7 +110,7 @@ class Mailer < ActionMailer::Base
     # issue回复
     @issues_journals = Journal.find_by_sql("select j.* from journals j, members m, projects p, issues i
      where m.user_id = '#{user.id}' and p.id = m.project_id and i.project_id = p.id and j.journalized_id = i.id
-     and j.journalized_type='Issue' and (j.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+     and j.journalized_type='Issue' and (j.created_on between '#{date_from}' and '#{date_to}') order by i.project_id, created_on desc")
 
     # @bids 查询课程作业，包括老师发布的作业，以及user提交作业
     # @attachments查询课程课件更新
@@ -130,7 +130,7 @@ class Mailer < ActionMailer::Base
 
     # 项目附件
     @project_attachments = Attachment.find_by_sql("select DISTINCT a.* from members m, attachments a
-     where a.container_id = m.project_id and m.user_id='#{user.id}' and container_type = 'Project' and (a.created_on between '#{date_from}' and '#{date_to}') order by a.created_on desc")
+     where a.container_id = m.project_id and m.user_id='#{user.id}' and container_type = 'Project' and (a.created_on between '#{date_from}' and '#{date_to}') order by m.project_id, a.created_on desc")
 
     # user 提交的作业
     # @homeworks = HomeworkAttach.where("user_id=#{user.id} and (created_at between '#{date_from}' and '#{date_to}')").order("created_at desc")
@@ -138,7 +138,7 @@ class Mailer < ActionMailer::Base
     # 查询user所在项目添加wiki
     @wiki_contents = WikiContent.find_by_sql("select DISTINCT wc.* from wikis w, members m, projects p, wiki_pages wp, wiki_contents wc where
      m.user_id = '#{user.id}' and m.project_id = p.id and w.project_id = p.id and w.id = wp.wiki_id and wc.page_id = wp.id and w.project_id>0
-     and (wc.updated_on between '#{date_from}' and '#{date_to}') order by updated_on desc")
+     and (wc.updated_on between '#{date_from}' and '#{date_to}') order by m.project_id, updated_on desc")
 
     # 查询user在课程中发布的讨论帖子
     course_mesages = Message.find_by_sql("select DISTINCT me.* from messages me, boards b, members m where
@@ -149,7 +149,7 @@ class Mailer < ActionMailer::Base
     # 查询user在项目中发布的讨论帖子
     project_messages = Message.find_by_sql("select DISTINCT me.* from messages me, boards b, members m where
      b.id = me.board_id and b.project_id = m.project_id
-     and b.project_id != '-1' and m.user_id = '#{user.id}' and (me.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+     and b.project_id != '-1' and m.user_id = '#{user.id}' and (me.created_on between '#{date_from}' and '#{date_to}') order by m.project_id, created_on desc")
     # messages = Message.find_by_sql("select DISTINCT * from messages where author_id = #{user.id} and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
     @course_messages ||= []
     @project_messages ||= []
@@ -176,7 +176,7 @@ class Mailer < ActionMailer::Base
 
     # 查询user在项目中添加新闻和回复新闻
     @project_news = (project_ids && !project_ids.empty?) ? News.find_by_sql("select DISTINCT n.* from news n where  n.project_id in (#{project_ids})
-                                                     and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc") : []
+                                                     and (created_on between '#{date_from}' and '#{date_to}') order by n.project_id, created_on desc") : []
 
     @project_news_comments =  Comment.find_by_sql("select c.* from comments c, members m, projects p, news n
      where m.user_id = '#{user.id}' and p.id = m.project_id and n.project_id = p.id and c.commented_id = n.id

From 6da8cf237d576438d35d6fcde05b1e91a21b41bf Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jul 2015 15:49:03 +0800
Subject: [PATCH 19/22] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=8C=89=E5=A4=A9?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=EF=BC=8C=E5=86=85=E5=AE=B9=E6=8C=89=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=88=92=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 507ead3b1..4454db0cb 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -120,12 +120,12 @@ class Mailer < ActionMailer::Base
       count = courses.count
       count = count - 1
       for i in 0..count do
-        bids =  courses[i].homework_commons.where("homework_commons.created_at between '#{date_from}' and '#{date_to}'").order("homework_commons.created_at desc")
-        attachments = courses[i].attachments.where("attachments.created_on between '#{date_from}' and '#{date_to}'").order('attachments.created_on DESC')
+        bids =  courses[i].homework_commons.where("homework_commons.created_at between '#{date_from}' and '#{date_to}'").order(" '#{courses[i].id}', homework_commons.created_at desc")
+        attachments = courses[i].attachments.where("attachments.created_on between '#{date_from}' and '#{date_to}'").order(" '#{courses[i].id}',attachments.created_on DESC' ")
         @bids += bids if bids.count > 0
         @attachments += attachments if attachments.count > 0
       end
-      @bids  = @bids.sort_by { |obj| obj.created_at }
+      # @bids  = @bids.sort_by { |obj| obj.created_at }
     end
 
     # 项目附件
@@ -144,7 +144,7 @@ class Mailer < ActionMailer::Base
     course_mesages = Message.find_by_sql("select DISTINCT me.* from messages me, boards b, members m where
      b.id = me.board_id and b.course_id = m.course_id
      and b.course_id is not Null and m.user_id = '#{user.id}'
-     and (me.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+     and (me.created_on between '#{date_from}' and '#{date_to}') order by m.course_id, created_on desc")
 
     # 查询user在项目中发布的讨论帖子
     project_messages = Message.find_by_sql("select DISTINCT me.* from messages me, boards b, members m where
@@ -168,11 +168,11 @@ class Mailer < ActionMailer::Base
     #  查询user在课程中发布的通知和回复通知
     @course_news = (course_ids && !course_ids.empty?) ? News.find_by_sql("select DISTINCT n.*  from news n
                                                 where n.course_id in (#{course_ids})
-                                                    and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc") : []
+                                                    and (created_on between '#{date_from}' and '#{date_to}') order by n.course_id, created_on desc") : []
 
     @course_news_comments =  Comment.find_by_sql("select cm.* from comments cm, members m, courses c, news n
      where m.user_id = '#{user.id}' and c.id = m.course_id and n.course_id = c.id and cm.commented_id = n.id
-     and cm.commented_type ='News' and (cm.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+     and cm.commented_type ='News' and (cm.created_on between '#{date_from}' and '#{date_to}') order by  m.course_id, created_on desc")
 
     # 查询user在项目中添加新闻和回复新闻
     @project_news = (project_ids && !project_ids.empty?) ? News.find_by_sql("select DISTINCT n.* from news n where  n.project_id in (#{project_ids})
@@ -180,19 +180,19 @@ class Mailer < ActionMailer::Base
 
     @project_news_comments =  Comment.find_by_sql("select c.* from comments c, members m, projects p, news n
      where m.user_id = '#{user.id}' and p.id = m.project_id and n.project_id = p.id and c.commented_id = n.id
-     and c.commented_type ='News' and (c.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+     and c.commented_type ='News' and (c.created_on between '#{date_from}' and '#{date_to}') order by m.project_id, created_on desc")
 
     # 查询user在课程及个人中留言
     @course_journal_messages = JournalsForMessage.find_by_sql("select DISTINCT jfm.* from journals_for_messages jfm, members m, courses c
      where m.user_id = '#{user.id}' and c.id = m.course_id and jfm.jour_id = c.id
-     and jfm.jour_type='Course' and (jfm.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+     and jfm.jour_type='Course' and (jfm.created_on between '#{date_from}' and '#{date_to}') order m.course_id, by created_on desc")
 
     @user_journal_messages = user.journals_for_messages.where("jour_type='Principal' and (created_on between '#{date_from}' and '#{date_to}')").order('created_on DESC')
 
     # 查询user在项目中留言（用户反馈）
     @project_journal_messages = JournalsForMessage.find_by_sql("select DISTINCT jfm.* from journals_for_messages jfm, members m, projects p
      where m.user_id = '#{user.id}' and p.id = m.project_id and jfm.jour_id = p.id
-     and jfm.jour_type='Project' and (jfm.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+     and jfm.jour_type='Project' and (jfm.created_on between '#{date_from}' and '#{date_to}') order by  m.project_id, created_on desc")
 
     # 查询user新建贴吧或发布帖子
     @forums = Forum.find_by_sql("select  DISTINCT * from forums where creator_id = #{user.id} and (created_at between '#{date_from}' and '#{date_to}') order by created_at desc")

From 750070bdc76bcac6a55d4d480d14ccaf8f5a2928 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jul 2015 15:51:54 +0800
Subject: [PATCH 20/22] =?UTF-8?q?configuration=E5=86=B2=E7=AA=81=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/configuration.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/configuration.yml b/config/configuration.yml
index 111efc8b4..390754a87 100644
--- a/config/configuration.yml
+++ b/config/configuration.yml
@@ -103,7 +103,7 @@ default:
   # autologin_cookie_name: the name of the cookie (default: autologin)
   # autologin_cookie_path: the cookie path (default: /)
   # autologin_cookie_secure: true sets the cookie secure flag (default: false)
-  autologin_cookie_name:
+  autologin_cookie_name: "autologin_trustie"
   autologin_cookie_path:
   autologin_cookie_secure:
 
@@ -200,7 +200,7 @@ default:
 # specific configuration options for production environment
 # that overrides the default ones
 production:
-  # CJK support
+  cookie_domain: ".trustie.net"
   rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
   email_delivery:
     delivery_method: :smtp
@@ -218,9 +218,9 @@ development:
   email_delivery:
     delivery_method: :smtp
     smtp_settings:
-      address: smtp.163.com
+      address: mail.trustie.net
       port: 25
-      domain: smtp.163.com
-      authentication: :plain
-      user_name: huang.jingquan@163.com
-      password: 'xinhu1ji2qu366'
+      domain: mail.trustie.net
+      authentication: :login
+      user_name: "mail@trustie.net"
+      password: "loong2010"

From 0430a0e81049f534d5222ded443c8af91d8ccd97 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jul 2015 16:03:21 +0800
Subject: [PATCH 21/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9journals=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 4454db0cb..7aa793d82 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -185,7 +185,7 @@ class Mailer < ActionMailer::Base
     # 查询user在课程及个人中留言
     @course_journal_messages = JournalsForMessage.find_by_sql("select DISTINCT jfm.* from journals_for_messages jfm, members m, courses c
      where m.user_id = '#{user.id}' and c.id = m.course_id and jfm.jour_id = c.id
-     and jfm.jour_type='Course' and (jfm.created_on between '#{date_from}' and '#{date_to}') order m.course_id, by created_on desc")
+     and jfm.jour_type='Course' and (jfm.created_on between '#{date_from}' and '#{date_to}') order by m.course_id,  created_on desc")
 
     @user_journal_messages = user.journals_for_messages.where("jour_type='Principal' and (created_on between '#{date_from}' and '#{date_to}')").order('created_on DESC')
 

From 08123c2d626f3cf40337832c87f54b620f461f90 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jul 2015 16:11:11 +0800
Subject: [PATCH 22/22] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E5=9B=9E=E5=B8=96?=
 =?UTF-8?q?=E7=BC=A9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_history.html.erb | 48 ++++++++++++++----------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/app/views/issues/_history.html.erb b/app/views/issues/_history.html.erb
index a5b1661eb..2ad36875c 100644
--- a/app/views/issues/_history.html.erb
+++ b/app/views/issues/_history.html.erb
@@ -1,33 +1,31 @@
 <% reply_links = authorize_for('issues', 'edit') -%>
 <% journals.reverse.each do |journal| %>
-<!-- modified by bai -->
-<div id="change-<%= journal.id %>" class="<%= journal.css_classes %>" style=" word-wrap: break-word; word-break: break-all">
-<!-- end -->
-  <div class="ping_C mb10">
-    <div class="ping_dispic"><a href="#" target="_blank"><%= image_tag(url_to_avatar(journal.user), :class => "ping_dispic",:width => 46,:height => 46) %></a></div>
-    <div class="ping_discon">
-      <div class="ping_distop">
-        <a href="#" target="_blank" class="c_blue fb fl mb10 "><%= journal.user %></a><span class="c_grey fr"><%= format_time journal.created_on %></span>
+    <!-- modified by bai -->
+    <div id="change-<%= journal.id %>" class="<%= journal.css_classes %>" style=" word-wrap: break-word; word-break: break-all">
+      <!-- end -->
+      <div class="ping_C mb10 ml10">
+        <div class="ping_dispic"><a href="#" target="_blank"><%= image_tag(url_to_avatar(journal.user), :class => "ping_dispic",:width => 46,:height => 46) %></a></div>
+        <div class="ping_discon" style="width: 600px;">
+          <div class="ping_distop">
+            <a href="#" target="_blank" class="c_blue fb fl mb10 "><%= journal.user %></a><span class="c_grey fr"><%= format_time journal.created_on %></span>
+            <div class="cl"></div>
+            <p>
+              <% if journal.details.any? %>
+                  <% details_to_strings(journal.details).each do |string| %>
+                    <p><%= string %></p>
+                <% end %>
+            <% end %>
+            </p>
+          </div>
+          <!--编辑、引用、回复按钮-->
+          <div class="ping_disfoot"><%= render_links_easy(issue, journal, :reply_links => reply_links) unless journal.notes.blank? %></div>
+          <!--回复内容、引用内容-->
+          <p><%= render_notes_issue(issue, journal, :reply_links => reply_links) unless journal.notes.blank? %></p>
+          <div class="cl"></div>
+        </div>
         <div class="cl"></div>
-        <p>
-        <% if journal.details.any? %>
-			<% details_to_strings(journal.details).each do |string| %>
-                <p><%= string %></p>
-		    <% end %>
-        <% end %>
-        </p>
       </div>
-      <!--编辑、引用、回复按钮-->
-      <div class="ping_disfoot"><%= render_links_easy(issue, journal, :reply_links => reply_links) unless journal.notes.blank? %></div>
-      <!--回复内容、引用内容-->
-      <p>
-        <%= render_notes_issue(issue, journal, :reply_links => reply_links) unless journal.notes.blank? %>
-      </p>
-      <div class="cl"></div>
     </div>
-    <div class="cl"></div>
-  </div>
-</div>
 
     <%= call_hook(:view_issues_history_journal_bottom, { :journal => journal }) %>
 <% end %>