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

Conflicts:
	config/routes.rb

db/migrate/20130115110100_translate_studien.rb

@@ -4,14 +4,13 @@ class TranslateStudien < ActiveRecord::Migration
       :desc => :text,
       :shortdesc => :text
     }, {
-      #:migrate_data => true
+      :migrate_data => true
     })
-    add_column :studium_translations, :studien_id, :integer
-    remove_column :studium_translations, :studium_id
+
     
   end
 
   def self.down
-    Studium.drop_translation_table! #:migrate_data => true
+    Studium.drop_translation_table! :migrate_data => true
   end
-end
+end

db/migrate/20130819133257_create_fetprofiles.rb

@@ -0,0 +1,15 @@
+class CreateFetprofiles < ActiveRecord::Migration
+  def change
+    create_table :fetprofiles do |t|
+      t.string :vorname
+      t.string :nachname
+      t.string :short
+      t.string :fetmailalias
+      t.text :desc
+      t.string :picture
+      t.boolean :active
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20130819133330_create_gremien.rb

@@ -0,0 +1,11 @@
+class CreateGremien < ActiveRecord::Migration
+  def change
+    create_table :gremien do |t|
+      t.string :name
+      t.text :desc
+      t.string :typ
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20130819133446_create_memberships.rb

@@ -0,0 +1,13 @@
+class CreateMemberships < ActiveRecord::Migration
+  def change
+    create_table :memberships do |t|
+      t.string :fetprofile_id
+      t.string :gremium_id
+      t.date :start
+      t.date :stop
+      t.string :typ
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20130819133607_create_galleries.rb

@@ -0,0 +1,11 @@
+class CreateGalleries < ActiveRecord::Migration
+  def change
+    create_table :galleries do |t|
+      t.string :name
+      t.text :desc
+      t.date :datum
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20130819133729_create_fotos.rb

@@ -0,0 +1,12 @@
+class CreateFotos < ActiveRecord::Migration
+  def change
+    create_table :fotos do |t|
+      t.string :title
+      t.text :desc
+      t.integer :gallery_id
+      t.string :datei
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20130819134132_create_fetzneditions.rb

@@ -0,0 +1,12 @@
+class CreateFetzneditions < ActiveRecord::Migration
+  def change
+    create_table :fetzneditions do |t|
+      t.string :title
+      t.text :desc
+      t.date :datum
+      t.string :datei
+
+      t.timestamps
+    end
+  end
+end