From b81b5fc42c0230560dff16cf01c136005bc4d513 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 18 Jul 2014 08:36:55 +0800
Subject: [PATCH] Merge branch 'szzh' of
 http://repository.trustie.net/xianbo/trustie2 into szzh

Conflicts:
	app/views/layouts/_base_footer.html.erb
	app/views/welcome/index.html.erb
---
 db/schema.rb | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index f318ff96a..5dbcf992c 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 => 20140714081030) do
+ActiveRecord::Schema.define(:version => 20140715015540) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -379,6 +379,7 @@ ActiveRecord::Schema.define(:version => 20140714081030) do
     t.text     "description"
     t.datetime "created_on"
     t.integer  "user_id",                   :default => 0
+    t.integer  "is_public",                 :default => 1
   end
 
   add_index "documents", ["category_id"], :name => "index_documents_on_category_id"
@@ -768,6 +769,7 @@ ActiveRecord::Schema.define(:version => 20140714081030) do
     t.boolean  "hidden_repo",     :default => false, :null => false
     t.integer  "attachmenttype",  :default => 1
     t.integer  "user_id"
+    t.integer  "dts_test",        :default => 0
   end
 
   add_index "projects", ["lft"], :name => "index_projects_on_lft"
@@ -806,18 +808,18 @@ ActiveRecord::Schema.define(:version => 20140714081030) do
   create_table "relative_memos", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "parent_id"
-    t.string   "subject",                               :null => false
-    t.text     "content",                               :null => false
+    t.string   "subject",                                                   :null => false
+    t.text     "content",            :limit => 16777215,                    :null => false
     t.integer  "author_id"
-    t.integer  "replies_count",      :default => 0
+    t.integer  "replies_count",                          :default => 0
     t.integer  "last_reply_id"
-    t.boolean  "lock",               :default => false
-    t.boolean  "sticky",             :default => false
-    t.boolean  "is_quote",           :default => false
-    t.datetime "created_at",                            :null => false
-    t.datetime "updated_at",                            :null => false
-    t.integer  "viewed_count_crawl", :default => 0
-    t.integer  "viewed_count_local", :default => 0
+    t.boolean  "lock",                                   :default => false
+    t.boolean  "sticky",                                 :default => false
+    t.boolean  "is_quote",                               :default => false
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.integer  "viewed_count_crawl",                     :default => 0
+    t.integer  "viewed_count_local",                     :default => 0
     t.string   "url"
     t.string   "username"
     t.string   "userhomeurl"
@@ -841,6 +843,19 @@ ActiveRecord::Schema.define(:version => 20140714081030) do
 
   add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
 
+  create_table "rich_rich_files", :force => true do |t|
+    t.datetime "created_at",                                 :null => false
+    t.datetime "updated_at",                                 :null => false
+    t.string   "rich_file_file_name"
+    t.string   "rich_file_content_type"
+    t.integer  "rich_file_file_size"
+    t.datetime "rich_file_updated_at"
+    t.string   "owner_type"
+    t.integer  "owner_id"
+    t.text     "uri_cache"
+    t.string   "simplified_type",        :default => "file"
+  end
+
   create_table "roles", :force => true do |t|
     t.string  "name",              :limit => 30, :default => "",        :null => false
     t.integer "position",                        :default => 1