diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb
index d57cd68eb..04363653f 100644
--- a/app/helpers/files_helper.rb
+++ b/app/helpers/files_helper.rb
@@ -61,7 +61,7 @@ module FilesHelper
     s = ''
     projects.each do |project|
       if !project_contains_attachment?(project,attachment)  && User.current.allowed_to?(:manage_files, project)
-        s << "<label>#{ check_box_tag name, project.id, false, :id => nil } #{h project.name}</label>"
+        s << "<label>#{ check_box_tag name, project.id, false, :id => nil } #{h project.name}</label><br/>"
       end
     end
     s.html_safe
diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb
index d8b53acd0..9a65556d8 100644
--- a/app/views/attachments/_project_file_links.html.erb
+++ b/app/views/attachments/_project_file_links.html.erb
@@ -59,12 +59,14 @@
       <% end %>
       </p>
   <% end %>
+  <div class="thumbnails">
   <% if defined?(thumbnails) && thumbnails %>
       <% images = attachments.select(&:thumbnailable?) %>
       <% if images.any? %>
             <% images.each do |attachment| %>
-                <div class="pro_pic fl " width="100" height="73"><%= thumbnail_issue_tag(attachment) %></div>
+                <div class="pro_pic fl "><%= thumbnail_issue_tag(attachment) %></div>
             <% end %>
       <% end %>
   <% end %>
+  </div>
 </div>
diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb
index c7e0cec29..53ff70bbe 100644
--- a/app/views/files/_project_file_list.html.erb
+++ b/app/views/files/_project_file_list.html.erb
@@ -45,8 +45,8 @@
         </div>
         <div class="cl"></div>
         <div class="tag_h">
-          <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "10"} %>
-          <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "10"} %>
+          <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
+          <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
         </div>
         <div class="cl"></div>
       </div><!---re_con_box end-->
diff --git a/app/views/files/_show_quote_resource_project.html.erb b/app/views/files/_show_quote_resource_project.html.erb
index 7df1dc2f3..9ea9126fb 100644
--- a/app/views/files/_show_quote_resource_project.html.erb
+++ b/app/views/files/_show_quote_resource_project.html.erb
@@ -1,6 +1,6 @@
 <div id="popbox_upload" style="margin-top: -30px;margin-left: -20px;margin-right: -10px;">
   <div class="upload_con">
-    <h2>将此课件引入我的资源库</h2>
+    <h2>将此文件件引入我的资源库</h2>
     <% if error == '403' %>
         <div class="upload_box">
           <div style="color: red;">您没有权限引用此资源</div>
@@ -13,13 +13,11 @@
                        remote: true,
                        id: "relation_file_form" do %>
               <%= hidden_field_tag(:file_id, file.id) %>
-              <%= content_tag('div', projects_check_box_tags('projects[project][]', User.current.projects,project,file), :id => 'projects')%>
+              <%= content_tag('div', projects_check_box_tags('projects[project][]', User.current.projects,project,file), :id => 'projects', :class => "hidden")%>
               <a id="submit_quote" href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_quote();">引&nbsp;&nbsp;用</a><a href="javascript:void(0)" class="blue_btn grey_btn fl c_white" onclick="closeModal();">取&nbsp;&nbsp;消</a>
           <% end -%>
         </div>
     <% end %>
-
-
   </div>
 </div>
 
diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb
index 4ce029217..68bd9f82c 100644
--- a/app/views/issues/_attributes.html.erb
+++ b/app/views/issues/_attributes.html.erb
@@ -9,7 +9,8 @@
                 <%= f.select :status_id,
                              (@allowed_statuses.collect { |p| [p.name, p.id] }),
                              {:no_label => true},
-                             :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
+                             # ajax 刷新
+                             #:onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
                              :class => "w150" %>
             <% else %>
                 <%= h(@issue.status.name) %>
diff --git a/app/views/issues/update_form.js.erb b/app/views/issues/update_form.js.erb
index 615bbfcb3..cc4fb18fc 100644
--- a/app/views/issues/update_form.js.erb
+++ b/app/views/issues/update_form.js.erb
@@ -1,5 +1,5 @@
 $('#all_attributes').html('<%= escape_javascript(render :partial => 'form') %>');
-$(.splitcontent).style("display", "block")
+//$(.splitcontent).style("display", "block")
 <% if User.current.allowed_to?(:log_time, @issue.project) %>
   $('#log_time').show();
 <% else %>
diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb
index 3356a351a..22fb70292 100644
--- a/app/views/projects/settings/_new_members.html.erb
+++ b/app/views/projects/settings/_new_members.html.erb
@@ -11,113 +11,113 @@
 
 <div class="members_left">
   <% if members.any? %>
-    <ul style=" border-bottom:none;">
+      <ul style=" border-bottom:none;">
         <li><span class="w90 f_b" ><%= l(:label_user) %></span><span class="w210 f_b"><%= l(:label_role_plural) %></span><span></span></li>
         <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
         <% members.each do |member| %>
             <li >
-          <%= link_to_user_header member.principal,false,:class => "w90 c_orange fl" %>
-          <span class="w210 fl">
+              <%= link_to_user_header member.principal,false,:class => "w90 c_orange fl" %>
+              <span class="w210 fl">
         <%= h member.roles.sort.collect(&:to_s).join(', ') %>
-            <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
-                                  :method => :put,
-                                  :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
-                ) do |f| %>
+                <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
+                                      :method => :put,
+                                      :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
+                    ) do |f| %>
             <% roles.each do |role| %>
-                <ul style="text-align: left;" class="m115">
+                <ul class="m120" style="text-align: left;" >
                   <%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
                                     :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %>
                   <label ><%= h role %></label>
                 </ul>
                 <!--<br/>-->
             <% end %>
-                <%= hidden_field_tag 'membership[role_ids][]', '' %>
-                <div class="m130">
-                  <a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;">
-                    <%= l(:button_change)%>
-                  </a>
-                  <a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').hide();$(this).parent().parent().parent().parent().height(30)">
-                    <%= l(:button_cancel)%>
-                  </a>
-                </div>
+                    <%= hidden_field_tag 'membership[role_ids][]', '' %>
+                    <div class="m130">
+                      <a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;">
+                        <%= l(:button_change)%>
+                      </a>
+                      <a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').hide();$(this).parent().parent().parent().parent().height(30)">
+                        <%= l(:button_cancel)%>
+                      </a>
+                    </div>
         <% end %>
       </span>
-          <% unless member.user_id == @project.user_id %>
-              <a href="javascript:void(0) " class="c_dblue ml15 fl" onclick="$('#member-<%= member.id%>-roles-form').show();$(this).parent().height(110);">编辑</a>
-              <%= delete_link membership_path(member),
-                              :remote => true,
-                              :class => "c_dblue ml30  fl",
-                              :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_for_project_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %>
-          <% end%>
-        </li>
+              <% unless member.user_id == @project.user_id %>
+                  <a href="javascript:void(0) " class="c_dblue ml15 fl" onclick="$('#member-<%= member.id%>-roles-form').show();$(this).parent().height(110);">编辑</a>
+                  <%= delete_link membership_path(member),
+                                  :remote => true,
+                                  :class => "c_dblue ml30  fl",
+                                  :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_for_project_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %>
+              <% end%>
+            </li>
         <% end%>
-    </ul>
+      </ul>
   <% else %>
-    <p class="nodata"><%= l(:label_no_data) %></p>
+      <p class="nodata"><%= l(:label_no_data) %></p>
   <% end %>
 </div><!-- left -->
 <!--right begin-->
 <% if roles.any? %>
