Commit graph

615 commits

Author SHA1 Message Date
Gopesh Tulsyan
f5c5e6a44b Adds photo to venue 2014-06-16 17:47:26 +05:30
Gopesh Tulsyan
b94ee7e758 cleaned venue controller update method 2014-06-16 17:47:26 +05:30
Christian Bruckmayer
7c35e39531 Merge pull request #238 from ChrisBr/instance_dashboard
Implements instance dashboard
2014-06-16 14:03:14 +02:00
Chrisbr
4abd5d2185 Implements instance dashboard 2014-06-16 13:51:43 +02:00
Christian Bruckmayer
61c066df87 Merge pull request #244 from ChrisBr/refactor_todo
Refactoring conference step by step list
2014-06-16 13:06:19 +02:00
Chrisbr
8f4b1a921f Refactoring conference step by step list 2014-06-16 12:05:53 +02:00
Stella Rouzi
24ac1778a5 Merge pull request #235 from differentreality/conference_show
Conference show
2014-06-13 16:57:38 +03:00
Stella Rouzi
16abe63418 Merge pull request #237 from differentreality/registrations_exports
fix filenames for export to pdf/xls
2014-06-13 15:09:55 +03:00
Christian Bruckmayer
9e250cba75 Merge pull request #224 from ChrisBr/add_color_to_event_type
Adds color to event types
2014-06-13 12:50:01 +02:00
Chrisbr
bf4758a54a Adds color to event types 2014-06-13 12:35:05 +02:00
Henne Vogelsang
e34a972b74 Merge pull request #236 from gopesht/fix_conference_show_spec
Fixed conference view spec, mismatched end
2014-06-13 11:58:27 +02:00
Stella Rouzi
6763f57a68 Merge pull request #230 from differentreality/cfp_weeks
change start_week.year to start_date.year
2014-06-13 12:40:18 +03:00
Stella Rouzi
dba8c9f569 fix filenames for export to pdf/xls 2014-06-13 12:12:17 +03:00
Stella Rouzi
668fe5f196 Add message when schedule is not ready 2014-06-13 11:49:09 +03:00
Stella Rouzi
9c0af1faf0 Move conference description in conference show, instead of program partial. 2014-06-13 11:49:09 +03:00
Stella Rouzi
dab9e1da51 show cfp partial only if @conference.call_for_papers is not nil 2014-06-13 11:49:09 +03:00
Stella Rouzi
93d7cdf840 Change wording and use unless instead of if 2014-06-13 11:34:02 +03:00
Stella Rouzi
b4db97cbb7 event[0].subtitle.blank? instead of .empty? because .blank? for nil is true but .empty? for nil is undefined method 2014-06-13 11:34:02 +03:00
Gopesh Tulsyan
d1d4ed4b75 Fixed conference view spec, mismatched end 2014-06-13 02:43:58 +05:30
James Mason
9b7925de6b Merge pull request #233 from gopesht/add_social_to_splash
Adds social media to splash
2014-06-12 14:00:49 -07:00
Gopesh Tulsyan
94b0dae1cc Adds social media to splash 2014-06-13 02:29:41 +05:30
James Mason
3b6fec9cfb Merge pull request #226 from gopesht/fix_social_media
Fixed description for social media
2014-06-12 13:41:00 -07:00
James Mason
8c285cc3fc Merge pull request #214 from gopesht/adds_sponsors_to_splash
Adds sponsors to splash
2014-06-12 13:38:20 -07:00
Gopesh Tulsyan
b67b21f023 Adds sponsors to splash 2014-06-13 01:40:59 +05:30
Gopesh Tulsyan
2c27119e8e Added sponsor description and email to conference 2014-06-13 01:34:17 +05:30
James Mason
f8ba5db48e Merge pull request #227 from gopesht/social_segment
Add social url to conference
2014-06-12 12:29:33 -07:00
Gopesh Tulsyan
6d2576421b Add social url to conference 2014-06-13 00:28:01 +05:30
James Mason
4e7dd5a8a7 Merge pull request #204 from gopesht/adds_sponsors
Adds sponsors
2014-06-12 11:46:37 -07:00
Stella Rouzi
960f271379 change start_week.year to start_date.year 2014-06-12 21:07:07 +03:00
Gopesh Tulsyan
67dab025a9 Sponsors dashboard
Removed explicit rendering of sponsors
2014-06-12 23:34:27 +05:30
Gopesh Tulsyan
e38a654af1 Adds sponsor model 2014-06-12 23:34:27 +05:30
James Mason
411deb4c65 Merge pull request #200 from gopesht/add_sponsorship_levels
Adds sponsorship levels
2014-06-12 11:02:35 -07:00
Gopesh Tulsyan
6193b623e6 Fixed description for social media 2014-06-12 23:29:34 +05:30
James Mason
ee655e09e8 Merge pull request #202 from gopesht/check_cfp
Check for cfp object before rendering partial
2014-06-12 10:14:06 -07:00
Gopesh Tulsyan
005bead45f Check for cfp object before rendering partial
Fixed horizontal overflow in splash due to cfp timer

Fixed condition for rendering cfp
2014-06-12 22:39:01 +05:30
Christian Bruckmayer
17427c88fe Merge pull request #221 from ChrisBr/bugfix_event
Bugfix events controller
2014-06-11 11:54:58 +02:00
Christian Bruckmayer
0b9b11cd44 Merge pull request #223 from ChrisBr/distribution_dashboard
Implements user and event state distribution
2014-06-11 11:53:38 +02:00
Chrisbr
b25ae50908 Implements user and event state distribution 2014-06-11 09:31:13 +02:00
Chrisbr
611c8b6e49 Bugfix events controller 2014-06-10 14:39:49 +02:00
Gopesh Tulsyan
f68ac7e032 Sponsorship level dashboard
removed donation amount
removed explicit rendering of sponsor levels
2014-06-06 15:40:33 +05:30
Gopesh Tulsyan
8bce579283 Adds sponsorship levels model 2014-06-06 15:40:32 +05:30
Christian Bruckmayer
069cc0eb4c Merge pull request #205 from ChrisBr/refactoring_event_state
Refactoring event states
2014-06-06 12:03:41 +02:00
Chrisbr
e5b588df81 Refactoring event states 2014-06-06 10:23:01 +02:00
James Mason
59ef642bc4 Merge pull request #199 from gopesht/fix_registration_component
Fix registration component
2014-06-05 07:39:21 -07:00
Gopesh Tulsyan
035acada24 Fix volunteers spec, failing test due zero in days 2014-06-05 12:05:05 +05:30
Gopesh Tulsyan
fd20e67c76 Modified rendering for registration dates in splash 2014-06-05 12:04:15 +05:30
Gopesh Tulsyan
f87cd94cb5 Added method registration_dates_given? 2014-06-04 23:55:02 +05:30
James Mason
a95a03c7e5 Merge pull request #198 from gopesht/fix_cfp_dates_rendering
Added check before rendering cfp dates
2014-06-04 11:01:58 -07:00
Christian Bruckmayer
8cc77338b5 Merge pull request #197 from ChrisBr/remove_cfp_harddeadline
Removes column hard_deadline from call for papers
2014-06-04 18:36:54 +02:00
Christian Bruckmayer
899b0cc710 Merge pull request #195 from ChrisBr/dashboard_tabs
Implements recent items tabs and top submitter for dashboard
2014-06-04 18:36:39 +02:00