From 03318aac97d23e101926b693f2dc152e9d419a92 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Dec 2015 15:36:59 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8D=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E4=BF=AE=E6=94=B9=E8=A6=81=E5=8F=98=E6=88=90=E7=81=B0?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index fa9171496..b95c8f049 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -30,7 +30,7 @@
           <li>&nbsp;&nbsp;</li>
         </ul>
         <ul class="setting_right ">
-          <li><%= f.text_field :login,:no_label=>true, :required => true, :nh_required=>"1",:disabled=>'disabled', :name => "login",:class=>"w210"%></li>
+          <li><%= f.text_field :login,:no_label=>true, :required => true,:style=>"color:grey", :nh_required=>"1",:disabled=>'disabled', :name => "login",:class=>"w210"%></li>
           <li><%= f.text_field :mail,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210"%></li>
 
           <li>

From d1423ebc7ed268b2d9526093185bd68504d241b3 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Dec 2015 15:41:41 +0800
Subject: [PATCH 2/4] =?UTF-8?q?ke=E9=AB=98=E5=BA=A6=E5=B0=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/init_activity_KindEditor.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/javascripts/init_activity_KindEditor.js b/public/javascripts/init_activity_KindEditor.js
index 977c62117..a23b83607 100644
--- a/public/javascripts/init_activity_KindEditor.js
+++ b/public/javascripts/init_activity_KindEditor.js
@@ -159,4 +159,5 @@ function init_activity_KindEditor_data(id){
 
     div_form = $("div[nhname='new_message_" + id + "']");
     $(".ke-edit", div_form).css("height","33px");
+    $(".ke-edit-iframe",div_form).css("height","33px");
 }
\ No newline at end of file

From b178fb7f0a318b1f65dc600c09e74fe4d4b40031 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Dec 2015 15:56:37 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92=20?=
 =?UTF-8?q?=E7=97=85=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 1ca8f5e1a..9f7b90ee4 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -180,7 +180,7 @@
           <div  style="display: none" class="message_title_red system_message_style">
             <p>
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
-              该作业已经被关闭了匿评。作业信息如下：
+              该作业已经关闭了匿评。作业信息如下：
             </p>
             <ul class="ul_grey">
               <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>

From df1d1a46850eeaabec87e4936d038620d10f864e Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Dec 2015 17:54:07 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=B2=A1=E6=9C=89=E4=BF=9D=E5=AD=98=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/show.html.erb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index ad9195804..280d378f3 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -115,10 +115,7 @@
             $.ajax({
                 url:'/forums/'+'<%= @forum.id.to_s%>'+'/memos',
                 type:'post',
-                data:{
-                    'memo[content]':$("#memo_content").val(),
-                    'memo[subject]':$("#memo_subject").val()
-                },
+                data:$("#new_memo").serialize(),
                 success:function(data){
 
                 },