Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

config/locales/zh.yml

@@ -674,7 +674,7 @@ zh:
   label_day_plural: 天
   label_repository: 版本库
   label_course_repository: 代码库
-  label_browse: 浏览
+  label_browse: 上传文件
   label_branch: 分支
   label_tag: 标签
   label_revision: 修订

db/migrate/20160122142844_excellent_course_se.rb

@@ -0,0 +1,17 @@
+class ExcellentCourseSe < ActiveRecord::Migration
+  def up
+    arr = [302,192,370,394,183,361,117,218,379,178,418,203,342,403,225]
+    for i in 0..arr.length-1
+      begin
+        puts arr[i]
+        course = Course.find(arr[i])
+        course.update_attribute(:is_excellent, true)
+      rescue
+        logger.error("Course is not found!")
+      end
+    end
+  end
+
+  def down
+  end
+end

db/migrate/20160122143138_excellent_option_se.rb

@@ -0,0 +1,19 @@
+class ExcellentOptionSe < ActiveRecord::Migration
+  def up
+    arr = [151,122,15,227,139,410,291,224,55,137,414,43,417,52,205,44,216,132,204,258,411,50,
+           419,390,420,133,91,112,202,95,194,34,172,403,177,252,138,352,225,46,279,382,397,286,344,27,175,
+           124,265,88,59,110,72,92,392,413,26,201,94,57,156,393,154,12,262]
+    for i in 0..arr.length-1
+      begin
+        puts arr[i]
+        course = Course.find(arr[i])
+        course.update_attribute(:excellent_option, true)
+      rescue
+        logger.error("Course is not found!")
+      end
+    end
+  end
+
+  def down
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160122094829) do
+ActiveRecord::Schema.define(:version => 20160122143138) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1371,7 +1371,6 @@ ActiveRecord::Schema.define(:version => 20160122094829) 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