diff --git a/Gemfile b/Gemfile
index 6bb141404..6c2101345 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source 'http://ruby.taobao.org'
+source 'http://rubygems.org'
 #source 'http://ruby.sdutlinux.org/'
 
 unless RUBY_PLATFORM =~ /w32/
@@ -33,21 +33,21 @@ group :test do
   gem 'selenium-webdriver', '~> 2.42.0'
 
 
-  platforms :mri, :mingw do
-    group :rmagick do
-      # RMagick 2 supports ruby 1.9
-      # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
-      # different requirements for the same gem on different platforms
-      gem "rmagick", ">= 2.0.0"
-    end
-  end
+  # platforms :mri, :mingw do
+  #   group :rmagick do
+  #     # RMagick 2 supports ruby 1.9
+  #     # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
+  #     # different requirements for the same gem on different platforms
+  #     gem "rmagick", ">= 2.0.0"
+  #   end
+  #end
 end
 
 group :development, :test do
-	gem "guard-rails", '~> 0.5.3'
+	# gem "guard-rails", '~> 0.5.3'
 	gem 'spork-testunit', '~> 0.0.8'
-	gem 'guard-spork', '~> 1.5.1'
-	gem 'guard-test', '~> 1.0.0'
+	# gem 'guard-spork', '~> 1.5.1'
+	# gem 'guard-test', '~> 1.0.0'
 	gem 'ruby-prof', '~> 0.15.1' unless RUBY_PLATFORM =~ /w32/
 	gem 'pry'
 	gem 'pry-nav'
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index e76fa31dc..9d35b9fb0 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -810,9 +810,9 @@ class CoursesController < ApplicationController
     # modify by nwb
     # 添加私密性判断
     if User.current.member_of_course?(@course)|| User.current.admin?
-      events = @activity.events(@date_from, @date_to)
+      events = @activity.events(@days, @course.created_at)
     else
-      events = @activity.events(@date_from, @date_to, :is_public => 1)
+      events = @activity.events(@days, @course.created_at, :is_public => 1)
     end
 
     # 无新动态时，显示老动态
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 0b7cbbb5f..5d43a4e20 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -597,8 +597,8 @@ class ProjectsController < ApplicationController
       "show_wiki_edits"=>true,
       "show_journals_for_messages" => true
     }
-    @date_to ||= Date.today + 1
-    @date_from = @date_to - @days-1.years
+
+
     @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
     @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
     # 决定显示所用用户或单个用户活动
@@ -612,9 +612,9 @@ class ProjectsController < ApplicationController
     # modify by nwb
     # 添加私密性判断
     if User.current.member_of?(@project)|| User.current.admin?
-      events = @activity.events(@date_from, @date_to)
+      events = @activity.events(@days)
     else
-      events = @activity.events(@date_from, @date_to, :is_public => 1)
+      events = @activity.events(@days,nil, :is_public => 1)
     end
 
     @offset, @limit = api_offset_and_limit({:limit => 10})
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 0fcf35aff..7b4d488a9 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -41,7 +41,7 @@ class UsersController < ApplicationController
                                   :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
                                   :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index]
   before_filter :auth_user_extension, only: :show
-  before_filter :rest_user_score, only: :show
+  #before_filter :rest_user_score, only: :show
   #before_filter :select_entry, only: :user_projects
   accept_api_auth :index, :show, :create, :update, :destroy,:tag_save  , :tag_saveEx
   
diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index 859ed0361..62b3a01e3 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -62,7 +62,7 @@ function f_submit()
 <style type="text/css">
 /*浮窗*/ 
 body{ height:3000px; font-family:'微软雅黑';} 
-div,ul,li,body,h3,p{margin:0; padding:0;} 
+
 a{ text-decoration:none;}
 #roll{ background:url(/images/f_opnion.jpg) 0 0 no-repeat;width:157px; height:332px; position:absolute;}
 .opnionBox{ width: 130px; height:146px; margin:76px auto 20px; } 
@@ -101,10 +101,10 @@ a:hover.opnionButton{ text-decoration:underline;}
 	<% get_memo %>
 		<%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
 	<div class="actions" style="max-width:680px">
-		<p>
+		<p style="margin:0; padding:0;">
           <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%>
         </p>
-        <p>
+        <p style="margin:0; padding:0;">
           <%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%>
         </p>
 		  <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index a79914f61..43adab15f 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -26,7 +26,6 @@
 </head>
 <!--add by huang-->
 <body class="<%= h body_css_classes %>">
-<%= render :partial => 'courses/course_ad' %>
 <div id="wrapper">
 <div id="wrapper2">
 <div id="wrapper3">
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index ebdab208d..597229369 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -123,7 +123,7 @@
       <br/>
     </p>
 
