diff --git a/app/models/course_activity.rb b/app/models/course_activity.rb
index c9c6cec4b..9c1431d5d 100644
--- a/app/models/course_activity.rb
+++ b/app/models/course_activity.rb
@@ -67,8 +67,9 @@ class CourseActivity < ActiveRecord::Base
   # 导语
   def add_course_lead
     if self.course_act_type == "Course"
-      name = Redmine::Configuration['course_message_lead_subject']
-      content = Redmine::Configuration['course_message_lead_content']
+      lead_message = Message.find(12440)
+      name = lead_message.subject
+      content = lead_message.content
       # message的status状态为0为正常，为1表示创建课程时发送的message
       message = Message.create(:subject => name, :content => content, :board_id => self.course.boards.first.id, :author_id => self.course.tea_id , :sticky => true, :status => true )
       # 更新的目的是为了排序，因为该条动态的时间可能与课程创建的动态创建时间一直
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 2da815a44..b184c82e6 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -52,6 +52,7 @@ class Journal < ActiveRecord::Base
   
   # fq
   after_save :act_as_activity,:be_user_score, :act_as_forge_message, :act_as_at_message
+  after_create :update_issue_time
   # end
   #after_destroy :down_user_score
   #before_save :be_user_score
@@ -230,4 +231,12 @@ class Journal < ActiveRecord::Base
       project.project_score.update_attribute(:issue_journal_num, project.project_score.issue_journal_num + 1)
     end
   end
+
+  # 回复issue的时候，更新issue的时候
+  def update_issue_time
+    if self.journalized_type == "Issue"
+      forge_activity = ForgeActivity.where("forge_act_id =? and forge_act_type =?", self.issue, "Issue").first
+      forge_activity.update_attribute(:created_at, self.created_on) unless forge_activity.nil?
+    end
+  end
 end
diff --git a/app/views/blog_comments/_simple_ke_reply_form.html.erb b/app/views/blog_comments/_simple_ke_reply_form.html.erb
index 292587cad..e222d8e56 100644
--- a/app/views/blog_comments/_simple_ke_reply_form.html.erb
+++ b/app/views/blog_comments/_simple_ke_reply_form.html.erb
@@ -1,16 +1,3 @@
-<style type="text/css">
-    /*回复框*/
-    .ReplyToMessageInputContainer .ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
-    .ReplyToMessageInputContainer .ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
-    .ReplyToMessageInputContainer .ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
-    .ReplyToMessageInputContainer .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
-    .ReplyToMessageInputContainer .ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
-    .ReplyToMessageInputContainer .ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
-    .ReplyToMessageInputContainer .ke-outline{border:none;}
-    .ReplyToMessageInputContainer .ke-inline-block{display: none;}
-    .ReplyToMessageInputContainer .ke-container{float:left;}
-</style>
-
 <div class="ReplyToMessageContainer borderBottomNone"id="reply_to_message_<%= reply.id%>">
   <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
   <div class="ReplyToMessageInputContainer mb10">
diff --git a/app/views/courses/_user_homework_search_list.html.erb b/app/views/courses/_user_homework_search_list.html.erb
index 585d8761a..750e7537c 100644
--- a/app/views/courses/_user_homework_search_list.html.erb
+++ b/app/views/courses/_user_homework_search_list.html.erb
@@ -2,18 +2,6 @@
     <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
 <% end %>
 
-<style type="text/css">
-    /*回复框*/
-    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url("/images/public_icon.png")}
-    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-outline {border: none;}
-    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
-    .homepagePostReplyInputContainer .ke-container {float: left;}
-</style>
 <div id="user_homework_list">
   <% homework_commons.each do |homework_common|%>
       <script type="text/javascript">
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index ad5d971ed..b63897951 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,18 +1,7 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: true,init_activity: true) %>
 <% end %>
