Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop

db/migrate/20130911135608_addidentity_to_user_extensions.rb

@@ -0,0 +1,7 @@
+class AddidentityToUserExtensions < ActiveRecord::Migration
+  def up
+  end
+
+  def down
+  end
+end

db/migrate/20130911140019_removeidentity_from_user_extensions.rb

@@ -0,0 +1,7 @@
+class RemoveidentityFromUserExtensions < ActiveRecord::Migration
+  def up
+  end
+
+  def down
+  end
+end

db/migrate/20130911140205_add_identity_to_user_extensions.rb

@@ -0,0 +1,5 @@
+class AddIdentityToUserExtensions < ActiveRecord::Migration
+  def change
+    add_column :user_extensions, :identity, :integer
+  end
+end

db/migrate/20130918085406_add_student_id_to_userextensions.rb

@@ -1,5 +0,0 @@
-class AddStudentIdToUserextensions < ActiveRecord::Migration
-  def change
-    add_column :userextensions, :student_id, :integer
-  end
-end

db/migrate/20130918085747_add_student_id_to_user_extensions.rb

@@ -0,0 +1,5 @@
+class AddStudentIdToUserExtensions < ActiveRecord::Migration
+  def change
+    add_column :user_extensions, :student_id, :integer
+  end
+end

db/migrate/20130922123727_add_teacher_realname_to_user_extensions.rb

@@ -0,0 +1,5 @@
+class AddTeacherRealnameToUserExtensions < ActiveRecord::Migration
+  def change
+    add_column :user_extensions, :teacher_realname, :string
+  end
+end

db/migrate/20130922123849_add_studentr_realname_to_user_extensions.rb

@@ -0,0 +1,5 @@
+class AddStudentrRealnameToUserExtensions < ActiveRecord::Migration
+  def change
+    add_column :user_extensions, :student_realname, :string
+  end
+end