gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into SCSS_deprecation_warning

Browse source
This commit is contained in:
James Mason 2018-01-11 11:17:51 -08:00 • committed by GitHub
commit 5aad4f476f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/venues/show.html.haml
View file

@ -8,7 +8,7 @@
.row .row
.col-md-6 .col-md-6
- if @conference.venue.location? - if @conference.venue.location?
= render '/conferences/venue_map' = render '/conferences/venue_map', venue: @conference.venue
-else -else
- if @venue.commercial.nil? - if @venue.commercial.nil?
.row .row

2
app/views/booths/show.html.haml
View file

@ -6,7 +6,7 @@
= image_tag(@booth.picture.thumb.url, size: '20%', alt: '') = image_tag(@booth.picture.thumb.url, size: '20%', alt: '')
= @booth.title = @booth.title
.btn-group.pull-right .btn-group.pull-right
= link_to 'Edit', edit_admin_conference_booth_path(@conference.short_title, @booth), class: 'btn btn-mini btn-primary' = link_to 'Edit', edit_conference_booth_path(@conference.short_title, @booth), class: 'btn btn-mini btn-primary'
.row .row
.col-md-12 .col-md-12

2
app/views/conferences/_call_for_papers.haml
View file

@ -23,5 +23,5 @@
left! left!
%p.cta-button %p.cta-button
= link_to "Submit your proposal now", = link_to "Submit your proposal now",
conference_program_proposals_path(conference_id), new_conference_program_proposal_path(conference_id),
class: 'btn btn-success btn-lg text-center' class: 'btn btn-success btn-lg text-center'

2
app/views/conferences/_call_for_tracks.haml
View file

@ -15,5 +15,5 @@
left! left!
%p.cta-button %p.cta-button
= link_to("Submit your request for track", = link_to("Submit your request for track",
conference_program_tracks_path(conference_id), new_conference_program_track_path(conference_id),
class: 'btn btn-success btn-lg text-center') class: 'btn btn-success btn-lg text-center')

2
docker-compose.env.example
View file

@ -34,7 +34,7 @@ SECRET_KEY_BASE=changemechangemechangeme"
OSEM_EMAIL_ADDRESS="osem@mailhog" OSEM_EMAIL_ADDRESS="osem@mailhog"
OSEM_SMTP_AUTHENTICATION="login" OSEM_SMTP_AUTHENTICATION="login"
OSEM_SMTP_ADDRESS="mailhog" OSEM_SMTP_ADDRESS="mailhog"
OSEM_SMTP_PORT="1025" OSEM_SMTP_PORT=1025
OSEM_SMTP_USERNAME="mailhog" OSEM_SMTP_USERNAME="mailhog"
OSEM_SMTP_PASSWORD="mailhog" OSEM_SMTP_PASSWORD="mailhog"