16 Commits

Author	SHA1	Message	Date
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	52543589e4	voting visual changes	2014-02-23 14:56:09 +02:00
Stella	3105c8da5d	question builder	2014-02-09 18:05:57 +02:00
Henne Vogelsang	8aeeabebab	Updated the gems, add missing migration for the stats controller, fix most obvious issues with stats	2013-10-22 15:52:29 +02:00
differentreality	13782d8f25	add d3 lib	2013-09-18 12:22:17 +03:00
differentreality	a0dc62b125	Changes based on comments	2013-09-02 16:15:02 +03:00
differentreality	834362491e	star voting system for proposals	2013-08-16 16:06:01 +03:00
Ancor Gonzalez Sosa	c6956482f0	Speaker can be changed in admin/conference/x/events	2013-07-11 09:04:54 +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
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	152e8a345d	Working on the backend interface for supporter registrations	2013-02-03 18:12:44 +01:00
Matt Barringer	57520bb7a9	Add minimum/maximum word lengths to session types	2013-01-31 14:38:58 +01:00
Matt Barringer	a76854c414	Adding arrival/departure time to the registration form	2013-01-20 12:49:25 +01:00
Matt Barringer	b801f0dc19	- Restructuring the assets ... - Worked on the schedule - Removed some gems	2013-01-11 15:00:54 +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