From 4e80372ac69a593c53f047a53753cd8b0401cf71 Mon Sep 17 00:00:00 2001 From: AnkushMalik Date: Tue, 9 Jan 2018 17:21:14 +0530 Subject: [PATCH 1/6] Change paths of buttons on conference show page Update path of track submission btn to track#new and proposal submission to proposal#new Closes #1813 --- app/views/conferences/_call_for_papers.haml | 2 +- app/views/conferences/_call_for_tracks.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/conferences/_call_for_papers.haml b/app/views/conferences/_call_for_papers.haml index 3bf0f295..b47d7118 100644 --- a/app/views/conferences/_call_for_papers.haml +++ b/app/views/conferences/_call_for_papers.haml @@ -23,5 +23,5 @@ left! %p.cta-button = 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' diff --git a/app/views/conferences/_call_for_tracks.haml b/app/views/conferences/_call_for_tracks.haml index 7eb80fa6..6d78bd05 100644 --- a/app/views/conferences/_call_for_tracks.haml +++ b/app/views/conferences/_call_for_tracks.haml @@ -15,5 +15,5 @@ left! %p.cta-button = 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') From b7015b7d26f35af113a1d7c323a74ca3437fd000 Mon Sep 17 00:00:00 2001 From: Vincent Misson Date: Sat, 9 Dec 2017 01:00:16 +0100 Subject: [PATCH 2/6] Fix example file to work with docker mailhog Issue seems to be link with this commit : https://github.com/openSUSE/osem/commit/da735fe1c9b9e685cb9b87987f3048cfebbe7a3e More information here : https://github.com/openSUSE/osem/issues/1863 --- docker-compose.env.example | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.env.example b/docker-compose.env.example index 905ff612..14f35abd 100644 --- a/docker-compose.env.example +++ b/docker-compose.env.example @@ -32,9 +32,9 @@ SECRET_KEY_BASE=changemechangemechangeme" # you should comment out or remove the mailhog service from docker-compose.yml, # too OSEM_EMAIL_ADDRESS="osem@mailhog" -OSEM_SMTP_AUTHENTICATION="login" -OSEM_SMTP_ADDRESS="mailhog" -OSEM_SMTP_PORT="1025" +OSEM_SMTP_AUTHENTICATION=login +OSEM_SMTP_ADDRESS=mailhog +OSEM_SMTP_PORT=1025 OSEM_SMTP_USERNAME="mailhog" OSEM_SMTP_PASSWORD="mailhog" From f0a8f2b74c28a098715d2df3e1ab08354f88b94f Mon Sep 17 00:00:00 2001 From: Vincent Misson Date: Tue, 9 Jan 2018 10:25:39 +0100 Subject: [PATCH 3/6] Fix example file #update Remove only the quotes for OSEM_SMTP_PORT as it's an integer --- docker-compose.env.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.env.example b/docker-compose.env.example index 14f35abd..7bda181b 100644 --- a/docker-compose.env.example +++ b/docker-compose.env.example @@ -32,8 +32,8 @@ SECRET_KEY_BASE=changemechangemechangeme" # you should comment out or remove the mailhog service from docker-compose.yml, # too OSEM_EMAIL_ADDRESS="osem@mailhog" -OSEM_SMTP_AUTHENTICATION=login -OSEM_SMTP_ADDRESS=mailhog +OSEM_SMTP_AUTHENTICATION="login" +OSEM_SMTP_ADDRESS="mailhog" OSEM_SMTP_PORT=1025 OSEM_SMTP_USERNAME="mailhog" OSEM_SMTP_PASSWORD="mailhog" From e6be579566b40af87ce7731ed1072b519b38feb8 Mon Sep 17 00:00:00 2001 From: Marie-Elise Date: Mon, 8 Jan 2018 20:23:14 -0600 Subject: [PATCH 4/6] Updated user's booth edit path in booth#show file. --- app/views/booths/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/booths/show.html.haml b/app/views/booths/show.html.haml index 6b12229d..f1790504 100644 --- a/app/views/booths/show.html.haml +++ b/app/views/booths/show.html.haml @@ -6,7 +6,7 @@ = image_tag(@booth.picture.thumb.url, size: '20%', alt: '') = @booth.title .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 .col-md-12 From 0ee0da1898954da3825104ac36fee570a6b22f9f Mon Sep 17 00:00:00 2001 From: ViditChitkara Date: Wed, 10 Jan 2018 01:18:07 +0530 Subject: [PATCH 5/6] fixed venue updation error fixes #1952 --- app/views/admin/venues/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/venues/show.html.haml b/app/views/admin/venues/show.html.haml index b50c10da..36906e05 100644 --- a/app/views/admin/venues/show.html.haml +++ b/app/views/admin/venues/show.html.haml @@ -8,7 +8,7 @@ .row .col-md-6 - if @conference.venue.location? - = render '/conferences/venue_map' + = render '/conferences/venue_map', venue: @conference.venue -else - if @venue.commercial.nil? .row From 8e91f5194078f4c02bad52f68b1ed032a46778f1 Mon Sep 17 00:00:00 2001 From: Naman Gupta <01namangupta@gmail.com> Date: Thu, 11 Jan 2018 18:07:37 +0530 Subject: [PATCH 6/6] Removed .css from .css.scss from files which were causing deprecation warning --- .../stylesheets/{breakpoints.css.scss => breakpoints.scss} | 0 app/assets/stylesheets/{mastodon.css.scss => mastodon.scss} | 0 .../{osem-dashboard.css.scss => osem-dashboard.scss} | 2 +- app/assets/stylesheets/{osem-fonts.css.scss => osem-fonts.scss} | 0 .../stylesheets/{osem-navbar.css.scss => osem-navbar.scss} | 2 +- .../stylesheets/{osem-payments.css.scss => osem-payments.scss} | 0 .../stylesheets/{osem-rating.css.scss => osem-rating.scss} | 0 .../stylesheets/{osem-schedule.css.scss => osem-schedule.scss} | 0 .../stylesheets/{osem-splash.css.scss => osem-splash.scss} | 2 +- app/assets/stylesheets/{osem.css.scss => osem.scss} | 0 app/assets/stylesheets/{strap-on.css.scss => strap-on.scss} | 0 11 files changed, 3 insertions(+), 3 deletions(-) rename app/assets/stylesheets/{breakpoints.css.scss => breakpoints.scss} (100%) rename app/assets/stylesheets/{mastodon.css.scss => mastodon.scss} (100%) rename app/assets/stylesheets/{osem-dashboard.css.scss => osem-dashboard.scss} (96%) rename app/assets/stylesheets/{osem-fonts.css.scss => osem-fonts.scss} (100%) rename app/assets/stylesheets/{osem-navbar.css.scss => osem-navbar.scss} (96%) rename app/assets/stylesheets/{osem-payments.css.scss => osem-payments.scss} (100%) rename app/assets/stylesheets/{osem-rating.css.scss => osem-rating.scss} (100%) rename app/assets/stylesheets/{osem-schedule.css.scss => osem-schedule.scss} (100%) rename app/assets/stylesheets/{osem-splash.css.scss => osem-splash.scss} (99%) rename app/assets/stylesheets/{osem.css.scss => osem.scss} (100%) rename app/assets/stylesheets/{strap-on.css.scss => strap-on.scss} (100%) diff --git a/app/assets/stylesheets/breakpoints.css.scss b/app/assets/stylesheets/breakpoints.scss similarity index 100% rename from app/assets/stylesheets/breakpoints.css.scss rename to app/assets/stylesheets/breakpoints.scss diff --git a/app/assets/stylesheets/mastodon.css.scss b/app/assets/stylesheets/mastodon.scss similarity index 100% rename from app/assets/stylesheets/mastodon.css.scss rename to app/assets/stylesheets/mastodon.scss diff --git a/app/assets/stylesheets/osem-dashboard.css.scss b/app/assets/stylesheets/osem-dashboard.scss similarity index 96% rename from app/assets/stylesheets/osem-dashboard.css.scss rename to app/assets/stylesheets/osem-dashboard.scss index 5dc69879..b2d0d125 100644 --- a/app/assets/stylesheets/osem-dashboard.css.scss +++ b/app/assets/stylesheets/osem-dashboard.scss @@ -1,4 +1,4 @@ -@import "breakpoints.css.scss"; +@import "breakpoints.scss"; .dashbox span.fa { line-height: 1.1em; diff --git a/app/assets/stylesheets/osem-fonts.css.scss b/app/assets/stylesheets/osem-fonts.scss similarity index 100% rename from app/assets/stylesheets/osem-fonts.css.scss rename to app/assets/stylesheets/osem-fonts.scss diff --git a/app/assets/stylesheets/osem-navbar.css.scss b/app/assets/stylesheets/osem-navbar.scss similarity index 96% rename from app/assets/stylesheets/osem-navbar.css.scss rename to app/assets/stylesheets/osem-navbar.scss index bfaac9ac..011ebc89 100644 --- a/app/assets/stylesheets/osem-navbar.css.scss +++ b/app/assets/stylesheets/osem-navbar.scss @@ -1,4 +1,4 @@ -@import "breakpoints.css.scss"; +@import "breakpoints.scss"; .nav-osem { border: none; @include breakpoint(xs) { diff --git a/app/assets/stylesheets/osem-payments.css.scss b/app/assets/stylesheets/osem-payments.scss similarity index 100% rename from app/assets/stylesheets/osem-payments.css.scss rename to app/assets/stylesheets/osem-payments.scss diff --git a/app/assets/stylesheets/osem-rating.css.scss b/app/assets/stylesheets/osem-rating.scss similarity index 100% rename from app/assets/stylesheets/osem-rating.css.scss rename to app/assets/stylesheets/osem-rating.scss diff --git a/app/assets/stylesheets/osem-schedule.css.scss b/app/assets/stylesheets/osem-schedule.scss similarity index 100% rename from app/assets/stylesheets/osem-schedule.css.scss rename to app/assets/stylesheets/osem-schedule.scss diff --git a/app/assets/stylesheets/osem-splash.css.scss b/app/assets/stylesheets/osem-splash.scss similarity index 99% rename from app/assets/stylesheets/osem-splash.css.scss rename to app/assets/stylesheets/osem-splash.scss index 387dfc00..32cbb822 100644 --- a/app/assets/stylesheets/osem-splash.css.scss +++ b/app/assets/stylesheets/osem-splash.scss @@ -1,4 +1,4 @@ -@import "breakpoints.css.scss"; +@import "breakpoints.scss"; #splash { // Counter the general padding for #content diff --git a/app/assets/stylesheets/osem.css.scss b/app/assets/stylesheets/osem.scss similarity index 100% rename from app/assets/stylesheets/osem.css.scss rename to app/assets/stylesheets/osem.scss diff --git a/app/assets/stylesheets/strap-on.css.scss b/app/assets/stylesheets/strap-on.scss similarity index 100% rename from app/assets/stylesheets/strap-on.css.scss rename to app/assets/stylesheets/strap-on.scss