Merge pull request #4 from Inachos/master

Bitte mein Löschen pullen
2013-07-22 06:58:28 -07:00
parent 70be1adfea 870964bf4b
commit eecd7b4a2c
247 changed files with 2 additions and 1 deletions
--- a/.gitattributes
+++ b/.gitattributes
--- a/.gitignore
+++ b/.gitignore
--- a/.project
+++ b/.project
--- a/0
+++ b/0
--- a/Gemfile.BASE
+++ b/Gemfile.BASE
--- a/Gemfile.LOCAL
+++ b/Gemfile.LOCAL
--- a/Gemfile.REMOTE
+++ b/Gemfile.REMOTE
--- a/Gemfile.lock
+++ b/Gemfile.lock
--- a/README.rdoc
+++ b/README.rdoc
--- a/0
+++ b/0
--- a/app/assets/images/edit.png
+++ b/app/assets/images/edit.png
--- a/app/assets/images/fet_logo_2.png
+++ b/app/assets/images/fet_logo_2.png
--- a/app/assets/images/fet_logo_3.png
+++ b/app/assets/images/fet_logo_3.png
--- a/app/assets/images/rails.png
+++ b/app/assets/images/rails.png
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
--- a/app/assets/javascripts/beispiele.js.coffee
+++ b/app/assets/javascripts/beispiele.js.coffee
--- a/app/assets/javascripts/lvas.js.coffee
+++ b/app/assets/javascripts/lvas.js.coffee
--- a/app/assets/javascripts/modulgruppen.js.coffee
+++ b/app/assets/javascripts/modulgruppen.js.coffee
--- a/app/assets/javascripts/moduls.js.coffee
+++ b/app/assets/javascripts/moduls.js.coffee
--- a/app/assets/javascripts/neuigkeiten.js.coffee
+++ b/app/assets/javascripts/neuigkeiten.js.coffee
--- a/app/assets/javascripts/rubriken.js.coffee
+++ b/app/assets/javascripts/rubriken.js.coffee
--- a/app/assets/javascripts/semesters.js.coffee
+++ b/app/assets/javascripts/semesters.js.coffee
--- a/app/assets/javascripts/studia.js.coffee
+++ b/app/assets/javascripts/studia.js.coffee
--- a/app/assets/javascripts/studmods.js.coffee
+++ b/app/assets/javascripts/studmods.js.coffee
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
--- a/app/assets/stylesheets/beispiele.css.scss
+++ b/app/assets/stylesheets/beispiele.css.scss
--- a/app/assets/stylesheets/layout.css.scss
+++ b/app/assets/stylesheets/layout.css.scss
--- a/app/assets/stylesheets/lvas.css.scss
+++ b/app/assets/stylesheets/lvas.css.scss
--- a/app/assets/stylesheets/modulgruppen.css.scss
+++ b/app/assets/stylesheets/modulgruppen.css.scss
--- a/app/assets/stylesheets/moduls.css.scss
+++ b/app/assets/stylesheets/moduls.css.scss
--- a/app/assets/stylesheets/neuigkeiten.css.scss
+++ b/app/assets/stylesheets/neuigkeiten.css.scss
--- a/app/assets/stylesheets/rubriken.css.scss
+++ b/app/assets/stylesheets/rubriken.css.scss
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
--- a/app/assets/stylesheets/semesters.css.scss
+++ b/app/assets/stylesheets/semesters.css.scss
--- a/app/assets/stylesheets/studien.css.scss
+++ b/app/assets/stylesheets/studien.css.scss
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
--- a/app/controllers/beispiele_controller.rb
+++ b/app/controllers/beispiele_controller.rb
--- a/app/controllers/config_controller.rb
+++ b/app/controllers/config_controller.rb
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
--- a/app/controllers/lvas_controller.rb
+++ b/app/controllers/lvas_controller.rb
--- a/app/controllers/modulgruppen_controller.rb
+++ b/app/controllers/modulgruppen_controller.rb
--- a/app/controllers/moduls_controller.rb
+++ b/app/controllers/moduls_controller.rb
--- a/app/controllers/neuigkeiten_controller.rb
+++ b/app/controllers/neuigkeiten_controller.rb
--- a/app/controllers/rubriken_controller.rb
+++ b/app/controllers/rubriken_controller.rb
--- a/app/controllers/semesters_controller.rb
+++ b/app/controllers/semesters_controller.rb
--- a/app/controllers/studien_controller.rb
+++ b/app/controllers/studien_controller.rb
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
--- a/app/helpers/beispiele_helper.rb
+++ b/app/helpers/beispiele_helper.rb
--- a/app/helpers/lvas_helper.rb
+++ b/app/helpers/lvas_helper.rb
--- a/app/helpers/modulgruppen_helper.rb
+++ b/app/helpers/modulgruppen_helper.rb
--- a/app/helpers/moduls_helper.rb
+++ b/app/helpers/moduls_helper.rb
--- a/app/helpers/neuigkeiten_helper.rb
+++ b/app/helpers/neuigkeiten_helper.rb
--- a/app/helpers/pages_helper.rb
+++ b/app/helpers/pages_helper.rb
--- a/app/helpers/rubriken_helper.rb
+++ b/app/helpers/rubriken_helper.rb
--- a/app/helpers/semesters_helper.rb
+++ b/app/helpers/semesters_helper.rb
--- a/app/helpers/studien_helper.rb
+++ b/app/helpers/studien_helper.rb
--- a/app/helpers/studmods_helper.rb
+++ b/app/helpers/studmods_helper.rb
--- a/app/inputs/tinymce_text_input.rb
+++ b/app/inputs/tinymce_text_input.rb
--- a/app/mailers/.gitkeep
+++ b/app/mailers/.gitkeep
--- a/app/mailers/confirmmailer.rb
+++ b/app/mailers/confirmmailer.rb
--- a/app/models/.gitkeep
+++ b/app/models/.gitkeep
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
--- a/app/models/beispiel.rb
+++ b/app/models/beispiel.rb
--- a/app/models/lva.rb
+++ b/app/models/lva.rb
--- a/app/models/modul.rb
+++ b/app/models/modul.rb
--- a/app/models/modulgruppe.rb
+++ b/app/models/modulgruppe.rb
--- a/app/models/neuigkeit.rb
+++ b/app/models/neuigkeit.rb
--- a/app/models/role.rb
+++ b/app/models/role.rb
--- a/app/models/rubrik.rb
+++ b/app/models/rubrik.rb
--- a/app/models/semester.rb
+++ b/app/models/semester.rb
--- a/app/models/studium.rb
+++ b/app/models/studium.rb
--- a/app/models/user.rb
+++ b/app/models/user.rb
--- a/app/views/beispiele/_form.html.erb
+++ b/app/views/beispiele/_form.html.erb
--- a/app/views/beispiele/edit.html.erb
+++ b/app/views/beispiele/edit.html.erb
--- a/app/views/beispiele/index.html.erb
+++ b/app/views/beispiele/index.html.erb
--- a/app/views/beispiele/new.html.erb
+++ b/app/views/beispiele/new.html.erb
--- a/app/views/beispiele/show.html.erb
+++ b/app/views/beispiele/show.html.erb
--- a/app/views/config/index.html.erb
+++ b/app/views/config/index.html.erb
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
--- a/app/views/devise/mailer/reset_password_instructions.html.erb
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb
--- a/app/views/devise/mailer/unlock_instructions.html.erb
+++ b/app/views/devise/mailer/unlock_instructions.html.erb
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
--- a/app/views/devise/shared/_links.erb
+++ b/app/views/devise/shared/_links.erb
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
--- a/app/views/home/dev.html.erb
+++ b/app/views/home/dev.html.erb
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
--- a/app/views/layouts/menu.html.erb
+++ b/app/views/layouts/menu.html.erb
--- a/app/views/lvas/_form.html.erb
+++ b/app/views/lvas/_form.html.erb
--- a/app/views/lvas/edit.html.erb
+++ b/app/views/lvas/edit.html.erb
--- a/app/views/lvas/index.html.erb
+++ b/app/views/lvas/index.html.erb
--- a/app/views/lvas/new.html.erb
+++ b/app/views/lvas/new.html.erb
--- a/app/views/lvas/show.html.erb
+++ b/app/views/lvas/show.html.erb
--- a/app/views/modulgruppen/_form.html.erb
+++ b/app/views/modulgruppen/_form.html.erb
--- a/Show More
+++ b/Show More