From 0f96fd81c10bf1b36eea9e1b0a45bfec54483920 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Sat, 13 Jun 2015 09:35:22 +0800
Subject: [PATCH 1/4] ...

---
 public/assets/kindeditor/kindeditor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index a728d4f85..b2c13c3f7 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -5620,8 +5620,8 @@ _plugin('core', function(K) {
         afterUpload : function(data) {
             if (data.error === 0) {
                 var url = K.formatUrl(data.url, 'absolute');
-                self.exec('insertimage', url, 'image','','','1','left');
-                //self.insertHtml('<img src="'+url+'"/>');
+                //self.exec('insertimage', url, 'image','','','1','left');
+                self.insertHtml('<img src="'+url+'"/>');
                 var asset_id  = data.asset_id;
                 if ( asset_id != "" && parent.document.getElementById('asset_id') != null ) {
                     parent.document.getElementById('asset_id').value += asset_id.toString();

From a7086c9208a1643ef6f40ffac43db24ee0fa7806 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 13 Jun 2015 09:37:45 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E2=80=9C?=
 =?UTF-8?q?=E6=94=B6=E8=B5=B7git=E8=AF=B4=E9=9D=A2=E2=80=9D=E9=BC=A0?=
 =?UTF-8?q?=E6=A0=87=E7=BB=8F=E8=BF=87=E5=8F=98=E6=88=90=E6=89=8B=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index a128f917a..474ac638f 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -29,7 +29,7 @@
     </p>
   </div>
 </div>
-<div class="repos_more"><a id="showgithelp" value="show_help" onclick ="showhelpAndScrollTo('repos_git_more'); " class="c_dblue lh23">展开Git操作指南</a></div>
+<div class="repos_more"><a href="#" id="showgithelp" value="show_help" onclick ="showhelpAndScrollTo('repos_git_more'); " class="c_dblue lh23">展开Git操作指南</a></div>
 <div id="repos_git_more">
   <br>
   <div class=" c_dark f14">

From 29b2018a5a60ca260ed97f19c4f42d43ce64244c Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Sat, 13 Jun 2015 09:41:35 +0800
Subject: [PATCH 3/4] =?UTF-8?q?bug#2779:=E6=90=9C=E7=B4=A2=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=90=8E=E6=B2=A1=E6=9C=89=E5=86=92=E5=8F=B7=EF=BC=8C=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=90=8E=E5=8F=88=E6=9C=89=E5=86=92=E5=8F=B7=EF=BC=8C?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E7=BB=9F=E4=B8=80=E6=94=B9=E4=B8=BA=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=86=92=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/_user_show.html.erb b/app/views/users/_user_show.html.erb
index 3bea6d420..8e3d27666 100644
--- a/app/views/users/_user_show.html.erb
+++ b/app/views/users/_user_show.html.erb
@@ -42,7 +42,7 @@
 				<%# memberships = user.memberships.all(:conditions => cond) %>
 			    <% user_courses = user_courses_list(user) %>
                 <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
-                <%= "：" unless user_courses.empty? %>
+                <%#= "：" unless user_courses.empty? %>
 				<% for course in user_courses %>
 				    <%# if course.name != nil %>
                       <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host:  Setting.host_course} %><%= (user_courses.last == course) ? '' : '，' %>

From e8d9d53bcc4f07d8d3a9b8e1d26d0374f6c717a5 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Sat, 13 Jun 2015 10:10:36 +0800
Subject: [PATCH 4/4] =?UTF-8?q?bug#2832:=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
 =?UTF-8?q?=EF=BC=9A=E5=9B=9E=E5=A4=8D=E5=B8=A6=E6=9C=89=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=EF=BC=8C=E5=9C=A8=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=97=B6=EF=BC=8C=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=98=BE=E7=A4=BA=E9=94=99=E4=BD=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/show.html.erb  | 1 +
 app/views/projects/show.html.erb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index 0d48dc8d2..09d1aa27d 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -47,6 +47,7 @@
                 <br />
                 <p class="mt5 break_word"><%= e.event_description.html_safe %>
                   <br />
+                <div class="cl"></div>
                   <%= l :label_activity_time %> ：  <%= format_activity_day(day) %>&nbsp;<%= format_time(e.event_datetime, false) %>
                 </p>
                 <%= link_to_attachments_course(e) if e.class.to_s == "News" %>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index ffeeaef82..ca7bb6159 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -70,6 +70,7 @@
                                :class => "problem_tit fl fb " %>
                 <br />
                 <p class="mt5 break_word"><%= textAreailizable act,:content %><br />
+                <div class="cl"></div>
                   <%= l :label_create_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></p>
               </div>
               <div class="cl"></div>