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
..
callforpapers	First checkin	2013-01-07 09:04:09 +01:00
conference	Completely rework the navigation	2013-06-27 16:58:20 +02:00
dietchoices	Adding more registration options, and starting work on supporter levels	2013-02-02 16:43:47 +01:00
emails	Starting to add email sending	2013-01-14 08:49:49 +01:00
events	Fixing a slightly broken table in events list	2013-07-11 13:04:08 +02:00
eventtype	Add minimum/maximum word lengths to session types	2013-01-31 14:38:58 +01:00
people	Adding and removing people	2013-07-10 16:13:53 +02:00
registrations	Merge branch 'admin_registrations_attended' of github.com:differentreality/osem into differentreality-admin_registrations_attended	2013-07-16 15:59:00 +02:00
rooms	First checkin	2013-01-07 09:04:09 +01:00
schedule	* Add ID and track to the event overview	2013-06-14 13:17:40 +02:00
social_events	Adding social events, which can be used on the registration page	2013-02-16 13:30:53 +01:00
speakers	Speaker can be changed in admin/conference/x/events	2013-07-11 09:04:54 +02:00
stats	Getting rid of plain sql in stats_controller	2013-07-16 15:50:32 +02:00
supporter_levels	Adding more registration options, and starting work on supporter levels	2013-02-02 16:43:47 +01:00
supporters	Count events and use datatables, put all tables into wells	2013-05-07 15:09:13 +02:00
tracks	- Restructuring the assets	2013-01-11 15:00:54 +01:00
users	new registration	2013-07-12 19:29:48 +03:00
venue	First checkin	2013-01-07 09:04:09 +01:00