-<style type="text/css">
-    /*回复框*/
-    /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}*/
-    /*span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}*/
-    /*span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}*/
-    /*div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}*/
-    /*span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}*/
-    /*span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}*/
-    /*div.ke-toolbar .ke-outline{border:none;}*/
-    /*.ke-inline-block{display: none;}*/
-    /*div.ke-container{float:left;}*/
-</style>
+
 <script>
     $(function(){
         $("#RSide").removeAttr("id");
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index d20d637ee..6062d760b 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -46,7 +46,7 @@
           <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;">
             <%= link_to image_tag(url_to_avatar(User.current),:width => '23',:height => '23'), request.local? ? user_path(User.current):("https://www.trustie.net/users/" + User.current.id.to_s),:alt => '用户头像', :target => '_blank',:style=>'border-radius:3px; vertical-align:top; margin-top:3px; display:inline-block; margin-right:3px;' %>
             <%= link_to User.current, (request.local? || request.subdomain.blank?) ? user_path(User.current):("https://www.trustie.net/users/" + User.current.id.to_s),:id => "orgUserName",:class => 'fontGrey2 f14 mr5',:target => '_blank' %>
-            <%= link_to "退出",(request.local? || request.subdomain.nil?) ? logout_organization_path(@organization):"https://www.trustie.net/logout", :class =>"menuGrey", :method => 'post', :rel => "nofollow" %>
+            <%= link_to "退出",(request.local? || request.subdomain.nil?) ? signout_path():"https://www.trustie.net/logout", :class =>"menuGrey", :method => 'post', :rel => "nofollow" %>
           </li>
           <!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
       <% else %>
diff --git a/app/views/news/_course_news_detail.html.erb b/app/views/news/_course_news_detail.html.erb
index 61db84134..bd3215fb3 100644
--- a/app/views/news/_course_news_detail.html.erb
+++ b/app/views/news/_course_news_detail.html.erb
@@ -3,18 +3,6 @@
     <%= javascript_include_tag "create_kindeditor" %>
 <% end %>
 
-<style type="text/css">
-    /*回复框*/
-    /*.homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}*/
-    /*.homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-outline {border: none;}*/
-    /*.homepagePostReplyInputContainer .ke-inline-block {display: none;}*/
-    /*.homepagePostReplyInputContainer .ke-container {float: left;}*/
-</style>
 <% if newss%>
     <% newss.each do |news| %>
         <script>
diff --git a/app/views/news/_project_news_detail.html.erb b/app/views/news/_project_news_detail.html.erb
index 518a29fa9..b3e6de5cf 100644
--- a/app/views/news/_project_news_detail.html.erb
+++ b/app/views/news/_project_news_detail.html.erb
@@ -3,18 +3,6 @@
     <%= javascript_include_tag "create_kindeditor" %>
 <% end %>
 
-<style type="text/css">
-    /*回复框*/
-    /*.homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}*/
-    /*.homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-outline {border: none;}*/
-    /*.homepagePostReplyInputContainer .ke-inline-block {display: none;}*/
-    /*.homepagePostReplyInputContainer .ke-container {float: left;}*/
-</style>
 <% if all_news %>
     <% all_news.each do |news| %>
         <script>
diff --git a/app/views/organizations/_show_home_page.html.erb b/app/views/organizations/_show_home_page.html.erb
index 0e725532e..63eb1808b 100644
--- a/app/views/organizations/_show_home_page.html.erb
+++ b/app/views/organizations/_show_home_page.html.erb
@@ -17,6 +17,7 @@
             最后编辑：<%= User.find(EditorOfDocument.where("org_document_comment_id =?", document.id).order("created_at desc").first.editor_id).realname %>
           </div>
       <% end %>
+      <div class="cl"></div>
       <!--    <%# if defined?(home_id) %>
         <div style="float:right;">最后编辑：<%#= User.find() %></div>
     <%# end %>-->
diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb
index 062d64096..c036633a5 100644
--- a/app/views/projects/_project_activities.html.erb
+++ b/app/views/projects/_project_activities.html.erb
@@ -35,18 +35,7 @@
         })
     })
 </script>