-    <p style="width:400px;padding-left: 52px;">
+    <p style="width:400px;padding-left: 50px;">
       <label style="margin-right: 1px;">
         <%= l(:label_identity) %><span style="color: #bb0000;"> *</span></label>
       <select onchange="showtechnical_title(this.value, $('#userTechnical_title'));" name="identity" id="userIdentity" class="location" style="margin: 0px;">
@@ -187,13 +187,13 @@
       <!-- added by bai  增加账户里的性别-->
         <span id='gender' style='display:none'>
         <% if @user.user_extensions.nil? %>
-            <p style="width:400px;padding-left: 54px;">
+            <p style="width:400px;padding-left: 52px;">
               <%= l(:label_gender) %>&nbsp;&nbsp;
               <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe, :class => 'gender' %>
             </p>
         <% else %>
             <% if @user.user_extensions.gender == 0 %><!-- label_gender_male -->
-              <p style="width:400px;padding-left: 54px;">
+              <p style="width:400px;padding-left: 52px;">
                 <%= l(:label_gender) %>&nbsp;&nbsp;
                 <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe, :class => 'gender' %>
               </p>
@@ -318,7 +318,7 @@
           });
       </script>
 
-      <p style="width:400px;padding-left: 57px;"><label style="margin-right: 5px;"><%= l(:label_location) %></label>
+      <p style="width:400px;padding-left: 55px;"><label style="margin-right: 5px;"><%= l(:label_location) %></label>
         <select onchange="showcity(this.value, document.getElementById('userCity'));" name="province" id="userProvince" class="location">
           <option value="">--请选择省份--</option>
           <option value="北京">北京</option>
@@ -382,7 +382,7 @@
       <legend onclick="toggleFieldset(this);">
         <%= l(:field_mail_notification) %>
       </legend>
-      <div style="padding-left: 26px;"> <!-- modified by ming -->
+      <div style="padding-left: 8px;"> <!-- modified by ming -->
         <p style="width:380px;">
           <%= render :partial => 'users/mail_notifications' %>
         </p></div>
diff --git a/app/views/welcome/_search_course.html.erb b/app/views/welcome/_search_course.html.erb
index 5721af9fb..895f696fb 100644
--- a/app/views/welcome/_search_course.html.erb
+++ b/app/views/welcome/_search_course.html.erb
@@ -49,7 +49,7 @@ form #search_type{
 <%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
 <div class="project-search" style="float: right">
 	<div class='search_widget'>
-		<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字',  :size => 27, %>
+		<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字',  :size => 27, style: "float:left"  %>
 		<%= select_tag(:search_type, options_for_select(select_option), :style => "float:right" ) %>
 	</div>
 		<%#= hidden_field_tag 'project_type', project_type %>
diff --git a/app/views/welcome/_search_project.html.erb b/app/views/welcome/_search_project.html.erb
index 5922d4180..6a77861b9 100644
--- a/app/views/welcome/_search_project.html.erb
+++ b/app/views/welcome/_search_project.html.erb
@@ -89,7 +89,7 @@ form #search_by
 <div class="project-search" style="float: right">
 	<div class='search_widget' >
 
-		<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字' %>
+		<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字', style:"float:left" %>
         <input type="text" name="search_by_input" style="display: none" id="search_by_input" value="0">
 		<%= select_tag(:search_type, options_for_select(select_option), :onchange => "searchTypeChange();", :style => "float:right" ) %>
         <%= select_tag(:search_by,options_for_select([["昵称","0"],["姓名","1"],["邮箱","2"]]), :onchange => "searchByChange();",:style => "float:right" )  %>
diff --git a/config/configuration.yml b/config/configuration.yml
index 21337e3b4..7e5381406 100644
--- a/config/configuration.yml
+++ b/config/configuration.yml
@@ -87,12 +87,12 @@ default:
       
    
 
-      address: smtp.qq.com
-      port: 587
-      domain: smtp.qq.com
+      address: smtp.126.com
+      port: 25
+      domain: smtp.126.com
       authentication: :plain
-      user_name: 939547590@qq.com
-      password: 'suwen11223344'
+      user_name: "alanlong9278@126.com"
+      password: "alanlong8788786"
 
   # Absolute path to the directory where attachments are stored.
   # The default is the 'files' directory in your Redmine instance.
