Ancor Gonzalez Sosa 243f33ff91 Merge branch 'admin_registrations_attended' of github.com:differentreality/osem into differentreality-admin_registrations_attended ... Conflicts: app/controllers/admin/registrations_controller.rb app/models/registration.rb		2013-07-16 15:59:00 +02: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
emails_controller.rb	Completely rework the navigation	2013-06-27 16:58:20 +02:00
events_controller.rb	Fixing the json generated by admin/conference/x/events	2013-07-11 13:49:50 +02: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
registrations_controller.rb	Merge branch 'admin_registrations_attended' of github.com:differentreality/osem into differentreality-admin_registrations_attended	2013-07-16 15:59:00 +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	Getting rid of plain sql in stats_controller	2013-07-16 15:50:32 +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