From 75ae68ffc8d20b3ed855a63d971cf63c09e549f0 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 21 Mar 2015 16:33:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=82=AE=E7=AE=B1=E4=B8=BA=E7=A9=BA=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index 4fcc2e77d..0e3acbb28 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -4,7 +4,7 @@
         var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
         if(email == "")
         {
-            $("#valid_email").html("电子邮件不能为空");
+            $("#valid_email").html("邮箱地址不能为空！");
         }
         else if (filter.test(email)) {
             $("#valid_email").html("");

From 799fa776eef818880ad963e14b04a80e3a0c523a Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sat, 21 Mar 2015 16:37:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?#2091=20=E6=B5=8B=E8=AF=95=E7=89=88--?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B/=E9=A1=B9=E7=9B=AE--=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93=EF=BC=9A=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90=E5=90=8E?=
 =?UTF-8?q?=20=E5=90=8E=E7=BC=80=E6=97=A0=E8=AE=BA=E6=98=AF=E5=A4=A7?=
 =?UTF-8?q?=E5=86=99=E8=BF=98=E6=98=AF=E5=B0=8F=E5=86=99=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=BF=94=E5=9B=9E=E7=9A=84=E9=83=BD=E6=98=AF=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/files/create.js.erb b/app/views/files/create.js.erb
index 90215c16c..69ea896c9 100644
--- a/app/views/files/create.js.erb
+++ b/app/views/files/create.js.erb
@@ -31,4 +31,5 @@ closeModal();
 $("#resource_list").html('<%= j(render partial:  "course_file" ,locals: {course: @course}) %>');
 <%end%>
 <% end %>
+$(document).ready(img_thumbnails);
 

From 12d88d85fce0fdd70ff614f6c0470d27dfb73e46 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sat, 21 Mar 2015 16:57:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?*=E5=8F=B7=E4=B8=8D=E8=83=BD=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
index 6b3f91587..7578965b5 100644
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -165,7 +165,7 @@
             <tr>
               <td colspan="2" width="580px" >
                 <span class="font_description">
-                  <%= textilizable bid, :description %>
+                  <%= bid.description %>
                 </span>
               </td>
             </tr>