Gopesh Tulsyan
014f768e0c
Validations for start and end date
2014-04-05 21:44:30 +05:30
Henne Vogelsang
18968a05b1
* Update devise to latest version
...
* use letter_opener for mails in development
* bring back the flash
* fix redirect loop for logging in
* move all mailer/devise settings to config/config.yml
2014-03-24 12:45:47 +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
24e40a5c90
Merge pull request #41 from differentreality/stats_update
...
Move events stats in Statistics, add ticket distribution
2014-03-17 16:36:03 +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
Stella
2e1dcd33fe
Move events stats in Statistics, add ticket distribution
2014-03-09 16:16:22 +02:00
Henne Vogelsang
be970ba6c0
Get rid of the languages before_save function. It's too shaky
2014-03-05 11:09:40 +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
3d9bef366c
Only upcase languages if they exist...
2014-03-04 10:15:40 +01: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
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
406b7dcd2d
Merge pull request #42 from differentreality/proposal_event_types
...
Show length of event types in new proposal drop down
2013-09-04 02:19:18 -07:00
differentreality
aaa77bb893
allow stars from 1 to 10, 1 star being the default
2013-09-02 15:58:09 +03:00
differentreality
9125bafe4a
Show length of event types in new proposal drop down
2013-09-01 18:19:25 +03:00
differentreality
4d2f0e2111
fix rebase conflict
2013-08-16 16:09:29 +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
Ancor Gonzalez Sosa
7f3c8a65de
Only confirmed events in JSON API
2013-07-16 18:42:22 +02:00
Ancor Gonzalez Sosa
bae0be338a
Use render instead of redirect if registration/create fails
2013-07-16 16:03:36 +02:00
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
Ancor Gonzalez Sosa
9af4393928
xlsx export for registrations list
2013-07-16 09:47:23 +02:00
Ancor Gonzalez Sosa
b9cd54a256
Fixing a bug introduced in f53af55a74
2013-07-15 16:07:23 +02:00
differentreality
7c834347f9
fixes
2013-07-15 13:11:18 +03:00
Henne Vogelsang
83b20dfc58
Merge pull request #18 from differentreality/stats
...
Stats
2013-07-12 04:43:23 -07:00
differentreality
f53af55a74
add pagination, re-arrange view
2013-07-12 13:37:29 +03:00
differentreality
5437cd5226
attended field as true in new registrations created by admin
2013-07-12 13:37:29 +03:00
differentreality
a71a16922c
Add admin stats page
2013-07-12 12:30:31 +03:00
Henne Vogelsang
00af4e0aee
Merge pull request #13 from differentreality/event_registration
...
Event registration
2013-07-11 02:47:32 -07:00
differentreality
1bd779b6c1
fix registration model
2013-07-11 07:47:05 +03:00
differentreality
750e31c11a
add option to pre register to events
2013-07-11 07:43:52 +03:00
Ancor Gonzalez Sosa
cb76a9b7cc
Speaker is displayed instead of submitter un public pages
2013-07-10 16:55:27 +02:00
Ancor Gonzalez Sosa
3a2bf49f97
Adding and removing people
2013-07-10 16:13:53 +02: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
a11d562dbd
Use gravatars, some schedule layout hacking
2013-06-19 16:06:34 +02:00
Henne Vogelsang
c2e007e2b8
Person.confirmed? isn't private, some schedule fixes
2013-06-19 14:29:14 +02:00
Henne Vogelsang
73013bd3e6
* Add ID and track to the event overview
...
* Get rid of the timezones in the schedule, need to deal with that on output
* Skip auth token verfiy on schedule updates
* Make it possible to withdraw confirmed submissions
* Show if people are not registerd
2013-06-14 13:17:40 +02:00
Henne Vogelsang
a3b6c479e9
Make it possible to uncancel events
2013-05-07 17:05:12 +02:00
Henne Vogelsang
178e584730
Fix confirming of proposals
2013-05-07 17:00:26 +02:00
Matt Barringer
78007a438c
Fix email bug
2013-02-18 20:36:21 +01: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
df0e75e03a
Fixing a few bugs
2013-02-12 19:17:19 +01:00
Matt Barringer
4b0887e0f3
Add IRC nick to the Person page
2013-02-11 18:10:43 +01:00
Matt Barringer
d7531d6d62
Fixing accept/reject email problem
2013-02-11 17:52:31 +01:00
Matt Barringer
077036d67c
Rename attending_social_events_with_partner
2013-02-06 20:26:41 +01:00
