From 339b5b0296a1b69c5e8eb1c6737abf622c3b48cf Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 20 Jun 2014 17:14:43 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9B=B4=E6=8E=A5=E6=98=BE=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E7=82=B9=E5=87=BB=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=89=8D=E6=98=BE=E7=A4=BA=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 8e6ad803..89fc862d 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -147,7 +147,7 @@ end %>
 
 <div style="clear: both;"></div>
 <% if @issue.editable? %>
-  <div id="update" style="display:none;">
+  <div id="update">
   <h3><%= l(:button_update) %></h3>
   <%= render :partial => 'edit' %>
   </div>

From 0dce86d47ed0346538bae26b9bf3525406af6311 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 23 Jun 2014 09:42:08 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=98=BE=E7=A4=BA=E4=B8=BA=E6=8C=89=E6=B4=BB?=
 =?UTF-8?q?=E8=B7=83=E5=BA=A6=E6=8E=92=E5=90=8D=E7=9A=84=E5=89=8D10?=
 =?UTF-8?q?=E4=B8=AA=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/welcome_helper.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index 62cb451c..003c6f28 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -158,10 +158,11 @@ module WelcomeHelper
   end
 
   def find_miracle_project(sum, max_rate)
-    max = sum*(max_rate.to_f/10)
-    c1 = find_new_project(sum).to_a.dup
-    c2 = find_all_hot_project(sum).to_a.dup
-    (c2.take(sum-max)+c1.take(max)).take(sum)
+    #max = sum*(max_rate.to_f/10)
+    #c1 = find_new_project(sum).to_a.dup
+    #c2 = find_all_hot_project(sum).to_a.dup
+    #(c2.take(sum-max)+c1.take(max)).take(sum)
+    find_all_hot_project(sum).to_a.dup
   end
   
   def find_new_course limit=15

From 358d4a53b87db9101ea06a10cb0aa5176b4b6a7a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 23 Jun 2014 14:19:01 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E5=85=AC?=
 =?UTF-8?q?=E5=BC=80=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E4=BB=8D=E5=9C=A8?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E6=9C=80=E6=96=B0=E5=8A=A8=E6=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/welcome_helper.rb   |  2 +-
 lib/redmine/activity/fetcher.rb | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index 003c6f28..35fd6ee0 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -333,7 +333,7 @@ module WelcomeHelper
   end
 
   #取得所有活动
-  def find_all_activities limit=6
+  def   find_all_activities limit=6
     # users = []
     # activities = Activity.find_by_sql("select distinct user_id from activities order by id DESC limit #{limit}" )
     # activities.each { |activity|
diff --git a/lib/redmine/activity/fetcher.rb b/lib/redmine/activity/fetcher.rb
index 6ea8c325..a05a9ee1 100644
--- a/lib/redmine/activity/fetcher.rb
+++ b/lib/redmine/activity/fetcher.rb
@@ -88,10 +88,21 @@ module Redmine
       def events_welcome(from = nil, to = nil, options={})
         e = []
         @options[:limit] = options[:limit]
-
         @scope.each do |event_type|
           constantized_providers(event_type).each do |provider|
-            e += provider.find_events1(event_type, @user, from, to, @options)
+            cur_objs = provider.find_events1(event_type, @user, from, to, @options)
+            cur_objs.each do |cur_obj|
+              if cur_obj.class == Issue
+                if cur_obj.project != nil && cur_obj.project.project_status != nil
+                  e += [cur_obj]
+                end
+              else
+                e += [cur_obj]
+              end
+            end
+          end
+          if e.count > options[:limit]
+            break
           end
         end
 

From df89e5e173e2ab39b95271ba1996903becd51537 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Mon, 23 Jun 2014 17:49:20 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E7=9A=84?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=88=86=E6=95=B0=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_users.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 948a7e3f..b4e1e4ee 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -121,7 +121,7 @@
 														</td>
 													</tr>
                                                   <!-- end -->
-                                                  <tr><td class="score">
+                                                  <!-- <tr><td class="score">
                                                     <%= l(:label_user_grade)%>:
                                                     <%= link_to(format("%.2f" , finall_user_score).to_f, {:controller => 'users',
                                                                                                           :action => 'show_score',
@@ -130,7 +130,7 @@
                                                     }, :style => 'color :#E8770D;') %>
                                                   </td>
                                                   </tr>
-													<!-- end -->
+													-->
 												
 												</table></td>
 											</tr>

From ead7fca3f831c8b0ecb1010b3e956354c75d9daf Mon Sep 17 00:00:00 2001
From: linchun <sxszwlc@sina.cn>
Date: Mon, 23 Jun 2014 19:11:58 +0800
Subject: [PATCH 5/5] fix gemfie

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index f12958ef..004f35f2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ group :assets do
   gem 'coffee-rails', '~> 3.2.1'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  # gem 'therubyracer', :platforms => :ruby
+   gem 'therubyracer', :platforms => :ruby
 
   gem 'uglifier', '>= 1.0.3'
 end