-<style type="text/css">
-    /*回复框*/
-    /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}*/
-    /*span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}*/
-    /*span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}*/
-    /*div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}*/
-    /*span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}*/
-    /*span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}*/
-    /*div.ke-toolbar .ke-outline{border:none;}*/
-    /*.ke-inline-block{display: none;}*/
-    /*div.ke-container{float:left;}*/
-</style>
+
 <% unless forge_acts.empty? %>
     <% forge_acts.each do |activity| -%>
         <script>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index afe4740eb..76d5745df 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -36,12 +36,12 @@
         <% if @changesets && !@changesets.empty? %>
             <% if !user_commit_rep(@changesets_latest_coimmit.author_email).nil? %>
                 <%= image_tag(url_to_avatar(user_commit_rep(@changesets_latest_coimmit.author_email)),  :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %>
-                <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %></div>
+                <span class="fl"><div class="fb fontGrey3 mr5 fl hidden maxwidth150"><%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %></div>
                     <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
                     <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
                 </span>
             <% else %>
-                 <span class="fl"><div class="fb fontGrey3 rep_mail_name mr5 fl"><%=@changesets_latest_coimmit.author_email %></div>
+                 <span class="fl"><div class="fb fontGrey3 mr5 fl hidden maxwidth150"><%=@changesets_latest_coimmit.author_email %></div>
                     <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
                     <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
                 </span>
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 59d605a09..0e55c246c 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -38,18 +38,7 @@
         })
     })
 </script>
-<style type="text/css">
-    /*回复框*/
-    /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}*/
-    /*span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}*/
-    /*span.ke-toolbar-icon-url{background-image:url( "/images/public_icon.png" )}*/
-    /*div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}*/
-    /*span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}*/
-    /*span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}*/
-    /*div.ke-toolbar .ke-outline{border:none;}*/
-    /*.ke-inline-block{display: none;}*/
-    /*div.ke-container{float:left;}*/
-</style>
+
 <% user_activities.each do |user_activity|
   if user_activities %>
         <script>
diff --git a/app/views/users/_user_jours_list.html.erb b/app/views/users/_user_jours_list.html.erb
index 779b98a75..94d2998ae 100644
--- a/app/views/users/_user_jours_list.html.erb
+++ b/app/views/users/_user_jours_list.html.erb
@@ -2,18 +2,7 @@
     <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
     <%#= javascript_include_tag "init_KindEditor","user" %>
 <% end %>
-<style type="text/css">
-    /*回复框*/
-    /*.homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}*/
-    /*.homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-outline {border: none;}*/
-    /*.homepagePostReplyInputContainer .ke-inline-block {display: none;}*/
-    /*.homepagePostReplyInputContainer .ke-container {float: left;}*/
-</style>
+
 <%if jours %>
     <% jours.each do |jour|%>
         <% unless jour.private == 1 && (!User.current || (User.current && jour.jour_id != User.current.id && jour.user_id != User.current.id)) %>
diff --git a/app/views/users/_user_message_org.html.erb b/app/views/users/_user_message_org.html.erb
index e3b656a46..8c6159a58 100644
--- a/app/views/users/_user_message_org.html.erb
+++ b/app/views/users/_user_message_org.html.erb
@@ -12,7 +12,7 @@
             <%= ma.content %>
           </li>
           <li class="homepageHomeworkContentWarn fl">
-            <%=link_to (ma.organization.domain.nil? || (ma.organization.domain && ma.organization.domain != ma.content)) ? "同意申请":"申请已批准",
+            <%=link_to (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准",
                        agree_apply_subdomain_organizations_path( :organization_id => ma.organization_id, :org_domain => ma.content, :user_id => ma.sender_id, :act_id => ma.id ),
                        :id => "agree_apply_subdomain_#{ma.id}",
                        :method => 'post',
diff --git a/db/migrate/20160223073859_add_publish_to_attachment_histories.rb b/db/migrate/20160223073859_add_publish_to_attachment_histories.rb
new file mode 100644
index 000000000..81533004f
--- /dev/null
+++ b/db/migrate/20160223073859_add_publish_to_attachment_histories.rb
@@ -0,0 +1,6 @@
+class AddPublishToAttachmentHistories < ActiveRecord::Migration
+  def change
+    add_column :attachment_histories, :is_publish, :integer, :default => 1
+    add_column :attachment_histories, :publish_time, :date
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c22b79790..db33479a5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160220100507) do
+ActiveRecord::Schema.define(:version => 20160223073859) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -99,6 +99,8 @@ ActiveRecord::Schema.define(:version => 20160220100507) do
     t.integer  "quotes"
     t.integer  "version"
     t.integer  "attachment_id"
