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

..

admin

Merge branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions

2014-03-03 10:43:38 +01:00

api

Only confirmed events in JSON API

2013-07-16 18:42:22 +02:00

application_controller.rb

redirect to requested page after login

2013-08-25 13:40:44 +03:00

conference_registration_controller.rb

add option to pre register to events

2013-07-11 07:43:52 +03:00

event_attachments_controller.rb

- Restructuring the assets

2013-01-11 15:00:54 +01:00

home_controller.rb

show conference until its last day and order by start date

2013-07-28 22:37:26 +03:00

proposal_controller.rb

Speaker is displayed instead of submitter un public pages

2013-07-10 16:55:27 +02:00

registrations_controller.rb

Reject supporter codes if they're already used by another email

2013-02-06 07:23:35 +01:00

schedule_controller.rb

show first day if today is not within the conference date range

2013-07-29 08:48:04 +03:00