Henne Vogelsang 243ea41456 Merge branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions ...

Conflicts:
	app/models/conference.rb
	config/routes.rb

2014-03-03 10:43:38 +01:00

..

callforpapers_controller.rb

Completely rework the navigation

2013-06-27 16:58:20 +02:00

conference_controller.rb

Completely rework the navigation

2013-06-27 16:58:20 +02:00

dietchoices_controller.rb

Completely rework the navigation

2013-06-27 16:58:20 +02:00

difficulty_levels_controller.rb

Add difficulty levels

2014-02-23 16:09:09 +02:00

emails_controller.rb

Completely rework the navigation

2013-06-27 16:58:20 +02:00

events_controller.rb

Merge pull request #33 from differentreality/final_difficulty_levels

2014-03-03 10:40:21 +01:00

eventtype_controller.rb

Completely rework the navigation

2013-06-27 16:58:20 +02:00

people_controller.rb

Adding and removing people

2013-07-10 16:13:53 +02:00

questions_controller.rb

question builder

2014-02-09 18:05:57 +02:00

registrations_controller.rb

question builder

2014-02-09 18:05:57 +02:00

rooms_controller.rb

Completely rework the navigation

2013-06-27 16:58:20 +02:00

schedule_controller.rb

Add flexvideo class, enable proposal editing,

2013-06-20 00:26:34 +02:00

social_events_controller.rb

Completely rework the navigation

2013-06-27 16:58:20 +02:00

speakers_controller.rb

Speaker can be changed in admin/conference/x/events

2013-07-11 09:04:54 +02:00

stats_controller.rb

Updated the gems, add missing migration for the stats controller, fix most obvious issues with stats

2013-10-22 15:52:29 +02:00

supporter_levels_controller.rb

Completely rework the navigation

2013-06-27 16:58:20 +02:00

supporters_controller.rb

Completely rework the navigation

2013-06-27 16:58:20 +02:00

tracks_controller.rb

Completely rework the navigation

2013-06-27 16:58:20 +02:00

users_controller.rb

new registration

2013-07-12 19:29:48 +03:00

venue_controller.rb

Completely rework the navigation

2013-06-27 16:58:20 +02:00