13 commits

Author	SHA1	Message	Date
Chrisbr	c4fbf8d038	Fixes rooms form	2014-04-28 19:58:49 +02:00
Henne Vogelsang	587126218d	Update gems, use d3 gem, initial bootstrap v3 port	2014-03-17 16:42:19 +01:00
Henne Vogelsang	0982be8579	Simplify sidebar and navigation ... Check existence of supporter levels	2014-03-04 10:10:07 +01:00
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
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
Stella	5b35e25ecd	Add difficulty levels	2014-02-23 16:09:09 +02:00
Stella	3105c8da5d	question builder	2014-02-09 18:05:57 +02:00
Stella	64b2b8b3f8	Volunteers, positions and days and volunteers list for admin, volunteering option for attendees	2014-01-01 11:39:59 +02:00
Henne Vogelsang	252e1fe544	Completely rework the navigation ... Get rid of the admin layout Get rid of the navbar custom style, use bootstrap-sass variables instead Get rid of all the scaffold files	2013-06-27 16:58:20 +02:00
Matt Barringer	3933e89a9c	Adding social events, which can be used on the registration page	2013-02-16 13:30:53 +01:00
Matt Barringer	973913b3bf	Adding more registration options, and starting work on supporter levels	2013-02-02 16:43:47 +01:00
Matt Barringer	900bcb16d5	Starting to add email sending	2013-01-14 08:49:49 +01:00
Matt Barringer	90b30db9e8	First checkin	2013-01-07 09:04:09 +01:00