26 commits

Author	SHA1	Message	Date
Stella Rouzi	e2fb434dc7	Implement role authorization	2014-08-13 22:53:13 +03:00
Stella Rouzi	23bf55b66c	User/Person models merge	2014-06-30 15:46:06 +03:00
Chrisbr	656ded9d96	Implements feature test for proposal workflog ... - submitt proposal - accept proposal - confirm proposal	2014-05-13 15:45:39 +02:00
Henne Vogelsang	587126218d	Update gems, use d3 gem, initial bootstrap v3 port	2014-03-17 16:42:19 +01:00
Stella	8f8824ecd6	fix registration page, only show volunteering tab if option is enabled for the conference	2014-03-04 22:22:52 +02: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
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
differentreality	9a4571b290	fix space	2013-07-11 07:45:16 +03:00
differentreality	750e31c11a	add option to pre register to events	2013-07-11 07:43:52 +03:00
Henne Vogelsang	2a927a42b0	Moved to the bootstrap-sass gem, lot's of styling issues fixed	2013-06-26 15:59:56 +02:00
Matt Barringer	e641be69a6	Tweak the registration and submission forms	2013-02-18 06:17:52 +01: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	ba721772b9	Swap some checkboxes around	2013-02-12 20:57:39 +01:00
Matt Barringer	e3b6c735ff	The public name needs to just be a string input	2013-02-12 20:24:48 +01:00
Matt Barringer	2507857a2e	Fixing a few bugs	2013-02-12 19:19:02 +01:00
Matt Barringer	3891d728e8	Only show one month on the registration calendar	2013-02-06 21:27:15 +01:00
Matt Barringer	19432ee07a	Set the registration arrival/departure calendars to the day before/after the conference dates	2013-02-06 21:24:44 +01:00
Matt Barringer	077036d67c	Rename attending_social_events_with_partner	2013-02-06 20:26:41 +01:00
Matt Barringer	5d3864d7da	Show supporter level ticket URL on the registration page	2013-02-03 12:46:44 +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	eb8c85c18f	Don't crash when arrival/departure is null	2013-01-20 13:00:29 +01:00
Matt Barringer	a76854c414	Adding arrival/departure time to the registration form	2013-01-20 12:49:25 +01:00
Matt Barringer	3181c1c0d8	Making the user workflow easier	2013-01-08 08:36:21 +01:00
Matt Barringer	90b30db9e8	First checkin	2013-01-07 09:04:09 +01:00