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

Conflicts:
	config/routes.rb

app/models/ability.rb

@@ -27,7 +27,7 @@ class Ability
     
     # For Debug allow everything
     # Remove this line in production environment and for testing user management
-    can :manage, :all     
+   # can :manage, :all     
     can :addfetuser, User
     can :addfetadmin, User
     can [:show, :index], Studium
@@ -62,7 +62,7 @@ class Ability
 
    if user.has_role?("newsadmin") || user.has_role?("fetadmin") 
       can :addmoderator, Rubrik
-    end    
+   end    
    can [:show, :index], [Rubrik,Neuigkeit]
    if user.has_role?("newsadmin") || user.has_role?( "fetadmin") || user.has_role?( "fetuser") 
 	  can :manage, Rubrik

app/models/fetprofile.rb

@@ -0,0 +1,3 @@
+class Fetprofile < ActiveRecord::Base
+  attr_accessible :active, :desc, :fetmailalias, :nachname, :picture, :short, :vorname
+end

app/models/fetznedition.rb

@@ -0,0 +1,3 @@
+class Fetznedition < ActiveRecord::Base
+  attr_accessible :datei, :datum, :desc, :title
+end

app/models/foto.rb

@@ -0,0 +1,3 @@
+class Foto < ActiveRecord::Base
+  attr_accessible :datei, :desc, :gallery_id, :title
+end

app/models/gallery.rb

@@ -0,0 +1,3 @@
+class Gallery < ActiveRecord::Base
+  attr_accessible :datum, :desc, :name
+end

app/models/gremium.rb

@@ -0,0 +1,3 @@
+class Gremium < ActiveRecord::Base
+  attr_accessible :desc, :name, :typ
+end

app/models/membership.rb

@@ -0,0 +1,3 @@
+class Membership < ActiveRecord::Base
+  attr_accessible :fetprofile_id, :gremium_id, :start, :stop, :typ
+end