diff --git a/db/migrate/20150112024820_add_data_for_members.rb b/db/migrate/20150112024820_add_data_for_members.rb
new file mode 100644
index 000000000..3d0c50082
--- /dev/null
+++ b/db/migrate/20150112024820_add_data_for_members.rb
@@ -0,0 +1,10 @@
+class AddDataForMembers < ActiveRecord::Migration
+  def change
+    StudentsForCourse.all.each do |stu|
+        if  Member.where(:user_id => stu.student_id, :course_id => stu.course_id).first.nil?
+          mem = Member.new(:user_id => stu.student_id, :course_id => stu.course_id, :course_group_id => 0, :project_id => -1, :mail_notification => 0, :role_ids => [10])
+          mem.save!
+        end
+      end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 00d308293..9c6f4eac3 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 => 20150108035338) do
+ActiveRecord::Schema.define(:version => 20150112024820) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -831,8 +831,9 @@ ActiveRecord::Schema.define(:version => 20150108035338) do
     t.integer  "user_id"
     t.datetime "published_at"
     t.datetime "closed_at"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+    t.text     "polls_description"
   end
 
   create_table "praise_tread_caches", :force => true do |t|
diff --git a/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb b/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
index e671c3e22..17f834c84 100644
--- a/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
+++ b/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
@@ -50,15 +50,13 @@ module Redmine
 
         module ClassMethods
           # Returns events of type event_type visible by user that occured between from and to
-          def find_events(event_type, user, from, to, options)
+          def find_events(event_type, user, days, created_time, options)
             provider_options = activity_provider_options[event_type]
             raise "#{self.name} can not provide #{event_type} events." if provider_options.nil?
 
             scope = self
 
-            if from && to
-              scope = scope.scoped(:conditions => ["#{provider_options[:timestamp]} BETWEEN ? AND ?", from, to])
-            end
+
 
             if options[:author]
               return [] if provider_options[:author_key].nil?
@@ -93,7 +91,22 @@ module Redmine
               ActiveSupport::Deprecation.warn "acts_as_activity_provider with implicit :permission option is deprecated. Add a visible scope to the #{self.name} model or use explicit :permission option."
               scope = scope.scoped(:conditions => Project.allowed_to_condition(user, "view_#{self.name.underscore.pluralize}".to_sym, options))
             end
+            unless scope.all(provider_options[:find_options].dup).first.nil?
+              if provider_options[:timestamp].include? "updated_on"
+                to = scope.scoped(:order => "#{provider_options[:timestamp]} desc").all(provider_options[:find_options].dup).first.updated_on
+              else
+                to = scope.scoped(:order => "#{provider_options[:timestamp]} desc").all(provider_options[:find_options].dup).first.created_on
+              end
+              if options[:course]
+                from = (to - days.days) > created_time ? (to - days.days) : created_time.to_date
+              else
+                from =  to - days.days - 1.years
+              end
+            end
 
+            if from && to
+              scope = scope.scoped(:conditions => ["#{provider_options[:timestamp]} BETWEEN ? AND ?", from, to])
+            end
             scope.all(provider_options[:find_options].dup)
           end
 
diff --git a/lib/redmine/activity/fetcher.rb b/lib/redmine/activity/fetcher.rb
index ba2033775..b3f473893 100644
--- a/lib/redmine/activity/fetcher.rb
+++ b/lib/redmine/activity/fetcher.rb
@@ -79,7 +79,7 @@ module Redmine
 
       # Returns an array of events for the given date range
       # sorted in reverse chronological order
-      def events(from = nil, to = nil, options={})
+      def events(days = nil, created_time = nil, options={})
         e = []
         @options[:limit] = options[:limit]
         # modify by nwb
@@ -87,7 +87,7 @@ module Redmine
 
         @scope.each do |event_type|
           constantized_providers(event_type).each do |provider|
-            e += provider.find_events(event_type, @user, from, to, @options)
+            e += provider.find_events(event_type, @user, days, created_time, @options)
           end
         end
 
diff --git a/public/stylesheets/resource.css b/public/stylesheets/resource.css
index 885423143..f0f969b4a 100644
--- a/public/stylesheets/resource.css
+++ b/public/stylesheets/resource.css
@@ -118,7 +118,7 @@ a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
 .upload_con { }
 .upload_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto;  margin-top:25px; padding-left:20px; padding-top:5px;}
 .upload_box{ width:430px; margin:15px auto;}
-a.upload_btn{ display:block; float:left; margin-top:15px; width:80px; height:30px; text-align: center; color:#fff; font-size:14px; background:#15bccf; margin-right:15px;}
+a.upload_btn{ display:block; float:left; margin-top:15px; width:80px; height:30px; text-align: center; color:#fff; font-size:14px; background:#15bccf; margin-right:15px;padding-top: 10px;}
 a:hover.upload_btn{ background:#55a1b9;}
 a.upload_btn_grey{background:#a3a3a3;}
 a:hover.upload_btn_grey{background:#8a8a8a;}