Commit graph

235 commits

Author SHA1 Message Date
Stella Rouzi
688557b7cb show schedule in home page only if it is set as public 2014-04-02 20:07:42 +03:00
Henne Vogelsang
26a54a0f79 Remove this migration, additional_speakers neaver existed 2014-03-27 14:20:22 +01:00
Christian Bruckmayer
cbb4b40bc0 Implement more embed code
Supported Media Files:
- Youtube
- Vimeo
- Instagram
- Flickr
- Slidershare
- Speakerdeck

close #26
2014-03-21 16:04:51 +01:00
Henne Vogelsang
120b812a53 Merge pull request #35 from differentreality/fix_conference_registration_after_questions
fix registration page
2014-03-17 16:34:30 +01:00
Henne Vogelsang
257226273b Add default to :conferences use_vpositions/use_vdays 2014-03-05 11:37:58 +01:00
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
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
Stella
28b8b58030 migration, add down func 2013-12-28 15:51:37 +02:00
Stella
de1ed9be2b Fixes for voting on proposals. 0 for no voting option. Set default value in migration to avoid blank/null problems. 2013-12-28 15:29:50 +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
e6b7fbceb5 fix 2013-09-02 16:38:43 +03:00
differentreality
834362491e star voting system for proposals 2013-08-16 16:06:01 +03:00
differentreality
d9d889eb9f Option for proposal changes 2013-07-28 11:48:56 +03:00
differentreality
3ec3944406 create migration for adding field 'attended' in registrations table 2013-07-12 13:37:29 +03:00
Henne Vogelsang
00af4e0aee Merge pull request #13 from differentreality/event_registration
Event registration
2013-07-11 02:47:32 -07:00
differentreality
750e31c11a add option to pre register to events 2013-07-11 07:43:52 +03:00
Ancor Gonzalez Sosa
d648ab7cb5 Add 'revision' attribute to Conference, managed by an observer 2013-07-08 10:03:03 +02:00
Henne Vogelsang
94e014ac40 Add video metadata to events 2013-06-26 12:35:25 +02:00
Henne Vogelsang
d039670de0 Add the miratons from the conf.o.o live instance 2013-05-15 15:19:53 +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
43d149bea3 Add IRC nick to the Person page 2013-02-11 18:12:10 +01:00
Matt Barringer
077036d67c Rename attending_social_events_with_partner 2013-02-06 20:26:41 +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
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
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
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