merge

public/stylesheets/jstoolbar.css

@@ -1,10 +1,8 @@
 .jstEditor {
-	
     padding-left: 0px;
 }
 .jstEditor textarea, .jstEditor iframe {
-    margin: 0 ;
-    margin-left: 80px;
+    margin: 0;
 }
 
 .jstHandle {
@@ -15,7 +13,7 @@
 }
 
 .jstElements {
-    padding: 3px 3px 3px 0px;/*by young*/
+    padding: 3px 3px 3px 10px;/*by young*/
 }
 
 .jstElements button {

public/stylesheets/scm.css

@@ -97,9 +97,7 @@ table.annotate td.author {
     background: inherit;
 }
 
-
-table.annotate td.line-code { background-color: #fafafa; word-break: break-all;}
-
+table.annotate td.line-code { background-color: #fafafa; }
 
 div.action_M { background: #fd8 }
 div.action_D { background: #f88 }

test/fixtures/activities.yml

@@ -1,7 +1,6 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
 
 one:
-
   act_id: 
   act_type: MyString
   user_id: 
@@ -10,14 +9,3 @@ two:
   act_id: 
   act_type: MyString
   user_id: 
-
-  id: 1
-  act_id: 1
-  act_type: JournalsForMessage
-  user_id: 5
-
-two:
-  act_id: 2
-  act_type: JournalsForMessage
-  user_id: 5
-

test/fixtures/course_infos.yml

@@ -1,6 +1,5 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
 
-<<<<<<< HEAD
 one:
   typeId: 1
   typeName: MyString
@@ -8,18 +7,3 @@ one:
 two:
   typeId: 1
   typeName: MyString
-=======
-courses_001_infos:
-  id: 1
-  course_id: 1
-  user_id: 20
-  created_at: 2013-09-30 15:36:00
-  updated_at: 2014-04-19 01:50:41
-courses_002_infos:
-  id: 2
-  course_id: 2
-  user_id: 20
-  created_at: 2013-09-30 15:36:00
-  updated_at: 2014-04-19 01:50:41
-
->>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0

test/fixtures/course_statuses.yml

@@ -1,16 +1,11 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
-<<<<<<< HEAD
 
 one:
-=======
-courses_001_statuses:
->>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0
   changesets_count: 1
   watchers_count: 1
   course_id: 1
   grade: 1.5
   course_ac_para: 1
-<<<<<<< HEAD
 
 two:
   changesets_count: 1
@@ -18,16 +13,3 @@ two:
   course_id: 1
   grade: 1.5
   course_ac_para: 1
-=======
-  created_at: 2013-09-30 15:36:00
-  updated_at: 2014-04-19 01:50:41
-
-courses_002_statuses:
-  changesets_count: 1
-  watchers_count: 1
-  course_id: 2
-  grade: 1.5
-  course_ac_para: 1
-  created_at: 2013-09-30 15:36:00
-  updated_at: 2014-04-19 01:50:41
->>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0

test/fixtures/schools.yml

@@ -1,6 +1,5 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
 
-<<<<<<< HEAD
 one:
   name: 
   province: MyString
@@ -8,16 +7,3 @@ one:
 two:
   name: 
   province: MyString
-=======
-school_117:
-  id: 117
-  name: 国防科学技术大学
-  province: 湖南省
-  logo_link: 
-
-school_001:
-  id: 1
-  name: 摧毁地球人学校
-  province: 火星
-  logo_link: 
->>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0

test/fixtures/user_extensions.yml

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
 
 person_one_extra:
@@ -38,62 +37,3 @@ person_mao_extra:
   teacher_realname: nil
   student_realname: nil
   location_city: nil
-=======
-user_extension_006:
-  id: 6
-  user_id: 6
-  birthday: 
-  brief_introduction: 
-  gender: 0
-  location: 
-  occupation: 
-  work_experience: 
-  zip_code: 
-  created_at: 2014-07-29 02:54:09
-  updated_at: 2014-07-29 02:54:09
-  technical_title: 
-  identity: 0
-  student_id: 
-  teacher_realname: 
-  student_realname: 
-  location_city: 
-  school_id: 
-user_extension_020:
-  id: 20
-  user_id: 20
-  birthday: 
-  brief_introduction: 哈尔
-  gender: 0
-  location: 黑龙江
-  occupation: kylinos-cloud
-  work_experience: 
-  zip_code: 
-  created_at: 2014-07-29 02:54:09
-  updated_at: 2014-07-29 02:54:09
-  technical_title: 助教
-  identity: 0
-  student_id: 
-  teacher_realname: 
-  student_realname: 
-  location_city: 哈尔滨
-  school_id: 
-user_extension_025:
-  id: 25
-  user_id: 25
-  birthday: 
-  brief_introduction: 哈尔
-  gender: 0
-  location: 黑龙江
-  occupation: kylinos-cloud
-  work_experience: 
-  zip_code: 
-  created_at: 2014-07-29 02:54:09
-  updated_at: 2014-07-29 02:54:09
-  technical_title: 助教
-  identity: 1 #student
-  student_id: 10060342
-  teacher_realname: 
-  student_realname: 'ue_realname'
-  location_city: 哈尔滨
-  school_id: 117
->>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0

test/functional/system_log_controller_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class SystemLogControllerTest < ActionController::TestCase
+class UserScoreControllerTest < ActionController::TestCase
   # test "the truth" do
   #   assert true
   # end

test/functional/zipdown_controller_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ZipdownControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/unit/poll_answers_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class PollAnswersTest < ActiveSupport::TestCase
+class ApplyProjectMasterTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end

test/unit/poll_questions_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class PollQuestionsTest < ActiveSupport::TestCase
+class AppliedProjectTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end

test/unit/poll_user_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class PollUserTest < ActiveSupport::TestCase
+class BugToOspTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end

test/unit/polls_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class PollsTest < ActiveSupport::TestCase
+class SchoolControllerTest < ActionController::TestCase
   # test "the truth" do
   #   assert true
   # end

test/unit/relative_memo_to_open_source_project_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class RelativeMemoToOpenSourceProjectTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

tmp/plugins/README

@@ -0,0 +1 @@
+Put your Redmine plugins here.