gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
636 commits 2 branches 2 tags 50 MiB
Commit graph

636 commits

This branch
This branch
All branches
Author SHA1 Message Date
James Mason
fbe97485e9 Allow Rails to serve static assets by default, in production mode... 
... in order to allow running successfully in production mode locally via
`rails s -e production`
 2014-06-17 10:57:16 -07:00
James Mason
a96c9fddaa Update awesome_nested_set 
The stable release of awesome_nested_set isn't compatible with Rails 4.1;
running in production mode errors out at init.

Issue 253 suggests resolving with 3.0.0 RC
https://github.com/collectiveidea/awesome_nested_set/issues/253
 2014-06-17 10:35:16 -07:00
James Mason
af7be2b295 Merge pull request #249 from gopesht/fix_tracks_alignment 
Tracks aligned based on count
 2014-06-17 08:52:53 -07:00
Gopesh Tulsyan
41920d9a3a Fix program rendering partial 2014-06-17 19:28:09 +05:30
Gopesh Tulsyan
75333d7c60 Tracks aligned based on count 2014-06-17 17:28:48 +05:30
Artem Chernikov
3cf41b51c2 Merge pull request #248 from openSUSE/review_140617_add_rubocop_config_to_ignore 
Do not add rubocop config
 2014-06-17 12:09:20 +02:00
Artem Chernikov
2dade4727c Do not add rubocop config 2014-06-17 10:50:46 +02:00
James Mason
f3a4200c14 Merge pull request #245 from gopesht/add_styling_to_splash 
Add styling to splash
 2014-06-16 11:59:41 -07:00
Gopesh Tulsyan
628f9438d9 changed if to unless in rendering css conditionally 2014-06-17 00:15:39 +05:30
Gopesh Tulsyan
bebcc5042a Dropped Js function for styling 2014-06-16 23:55:11 +05:30
Gopesh Tulsyan
8aab1d3655 Added basic styling for each component 2014-06-16 23:25:09 +05:30
Gopesh Tulsyan
ccf2d2361b Merge pull request #241 from gopesht/adds_lodgings_splash_view 
Adds lodgings splash view
 2014-06-16 23:23:12 +05:30
Gopesh Tulsyan
f9c4ff1d08 Changed description in lodgings controller and conference#edit 2014-06-16 22:59:21 +05:30
Gopesh Tulsyan
0b6b046016 Adds lodging splash view 
Check for venue photo before rendering
 2014-06-16 22:56:12 +05:30
Gopesh Tulsyan
01bd45a045 Adds website link to lodging 2014-06-16 22:56:12 +05:30
Gopesh Tulsyan
feabc3b954 Adds lodging description to conference 2014-06-16 22:56:12 +05:30
Gopesh Tulsyan
2a742e6d0a Merge pull request #194 from gopesht/add_lodging 
Lodging Dashboard
 2014-06-16 22:51:00 +05:30
Gopesh Tulsyan
6e08d637be Merge pull request #186 from gopesht/location_component 
Location component
 2014-06-16 22:11:14 +05:30
Gopesh Tulsyan
e494192ad2 Adds lodgings controller and view 2014-06-16 17:54:38 +05:30
Gopesh Tulsyan
029281a9ae Adds lodging model 2014-06-16 17:54:38 +05:30
Gopesh Tulsyan
f0b6c32a54 Location component splash view 2014-06-16 17:53:06 +05:30
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