25 commits

Author	SHA1	Message	Date
Christian Bruckmayer	fa129de063	Merge pull request #173 from ChrisBr/new_dashboard ... Implements event submissions over time chart	2014-05-30 10:23:23 +02:00
Chrisbr	40c61ed717	Implements event submissions over time chart	2014-05-30 10:10:47 +02:00
Gopesh Tulsyan	e2fd1bbd69	Add tickets to registration segment	2014-05-30 00:31:12 +05:30
Gopesh Tulsyan	abfb0884a1	Added registration segment to display description, period ... Controller test for Conference#show houndci fixes Rebased with single entry for navigation branding Conditional rendering of splash navbar	2014-05-30 00:30:09 +05:30
Gopesh Tulsyan	b3d719829e	Added description to conference and program segment to splash ... removed id from program partial	2014-05-29 23:57:35 +05:30
Chrisbr	dc080705ae	Adds color attribute to conference	2014-05-28 13:40:58 +02:00
Henne Vogelsang	2e9b92c3af	Initial Rails4 Port	2014-04-23 15:45:55 +02:00
Henne Vogelsang	633fff59d8	Add conference wide media, fix proposal#show view	2014-04-14 16:25:17 +02:00
Henne Vogelsang	e3fd0c195a	First tests in rspec, with factory_girl	2014-04-09 13:18:11 +02:00
Henne Vogelsang	accd7d1a58	Starting to document things with rdoc	2014-04-09 13:18:11 +02:00
Gopesh Tulsyan	014f768e0c	Validations for start and end date	2014-04-05 21:44:30 +05:30
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	59933115fc	Fix merge leftovers	2014-03-03 11:04:47 +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
Matt Barringer	3933e89a9c	Adding social events, which can be used on the registration page	2013-02-16 13:30:53 +01:00
Matt Barringer	152e8a345d	Working on the backend interface for supporter registrations	2013-02-03 18:12: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	1d7670d74e	Add logo to conference page	2013-01-17 15:56:56 +01:00
Matt Barringer	900bcb16d5	Starting to add email sending	2013-01-14 08:49:49 +01:00
Matt Barringer	f86232bedf	Added paper_trail, also starting work on the scheduler	2013-01-07 16:45:48 +01:00
Matt Barringer	90b30db9e8	First checkin	2013-01-07 09:04:09 +01:00