-<div class="members_right">
-  <!-- applied -->
-  <% if @project.applied_projects.any? %>
-      <div class="members_jion">
-        <p class="c_blue mb10 fb"><%= l(:label_apply_project) %></p>
-          <%= form_for(@applied_members, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
-            <div id="principals_for_applied_member">
-              <%= render_principals_for_applied_members_new(@project) %>
-            </div>
-            <ul class="mb10">
-                <li><%= l(:label_role_plural) %>:</li>
-                <% roles.each do |role| %>
-                        <li>
+    <div class="members_right">
+      <!-- applied -->
+      <% if @project.applied_projects.any? %>
+          <div class="members_jion">
+            <p class="c_blue mb10 fb"><%= l(:label_apply_project) %></p>
+            <%= form_for(@applied_members, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
+                <div id="principals_for_applied_member">
+                  <%= render_principals_for_applied_members_new(@project) %>
+                </div>
+                <ul class="mb10">
+                  <li><%= l(:label_role_plural) %>:</li>
+                  <% roles.each do |role| %>
+                      <li>
                         <%= check_box_tag 'membership[role_ids][]', role.id %>
                         <label ><%= h role %></label >
-                        </li>
-                    <% end %>
-            </ul>
-            <a remote="true" href="javascript:void(0)" class="blue_btn fl" onclick="$('#new_membership').submit();">
-              <%= l(:label_approve) %>
-            </a>
-            <a remote="true" href="javascript:void(0)" class="grey_btn fl ml10" onclick="refusal_applied_member();">
-              <%= l(:label_refusal) %>
-            </a>
-          <% end %>
-        <div class="cl"></div>
-    </div>
-  <% end %><!--members_jion end-->
-  <div class="cl"></div>
-  <!-- add members -->
-  <p class="c_blue fb mt10 mb5"><%= l(:label_member_new) %></p>
-  <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
-      <div class="member_search">
-        <input id="principal_search" class="member_search_input fl" type="text" placeholder="请输入用户名称来搜索好友">
-        <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
-        <div class="cl"></div>
+                      </li>
+                  <% end %>
+                </ul>
+                <a remote="true" href="javascript:void(0)" class="blue_btn fl" onclick="$('#new_membership').submit();">
+                  <%= l(:label_approve) %>
+                </a>
+                <a remote="true" href="javascript:void(0)" class="grey_btn fl ml10" onclick="refusal_applied_member();">
+                  <%= l(:label_refusal) %>
+                </a>
+            <% end %>
+            <div class="cl"></div>
+          </div>
+          <% end %><!--members_jion end-->
+      <div class="cl"></div>
+      <!-- add members -->
+      <p class="c_blue fb mt10 mb5"><%= l(:label_member_new) %></p>
+      <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
+          <div class="member_search">
+            <input id="principal_search" class="member_search_input fl" type="text" placeholder="请输入用户名称来搜索好友">
+            <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
+            <div class="cl"></div>
 
-        <div id="principals_for_new_member">
-          <%= render_principals_for_new_project_members(@project) %>
-        </div>
-        <div class="cl"></div>
+            <div id="principals_for_new_member">
+              <%= render_principals_for_new_project_members(@project) %>
+            </div>
+            <div class="cl"></div>
 
-        <ul class="rolebox mb10 mt10">
-          <li class="fb">
-            <%= l(:label_role_plural) %>：
-          </li>
-          <% roles.each do |role| %>
-              <li>
-                <%= check_box_tag 'membership[role_ids][]', role.id %>
-                <label ><%= h role %></label>
+            <ul class="rolebox mb10 mt10">
+              <li class="fb">
+                <%= l(:label_role_plural) %>：
               </li>
-          <% end %>
-        </ul>
-        <div class="cl mb10"></div>
-        <a href="javascript:void(0)" class="member_btn" onclick="$(this).parent().parent().submit();">
-          新增成员
-        </a>
-      </div>
-  <% end%>
-</div><!-- 右边 end-->
+              <% roles.each do |role| %>
+                  <li>
+                    <%= check_box_tag 'membership[role_ids][]', role.id %>
+                    <label ><%= h role %></label>
+                  </li>
+              <% end %>
+            </ul>
+            <div class="cl mb10"></div>
+            <a href="javascript:void(0)" class="member_btn" onclick="$(this).parent().parent().submit();">
+              新增成员
+            </a>
+          </div>
+      <% end%>
+    </div><!-- 右边 end-->
 <% end %>
 
 <script type="text/javascript">
diff --git a/app/views/repositories/_breadcrumbs.html.erb b/app/views/repositories/_breadcrumbs.html.erb
index 780cb47cb..db570d948 100644
--- a/app/views/repositories/_breadcrumbs.html.erb
+++ b/app/views/repositories/_breadcrumbs.html.erb
@@ -25,7 +25,7 @@
 <%
    # @rev is revsion or Git and Mercurial branch or tag.
    # For Mercurial *tip*, @rev and @changeset are nil.
-   rev_text = @changeset.nil? ? "master" : format_revision(@changeset)
+   rev_text = @changeset.nil? ? @rev : format_revision(@changeset)
 %>
 <p class="fl f14 fb c_grey02"><%= "@ #{h rev_text}" unless rev_text.blank? %></p>
 
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 1658339ec..0c52ac4a3 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -534,3 +534,13 @@ p.other-formats { text-align: right; font-size:0.9em; color: #666; }
 /*pre标签换行*/
 .break_word{word-break: break-all;word-wrap: break-word;}
 .break_word_firefox{white-space: pre-wrap;word-break: break-all;}
+
+/*问题跟踪attachment显示*/
+div.attachments { margin-top: 12px; }
+div.attachments p { margin:4px 0 2px 0; }
+div.attachments img { vertical-align: middle; }
+div.attachments span.author { font-size: 0.9em; color: #888; }
+
+div.thumbnails {margin-top:0.6em;}
+div.thumbnails div {background:#fff;display:inline-block;margin-right:2px;}
+