andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/andreassteph/fetsite into calendar

Browse Source 
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb
This commit is contained in:
Thomas Blazek
2013-08-12 13:44:47 +02:00
parent 2d82aa79f6 4aca98c0f5
commit 96753c3fef
11 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
db/schema.rb
View File

@@ -16,8 +16,6 @@ ActiveRecord::Schema.define(:version => 20130812070544) do
create_table "attachments", :force => true do |t|
t.string "name"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
<<<<<<< HEAD
end
create_table "beispiel_translations", :force => true do |t|
@@ -32,7 +30,11 @@ ActiveRecord::Schema.define(:version => 20130812070544) do
=======
t.integer "thema_id"
end
<<<<<<< HEAD
>>>>>>> master
=======
>>>>>>> thomasb/master
>>>>>>> 4aca98c0f53d92273c1efb7ae217fa7a89630d57
create_table "beispiele", :force => true do |t|
t.string "name"
@@ -81,7 +83,11 @@ ActiveRecord::Schema.define(:version => 20130812070544) do
add_index "frage_translations", ["locale"], :name => "index_frage_translations_on_locale"
<<<<<<< HEAD
>>>>>>> master
=======
>>>>>>> thomasb/master
>>>>>>> 4aca98c0f53d92273c1efb7ae217fa7a89630d57
create_table "fragen", :force => true do |t|
t.string "title"
t.text "text"
@@ -90,7 +96,11 @@ ActiveRecord::Schema.define(:version => 20130812070544) do
<<<<<<< HEAD
=======
t.integer "thema_id"
<<<<<<< HEAD
>>>>>>> master
=======
>>>>>>> thomasb/master
>>>>>>> 4aca98c0f53d92273c1efb7ae217fa7a89630d57
end
create_table "lva_translations", :force => true do |t|
@@ -238,22 +248,17 @@ ActiveRecord::Schema.define(:version => 20130812070544) do
add_index "studium_translations", ["locale"], :name => "index_studium_translations_on_locale"
<<<<<<< HEAD
create_table "themen", :force => true do |t|
=======
t.integer "themen_id"
end
create_table "thema_translations", :force => true do |t|
t.string "locale"
>>>>>>> master
t.string "title"
t.text "text"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
<<<<<<< HEAD
end
=======
t.integer "themen_id"
end
add_index "thema_translations", ["locale"], :name => "index_thema_translations_on_locale"
@@ -275,8 +280,6 @@ ActiveRecord::Schema.define(:version => 20130812070544) do
end
add_index "themengruppe_translations", ["locale"], :name => "index_themengruppe_translations_on_locale"
>>>>>>> master
create_table "themengruppen", :force => true do |t|
t.string "title"
t.text "text"