+    t.integer  "is_publish",                   :default => 1
+    t.date     "publish_time"
   end
 
   create_table "attachments", :force => true do |t|
@@ -118,6 +120,8 @@ ActiveRecord::Schema.define(:version => 20160220100507) do
     t.integer  "is_public",                    :default => 1
     t.integer  "copy_from"
     t.integer  "quotes"
+    t.integer  "is_publish",                   :default => 1
+    t.date     "publish_time"
   end
 
   add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
@@ -1373,7 +1377,6 @@ ActiveRecord::Schema.define(:version => 20160220100507) do
     t.integer  "changeset_num",     :default => 0
     t.integer  "board_message_num", :default => 0
     t.integer  "board_num",         :default => 0
-    t.integer  "act_num",           :default => 0
     t.integer  "attach_num",        :default => 0
     t.datetime "commit_time"
   end
diff --git a/lib/trustie/gitlab/helper.rb b/lib/trustie/gitlab/helper.rb
index 61c1fbd17..9fb1f5735 100644
--- a/lib/trustie/gitlab/helper.rb
+++ b/lib/trustie/gitlab/helper.rb
@@ -3,6 +3,15 @@
 module Trustie
   module Gitlab
     module Helper
+      GUEST     = 10
+      REPORTER  = 20
+      DEVELOPER = 30
+      MASTER    = 40
+      OWNER     = 50
+      # 项目公开和私有
+      PUBLIC = 20
+      PRIVATE = 0
+
       def change_password(uid, en_pwd, salt)
         return unless uid
         options = {:encrypted_password=>en_pwd, :password_salt=>salt}
@@ -44,6 +53,21 @@ module Trustie
         self.g.delete_user(user.gid)
       end
 
+      def get_gitlab_role m
+        case m.roles.first.position
+          when 1,2
+            GUEST
+          when 5
+            REPORTER
+          when 4
+            DEVELOPER
+          when 3
+            MASTER
+          else
+            GUEST
+        end
+      end
+
     end
   end
 end
\ No newline at end of file
diff --git a/lib/trustie/gitlab/sync.rb b/lib/trustie/gitlab/sync.rb
index d41b813e7..2f4f77c53 100644
--- a/lib/trustie/gitlab/sync.rb
+++ b/lib/trustie/gitlab/sync.rb
@@ -61,7 +61,7 @@ module Trustie
                 unless gid
                   gid = sync_user(m.user).id
                 end
-                self.g.add_team_member(gproject.id, gid, UserLevel::DEVELOPER)
+                self.g.add_team_member(gproject.id, gid, get_gitlab_role(m))
               rescue => e
                 puts e
               end
@@ -111,7 +111,7 @@ module Trustie
                 unless gid
                     gid = sync_user(m.user).id
                 end
-                self.g.add_team_member(gproject.id, gid, UserLevel::DEVELOPER)
+                self.g.add_team_member(gproject.id, gid, get_gitlab_role(m))
               rescue => e
                 puts e
               end
@@ -125,7 +125,7 @@ module Trustie
               unless gid
                 gid = sync_user(m.user).id
               end
-              self.g.add_team_member(project.gpid, gid, UserLevel::DEVELOPER)
+              self.g.add_team_member(project.gpid, gid, get_gitlab_role(m))
             rescue => e
               puts e
             end
@@ -134,6 +134,8 @@ module Trustie
 
         def remove_project
         end
+
+
     end
 
   end
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 29c099d3d..11c01aa09 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1168,3 +1168,4 @@ div.disable_link {background-color: #c1c1c1 !important;}
 /*问题跟踪局部修改属性*/
 .proInfoBox2{ border:1px solid #dddddd; height:45px; padding:10px 0; background-color:#f1f1f1;}
 .proInfoBox2 ul li{ height:24px; position:relative;}
+.maxwidth150{max-width: 150px;}