Commit graph

19 commits

Author SHA1 Message Date
Stella Rouzi
9292b79c78 houndci fixes 2014-06-30 15:46:51 +03:00
Stella Rouzi
23bf55b66c User/Person models merge 2014-06-30 15:46:06 +03:00
Chrisbr
596027e49b [Bugfix] Conference methods related to weeks now database independent 2014-06-26 13:28:48 +02:00
Chrisbr
b645b1a4ff Implements registrations and last login information for dashboard 2014-06-02 14:22:51 +02: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
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
Ancor Gonzalez Sosa
9af4393928 xlsx export for registrations list 2013-07-16 09:47:23 +02:00
Ancor Gonzalez Sosa
b9cd54a256 Fixing a bug introduced in f53af55a74 2013-07-15 16:07:23 +02:00
differentreality
7c834347f9 fixes 2013-07-15 13:11:18 +03:00
differentreality
f53af55a74 add pagination, re-arrange view 2013-07-12 13:37:29 +03:00
differentreality
5437cd5226 attended field as true in new registrations created by admin 2013-07-12 13:37:29 +03:00
differentreality
1bd779b6c1 fix registration model 2013-07-11 07:47:05 +03:00
differentreality
750e31c11a add option to pre register to events 2013-07-11 07:43:52 +03: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
077036d67c Rename attending_social_events_with_partner 2013-02-06 20:26:41 +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
90b30db9e8 First checkin 2013-01-07 09:04:09 +01:00