Henne Vogelsang 14a896842b Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers ... Conflicts: app/models/conference.rb app/models/registration.rb app/views/admin/conference/_sidebar.html.haml app/views/conference_registration/register.html.haml		2014-03-03 10:52:24 +01:00
..
callforpapers	Fixes for voting on proposals. 0 for no voting option. Set default value in migration to avoid blank/null problems.	2013-12-28 15:29:50 +02:00
conference	Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers	2014-03-03 10:52:24 +01:00
dietchoices	Adding more registration options, and starting work on supporter levels	2013-02-02 16:43:47 +01:00
difficulty_levels	Add difficulty levels	2014-02-23 16:09:09 +02:00
emails	Starting to add email sending	2013-01-14 08:49:49 +01:00
events	Merge pull request #33 from differentreality/final_difficulty_levels	2014-03-03 10:40:21 +01:00
eventtype	Add minimum/maximum word lengths to session types	2013-01-31 14:38:58 +01:00
people	Adding and removing people	2013-07-10 16:13:53 +02:00
questions	fix removal of answers	2014-02-13 15:29:52 +02:00
registrations	question builder	2014-02-09 18:05:57 +02:00
rooms	First checkin	2013-01-07 09:04:09 +01:00
schedule	* Add ID and track to the event overview	2013-06-14 13:17:40 +02:00
social_events	Adding social events, which can be used on the registration page	2013-02-16 13:30:53 +01:00
speakers	Speaker can be changed in admin/conference/x/events	2013-07-11 09:04:54 +02:00
stats	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	Adding more registration options, and starting work on supporter levels	2013-02-02 16:43:47 +01:00
supporters	Show the supporter_level title, not the class	2013-10-22 15:56:44 +02:00
tracks	- Restructuring the assets	2013-01-11 15:00:54 +01:00
users	Fix managing user roles	2013-10-22 14:16:20 +02:00
venue	layout change to single line box for venue name and address	2013-07-28 22:41:32 +03:00
volunteers	Volunteers, positions and days and volunteers list for admin, volunteering option for attendees	2014-01-01 11:39:59 +02:00