From 8dba709ce1da0b655143a9f23c5138038f5f5ce0 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 10 Aug 2020 12:06:44 +0200 Subject: [PATCH 1/3] v0.5.15g - added https support --- skolehjem/app/Providers/AppServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/app/Providers/AppServiceProvider.php b/skolehjem/app/Providers/AppServiceProvider.php index ee8ca5b..448f4e8 100644 --- a/skolehjem/app/Providers/AppServiceProvider.php +++ b/skolehjem/app/Providers/AppServiceProvider.php @@ -23,6 +23,6 @@ class AppServiceProvider extends ServiceProvider */ public function boot() { - // + url()->forceScheme('https'); } } From bb1aade94788482356d04d772be1ed7378014c97 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 10 Aug 2020 12:07:41 +0200 Subject: [PATCH 2/3] v0.5.15h - Fixed bugs --- skolehjem/app/Http/Controllers/EventController.php | 4 ++-- .../migrations/2020_06_29_065007_create_contact.php | 2 +- skolehjem/database/seeds/ContactSeeder.php | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 48b316d..c6076ac 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -85,7 +85,7 @@ class EventController extends Controller $news->content = "

" . $this->closetags(substr($event->description, 0, 300)) . "

" . '
'. ' $event->id ]) .'">Tilmeld'. - ' $event->id ]) .'">Læs mere...'. + ' $event->id ]) .'">Læs mere'. ' $event->id ]) .'">Se deltagere'. '
'; $news->save(); @@ -182,7 +182,7 @@ class EventController extends Controller $news->content = "

" . $this->closetags(substr($event->description, 0, 300)). "

" . '
'. ' $event->id ]) .'">Tilmeld'. - ' $event->id ]) .'">Læs mere...'. + ' $event->id ]) .'">Læs mere'. ' $event->id ]) .'">Se deltagere'. '
'; $news->save(); diff --git a/skolehjem/database/migrations/2020_06_29_065007_create_contact.php b/skolehjem/database/migrations/2020_06_29_065007_create_contact.php index 50f79d3..4767e73 100644 --- a/skolehjem/database/migrations/2020_06_29_065007_create_contact.php +++ b/skolehjem/database/migrations/2020_06_29_065007_create_contact.php @@ -21,7 +21,7 @@ class CreateContact extends Migration $table->string('contactname', 255); $table->string('title', 255); $table->string('email', 255); - $table->integer('phone'); + $table->integer('phone')->nullable(true); $table->string('phonetimes'); }); } diff --git a/skolehjem/database/seeds/ContactSeeder.php b/skolehjem/database/seeds/ContactSeeder.php index b63d9e9..6324cf2 100644 --- a/skolehjem/database/seeds/ContactSeeder.php +++ b/skolehjem/database/seeds/ContactSeeder.php @@ -30,28 +30,28 @@ class ContactSeeder extends Seeder 'contactname' => "Thomas Thomsen", 'email' => "thth@sde.dk", 'title' => "Kollegieassistent", - 'phone' => "", + 'phone' => null, 'phonetimes' => "", ], [ 'contactname' => "Anja Holm Brix", 'email' => "ahb@sde.dk", 'title' => "Kollegieassistent", - 'phone' => "", + 'phone' => null, 'phonetimes' => "", ], [ 'contactname' => "Britta Overgaard Brink Olsen", 'email' => "brio@sde.dk", 'title' => "Kollegieassistent", - 'phone' => "", + 'phone' => null, 'phonetimes' => "", ], [ 'contactname' => "Jesper Sandberg", 'email' => "jesa@sde.dk", 'title' => "Kollegieassistent", - 'phone' => "", + 'phone' => null, 'phonetimes' => "", ], ]; From 50b495ee0135c834c6164868eab0027f03b1dd83 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 10 Aug 2020 12:14:09 +0200 Subject: [PATCH 3/3] v0.5.15i - Fixed bugs --- skolehjem/app/Http/Controllers/GuideController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skolehjem/app/Http/Controllers/GuideController.php b/skolehjem/app/Http/Controllers/GuideController.php index 1cec228..a4e25b1 100644 --- a/skolehjem/app/Http/Controllers/GuideController.php +++ b/skolehjem/app/Http/Controllers/GuideController.php @@ -77,7 +77,7 @@ class GuideController extends Controller $news->name = "Ny Vejledning"; $news->subname = $guide->name; - $news->content = $this->closetags(substr($guide->guide_articles, 0, 300)). '
$guide]). '" class="sde-blue ">Læse mere...'; + $news->content = $this->closetags(substr($guide->guide_articles, 0, 300)). '
$guide]). '" class="sde-blue ">Læs mere'; $news->save(); @@ -139,7 +139,7 @@ class GuideController extends Controller $news->name = "Vejledning opdateret"; $news->subname = $guidee->name; - $news->content = $this->closetags(substr($guidee->guide_articles, 0, 300)). '
$guide]). '" class="sde-blue ">Læse mere...'; + $news->content = $this->closetags(substr($guidee->guide_articles, 0, 300)). '
$guide]). '" class="sde-blue ">Læs mere'; $news->save(); }