From 6b11629c2192169cd1358b1181039b23c9454131 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 27 Feb 2019 11:19:31 +0200 Subject: [PATCH 01/25] composer require laravel 5.8 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 727194ae..3d72a2f6 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ ], "require": { "almasaeed2010/AdminLTE" : "2.4.*", - "laravel/framework": "5.6.*|5.7.*", + "laravel/framework": "5.6.*|5.7.*|5.8.*", "prologue/alerts": "^0.4.1", "jenssegers/date": "^3.2", "creativeorange/gravatar": "~1.0", From f2037cf08962542d131766524b47e143c6461dc3 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 27 Feb 2019 11:28:20 +0200 Subject: [PATCH 02/25] bumped tightenco/parental version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3d72a2f6..55c79153 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "prologue/alerts": "^0.4.1", "jenssegers/date": "^3.2", "creativeorange/gravatar": "~1.0", - "tightenco/parental": "0.5" + "tightenco/parental": "0.6" }, "require-dev": { "phpunit/phpunit": "~6.0", From a5eb3173179c910c69d38ca10867130692279bc3 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 27 Feb 2019 09:46:40 +0000 Subject: [PATCH 03/25] Apply fixes from StyleCI --- src/app/Models/BackpackUser.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/Models/BackpackUser.php b/src/app/Models/BackpackUser.php index a6c07a88..fe97e054 100644 --- a/src/app/Models/BackpackUser.php +++ b/src/app/Models/BackpackUser.php @@ -4,6 +4,7 @@ use App\User; use Backpack\Base\app\Notifications\ResetPasswordNotification as ResetPasswordNotification; + // use Tightenco\Parental\HasParentModel; class BackpackUser extends User From 634c244ac6cab31a9019fd59a042ebcbc088c300 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 27 Feb 2019 11:46:41 +0200 Subject: [PATCH 04/25] removed tightenco/parental requirement as its only actually used in permissionmanager --- composer.json | 3 +-- src/app/Models/BackpackUser.php | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 55c79153..685cad89 100644 --- a/composer.json +++ b/composer.json @@ -21,8 +21,7 @@ "laravel/framework": "5.6.*|5.7.*|5.8.*", "prologue/alerts": "^0.4.1", "jenssegers/date": "^3.2", - "creativeorange/gravatar": "~1.0", - "tightenco/parental": "0.6" + "creativeorange/gravatar": "~1.0" }, "require-dev": { "phpunit/phpunit": "~6.0", diff --git a/src/app/Models/BackpackUser.php b/src/app/Models/BackpackUser.php index 03735f88..a6c07a88 100644 --- a/src/app/Models/BackpackUser.php +++ b/src/app/Models/BackpackUser.php @@ -4,11 +4,11 @@ use App\User; use Backpack\Base\app\Notifications\ResetPasswordNotification as ResetPasswordNotification; -use Tightenco\Parental\HasParentModel; +// use Tightenco\Parental\HasParentModel; class BackpackUser extends User { - use HasParentModel; + // use HasParentModel; protected $table = 'users'; From 853d736abe575dbbf3393c2d7c934978f247c580 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 27 Feb 2019 12:16:21 +0200 Subject: [PATCH 05/25] removed jenssegers/date requirement since carbon 2 now offers proper localization --- composer.json | 1 - src/BaseServiceProvider.php | 2 -- src/config/backpack/base.php | 3 +-- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 685cad89..7bb4e10e 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,6 @@ "almasaeed2010/AdminLTE" : "2.4.*", "laravel/framework": "5.6.*|5.7.*|5.8.*", "prologue/alerts": "^0.4.1", - "jenssegers/date": "^3.2", "creativeorange/gravatar": "~1.0" }, "require-dev": { diff --git a/src/BaseServiceProvider.php b/src/BaseServiceProvider.php index 185b4525..e9930f7a 100644 --- a/src/BaseServiceProvider.php +++ b/src/BaseServiceProvider.php @@ -176,14 +176,12 @@ public function register() $this->loadHelpers(); // register its dependencies - $this->app->register(\Jenssegers\Date\DateServiceProvider::class); $this->app->register(\Prologue\Alerts\AlertsServiceProvider::class); $this->app->register(\Creativeorange\Gravatar\GravatarServiceProvider::class); // register their aliases $loader = \Illuminate\Foundation\AliasLoader::getInstance(); $loader->alias('Alert', \Prologue\Alerts\Facades\Alert::class); - $loader->alias('Date', \Jenssegers\Date\Date::class); $loader->alias('Gravatar', \Creativeorange\Gravatar\Facades\Gravatar::class); // register the services that are only used for development diff --git a/src/config/backpack/base.php b/src/config/backpack/base.php index 0ece3eed..d183b575 100644 --- a/src/config/backpack/base.php +++ b/src/config/backpack/base.php @@ -31,8 +31,7 @@ 'skin' => 'skin-purple', // Options: skin-black, skin-blue, skin-purple, skin-red, skin-yellow, skin-green, skin-blue-light, skin-black-light, skin-purple-light, skin-green-light, skin-red-light, skin-yellow-light - // Date & Datetime Format Syntax: https://github.com/jenssegers/date#usage - // (same as Carbon) + // Date & Datetime Format 'default_date_format' => 'j F Y', 'default_datetime_format' => 'j F Y H:i', From a448f648c994323b49a12582e8b39cfa268bbb63 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 27 Feb 2019 12:23:41 +0200 Subject: [PATCH 06/25] removed any trace of tightenco/parental --- src/app/Models/BackpackUser.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/app/Models/BackpackUser.php b/src/app/Models/BackpackUser.php index fe97e054..0adb2cc2 100644 --- a/src/app/Models/BackpackUser.php +++ b/src/app/Models/BackpackUser.php @@ -5,12 +5,8 @@ use App\User; use Backpack\Base\app\Notifications\ResetPasswordNotification as ResetPasswordNotification; -// use Tightenco\Parental\HasParentModel; - class BackpackUser extends User { - // use HasParentModel; - protected $table = 'users'; /** From 5d2e4ed8be075078a0428a502c6c0900507ef9b2 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 27 Feb 2019 12:26:15 +0200 Subject: [PATCH 07/25] removed unnecessary manual loading of providers and aliases in BaseServiceProvider --- src/BaseServiceProvider.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/BaseServiceProvider.php b/src/BaseServiceProvider.php index e9930f7a..d71ddd6e 100644 --- a/src/BaseServiceProvider.php +++ b/src/BaseServiceProvider.php @@ -175,15 +175,6 @@ public function register() // register the helper functions $this->loadHelpers(); - // register its dependencies - $this->app->register(\Prologue\Alerts\AlertsServiceProvider::class); - $this->app->register(\Creativeorange\Gravatar\GravatarServiceProvider::class); - - // register their aliases - $loader = \Illuminate\Foundation\AliasLoader::getInstance(); - $loader->alias('Alert', \Prologue\Alerts\Facades\Alert::class); - $loader->alias('Gravatar', \Creativeorange\Gravatar\Facades\Gravatar::class); - // register the services that are only used for development if ($this->app->environment() == 'local') { if (class_exists('Laracasts\Generators\GeneratorsServiceProvider')) { From e5c5de328f3e3380667072df83f66cd075d1360d Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 27 Feb 2019 14:29:40 +0200 Subject: [PATCH 08/25] date format is now in ISO format in config file --- src/config/backpack/base.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config/backpack/base.php b/src/config/backpack/base.php index d183b575..2cb69254 100644 --- a/src/config/backpack/base.php +++ b/src/config/backpack/base.php @@ -31,9 +31,9 @@ 'skin' => 'skin-purple', // Options: skin-black, skin-blue, skin-purple, skin-red, skin-yellow, skin-green, skin-blue-light, skin-black-light, skin-purple-light, skin-green-light, skin-red-light, skin-yellow-light - // Date & Datetime Format - 'default_date_format' => 'j F Y', - 'default_datetime_format' => 'j F Y H:i', + // Date & Datetime default formats (in ISO format, same as Carbon and Moment.js) + 'default_date_format' => 'Do MMMM YYYY', + 'default_datetime_format' => 'Do MMMM YYYY, HH:mm', // Content of the HTML meta robots tag to prevent indexing and link following 'meta_robots_content' => 'noindex, nofollow', From c34053a63342276e75f8f0fd35e672143f35b3a6 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 27 Feb 2019 15:08:07 +0200 Subject: [PATCH 09/25] forcing 2.4.9 version of adminlte in order to have bootstrap xss fix --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7bb4e10e..98128290 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "almasaeed2010/AdminLTE" : "2.4.*", + "almasaeed2010/AdminLTE" : "2.4.9^", "laravel/framework": "5.6.*|5.7.*|5.8.*", "prologue/alerts": "^0.4.1", "creativeorange/gravatar": "~1.0" From 6c825b3bbb72afe08003bafe5247e0faa962237c Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 27 Feb 2019 15:08:51 +0200 Subject: [PATCH 10/25] forcing 2.4.9 version of adminlte in order to have bootstrap xss fix --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 98128290..70efe112 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "almasaeed2010/AdminLTE" : "2.4.9^", + "almasaeed2010/AdminLTE" : "^2.4.9", "laravel/framework": "5.6.*|5.7.*|5.8.*", "prologue/alerts": "^0.4.1", "creativeorange/gravatar": "~1.0" From 9f77960940a0440c5bf0632b029ca52f4ead6d8e Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 27 Feb 2019 15:17:03 +0200 Subject: [PATCH 11/25] bumped adminlte version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 70efe112..99c24ded 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "almasaeed2010/AdminLTE" : "^2.4.9", + "almasaeed2010/AdminLTE" : ">=2.4.9", "laravel/framework": "5.6.*|5.7.*|5.8.*", "prologue/alerts": "^0.4.1", "creativeorange/gravatar": "~1.0" From aa1a43cc99a56f736e9dc2dc97d74dc633657cd2 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 27 Feb 2019 15:19:22 +0200 Subject: [PATCH 12/25] adminlte req --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 99c24ded..7c50f591 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "almasaeed2010/AdminLTE" : ">=2.4.9", + "almasaeed2010/adminlte" : "~2.4", "laravel/framework": "5.6.*|5.7.*|5.8.*", "prologue/alerts": "^0.4.1", "creativeorange/gravatar": "~1.0" From e51db260a3fc779577d64c664685a481aa32e124 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 27 Feb 2019 18:58:38 +0200 Subject: [PATCH 13/25] added InheritsRelationFromParentModel trait --- src/app/Models/BackpackUser.php | 3 + .../InheritsRelationsFromParentModel.php | 87 +++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 src/app/Models/Traits/InheritsRelationsFromParentModel.php diff --git a/src/app/Models/BackpackUser.php b/src/app/Models/BackpackUser.php index 0adb2cc2..6648d1ab 100644 --- a/src/app/Models/BackpackUser.php +++ b/src/app/Models/BackpackUser.php @@ -4,9 +4,12 @@ use App\User; use Backpack\Base\app\Notifications\ResetPasswordNotification as ResetPasswordNotification; +use Backpack\Base\app\Models\Traits\InheritsRelationsFromParentModel; class BackpackUser extends User { + use InheritsRelationsFromParentModel; + protected $table = 'users'; /** diff --git a/src/app/Models/Traits/InheritsRelationsFromParentModel.php b/src/app/Models/Traits/InheritsRelationsFromParentModel.php new file mode 100644 index 00000000..6a70ab4e --- /dev/null +++ b/src/app/Models/Traits/InheritsRelationsFromParentModel.php @@ -0,0 +1,87 @@ +parentHasHasChildrenTrait()) { + $model->forceFill( + [$model->getInheritanceColumn() => $model->classToAlias(get_class($model))] + ); + } + }); + static::addGlobalScope(function ($query) { + $instance = new static; + if ($instance->parentHasHasChildrenTrait()) { + $query->where($instance->getInheritanceColumn(), $instance->classToAlias(get_class($instance))); + } + }); + } + + public function parentHasHasChildrenTrait() + { + return $this->hasChildren ?? false; + } + + public function getTable() + { + if (! isset($this->table)) { + return str_replace('\\', '', Str::snake(Str::plural(class_basename($this->getParentClass())))); + } + return $this->table; + } + + public function getForeignKey() + { + return Str::snake(class_basename($this->getParentClass())).'_'.$this->primaryKey; + } + + public function joiningTable($related, $instance = null) + { + $relatedClassName = method_exists((new $related), 'getClassNameForRelationships') + ? (new $related)->getClassNameForRelationships() + : class_basename($related); + $models = [ + Str::snake($relatedClassName), + Str::snake($this->getClassNameForRelationships()), + ]; + sort($models); + return strtolower(implode('_', $models)); + } + + public function getClassNameForRelationships() + { + return class_basename($this->getParentClass()); + } + + public function getMorphClass() + { + if ($this->parentHasHasChildrenTrait()) { + $parentClass = $this->getParentClass(); + return (new $parentClass)->getMorphClass(); + } + return parent::getMorphClass(); + } + + protected function getParentClass() + { + static $parentClassName; + return $parentClassName ?: $parentClassName = (new ReflectionClass($this))->getParentClass()->getName(); + } +} \ No newline at end of file From 671cde2661ac26f4512f4ae7e57d5bcf1a3184f1 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 27 Feb 2019 16:58:55 +0000 Subject: [PATCH 14/25] Apply fixes from StyleCI --- src/app/Models/BackpackUser.php | 2 +- .../Traits/InheritsRelationsFromParentModel.php | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/app/Models/BackpackUser.php b/src/app/Models/BackpackUser.php index 6648d1ab..39a66313 100644 --- a/src/app/Models/BackpackUser.php +++ b/src/app/Models/BackpackUser.php @@ -3,8 +3,8 @@ namespace Backpack\Base\app\Models; use App\User; -use Backpack\Base\app\Notifications\ResetPasswordNotification as ResetPasswordNotification; use Backpack\Base\app\Models\Traits\InheritsRelationsFromParentModel; +use Backpack\Base\app\Notifications\ResetPasswordNotification as ResetPasswordNotification; class BackpackUser extends User { diff --git a/src/app/Models/Traits/InheritsRelationsFromParentModel.php b/src/app/Models/Traits/InheritsRelationsFromParentModel.php index 6a70ab4e..bb493ea5 100644 --- a/src/app/Models/Traits/InheritsRelationsFromParentModel.php +++ b/src/app/Models/Traits/InheritsRelationsFromParentModel.php @@ -27,7 +27,7 @@ public static function bootHasParent() } }); static::addGlobalScope(function ($query) { - $instance = new static; + $instance = new static(); if ($instance->parentHasHasChildrenTrait()) { $query->where($instance->getInheritanceColumn(), $instance->classToAlias(get_class($instance))); } @@ -41,9 +41,10 @@ public function parentHasHasChildrenTrait() public function getTable() { - if (! isset($this->table)) { + if (!isset($this->table)) { return str_replace('\\', '', Str::snake(Str::plural(class_basename($this->getParentClass())))); } + return $this->table; } @@ -54,14 +55,15 @@ public function getForeignKey() public function joiningTable($related, $instance = null) { - $relatedClassName = method_exists((new $related), 'getClassNameForRelationships') - ? (new $related)->getClassNameForRelationships() + $relatedClassName = method_exists((new $related()), 'getClassNameForRelationships') + ? (new $related())->getClassNameForRelationships() : class_basename($related); $models = [ Str::snake($relatedClassName), Str::snake($this->getClassNameForRelationships()), ]; sort($models); + return strtolower(implode('_', $models)); } @@ -74,14 +76,17 @@ public function getMorphClass() { if ($this->parentHasHasChildrenTrait()) { $parentClass = $this->getParentClass(); - return (new $parentClass)->getMorphClass(); + + return (new $parentClass())->getMorphClass(); } + return parent::getMorphClass(); } protected function getParentClass() { static $parentClassName; + return $parentClassName ?: $parentClassName = (new ReflectionClass($this))->getParentClass()->getName(); } -} \ No newline at end of file +} From 3ba41156e27159cf7ccb25f166f3ee2d3b3023c1 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Thu, 28 Feb 2019 09:31:58 +0200 Subject: [PATCH 15/25] bumped adminlte requirement --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7c50f591..8bb7dba0 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "almasaeed2010/adminlte" : "~2.4", + "almasaeed2010/adminlte" : ">=2.4.9", "laravel/framework": "5.6.*|5.7.*|5.8.*", "prologue/alerts": "^0.4.1", "creativeorange/gravatar": "~1.0" From 99f1691feaa0f2cd78ccb26d1c5fea8d97e0c6cb Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Thu, 28 Feb 2019 10:29:32 +0200 Subject: [PATCH 16/25] roll back adminlte to previous version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8bb7dba0..7c50f591 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "almasaeed2010/adminlte" : ">=2.4.9", + "almasaeed2010/adminlte" : "~2.4", "laravel/framework": "5.6.*|5.7.*|5.8.*", "prologue/alerts": "^0.4.1", "creativeorange/gravatar": "~1.0" From 9816aec6dc1b22fa59dc01458471fa56ff4e8e0a Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Thu, 28 Feb 2019 10:41:02 +0200 Subject: [PATCH 17/25] re-requiring tightenco/parental --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7c50f591..5142f83a 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,8 @@ "almasaeed2010/adminlte" : "~2.4", "laravel/framework": "5.6.*|5.7.*|5.8.*", "prologue/alerts": "^0.4.1", - "creativeorange/gravatar": "~1.0" + "creativeorange/gravatar": "~1.0", + "tightenco/parental": "^0.6.1" }, "require-dev": { "phpunit/phpunit": "~6.0", From a7b73e247e5da241b8dc7cfbae22656d66aeb61f Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Thu, 28 Feb 2019 10:43:21 +0200 Subject: [PATCH 18/25] removed tightenco/parental dependency; AGAIN --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 5142f83a..7c50f591 100644 --- a/composer.json +++ b/composer.json @@ -20,8 +20,7 @@ "almasaeed2010/adminlte" : "~2.4", "laravel/framework": "5.6.*|5.7.*|5.8.*", "prologue/alerts": "^0.4.1", - "creativeorange/gravatar": "~1.0", - "tightenco/parental": "^0.6.1" + "creativeorange/gravatar": "~1.0" }, "require-dev": { "phpunit/phpunit": "~6.0", From f8da6705fea90e34b65df4877946129a69bb8915 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Thu, 28 Feb 2019 11:06:49 +0200 Subject: [PATCH 19/25] when publishing backpackuser model only replace the namespace --- src/app/Console/Commands/PublishBackpackUserModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/Console/Commands/PublishBackpackUserModel.php b/src/app/Console/Commands/PublishBackpackUserModel.php index b8c0eda6..4deba25a 100644 --- a/src/app/Console/Commands/PublishBackpackUserModel.php +++ b/src/app/Console/Commands/PublishBackpackUserModel.php @@ -77,7 +77,7 @@ protected function buildClass($name = false) */ protected function makeReplacements(&$stub) { - $stub = str_replace('Backpack\Base\app\Models', $this->laravel->getNamespace().'Models', $stub); + $stub = str_replace('Backpack\Base\app\Models;', $this->laravel->getNamespace().'Models;', $stub); if (!$this->files->exists($this->laravel['path'].'/User.php') && $this->files->exists($this->laravel['path'].'/Models/User.php')) { $stub = str_replace($this->laravel->getNamespace().'User', $this->laravel->getNamespace().'Models\User', $stub); From ff3a092c0ecec322809e8780a99421b572699168 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Thu, 28 Feb 2019 11:13:51 +0200 Subject: [PATCH 20/25] upgrade bootstrap through CDN --- src/resources/views/inc/head.blade.php | 4 ++-- src/resources/views/inc/scripts.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/resources/views/inc/head.blade.php b/src/resources/views/inc/head.blade.php index a5216926..1e75e86a 100644 --- a/src/resources/views/inc/head.blade.php +++ b/src/resources/views/inc/head.blade.php @@ -16,8 +16,8 @@ @stack('before_styles') - - + + diff --git a/src/resources/views/inc/scripts.blade.php b/src/resources/views/inc/scripts.blade.php index 470bfd34..4b4e1772 100644 --- a/src/resources/views/inc/scripts.blade.php +++ b/src/resources/views/inc/scripts.blade.php @@ -3,8 +3,8 @@ {{-- --}} - - + + {{-- --}} From 044293a48bfd13fceace20b737c53fea21e57beb Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Thu, 28 Feb 2019 11:47:45 +0200 Subject: [PATCH 21/25] dropped support for laravel 5.6 and 5.7 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7c50f591..7a165d99 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ ], "require": { "almasaeed2010/adminlte" : "~2.4", - "laravel/framework": "5.6.*|5.7.*|5.8.*", + "laravel/framework": "5.8.*", "prologue/alerts": "^0.4.1", "creativeorange/gravatar": "~1.0" }, From b50e130362971441cf31833517c65267a26ee270 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Fri, 1 Mar 2019 08:23:23 +0200 Subject: [PATCH 22/25] added jenssegers/date dependency back --- composer.json | 7 ++++--- src/config/backpack/base.php | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 7a165d99..8e18684e 100644 --- a/composer.json +++ b/composer.json @@ -17,10 +17,11 @@ } ], "require": { - "almasaeed2010/adminlte" : "~2.4", - "laravel/framework": "5.8.*", + "almasaeed2010/adminlte" : "2.4.*", + "laravel/framework": "5.6.*|5.7.*|5.8.*", "prologue/alerts": "^0.4.1", - "creativeorange/gravatar": "~1.0" + "creativeorange/gravatar": "~1.0", + "jenssegers/date": "^3.2" }, "require-dev": { "phpunit/phpunit": "~6.0", diff --git a/src/config/backpack/base.php b/src/config/backpack/base.php index 2cb69254..06a40c69 100644 --- a/src/config/backpack/base.php +++ b/src/config/backpack/base.php @@ -31,9 +31,9 @@ 'skin' => 'skin-purple', // Options: skin-black, skin-blue, skin-purple, skin-red, skin-yellow, skin-green, skin-blue-light, skin-black-light, skin-purple-light, skin-green-light, skin-red-light, skin-yellow-light - // Date & Datetime default formats (in ISO format, same as Carbon and Moment.js) - 'default_date_format' => 'Do MMMM YYYY', - 'default_datetime_format' => 'Do MMMM YYYY, HH:mm', + // Date & Datetime Format Syntax: https://github.com/jenssegers/date#usage + 'default_date_format' => 'j F Y', + 'default_datetime_format' => 'j F Y H:i', // Content of the HTML meta robots tag to prevent indexing and link following 'meta_robots_content' => 'noindex, nofollow', From f8f43a8067d051d19cdffbc25e423f11c97924ad Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Fri, 1 Mar 2019 08:38:06 +0200 Subject: [PATCH 23/25] req in the right place --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 8e18684e..51d925e7 100644 --- a/composer.json +++ b/composer.json @@ -20,8 +20,8 @@ "almasaeed2010/adminlte" : "2.4.*", "laravel/framework": "5.6.*|5.7.*|5.8.*", "prologue/alerts": "^0.4.1", - "creativeorange/gravatar": "~1.0", - "jenssegers/date": "^3.2" + "jenssegers/date": "^3.2", + "creativeorange/gravatar": "~1.0" }, "require-dev": { "phpunit/phpunit": "~6.0", From 35b2e41d1bcb809ac97334196e42f3b86fbea004 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Fri, 1 Mar 2019 09:10:36 +0200 Subject: [PATCH 24/25] changelog --- CHANGELOG.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72b4d064..064763a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,30 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip ------- +## [1.1.0] - 2019-03-01 + +### Added +- Laravel 5.8 support; + +### Fixed +- Bootstrap was forced to upgrade to 3.4.1 by using a CDN, so that everyone gets the new XSS security vulnerability fix, and the upgrade process is smooth; + +### Removed +- ```Tightenco\Parental``` dependency; the trait we were using is now included as ```Backpack\Base\app\Models\Traits\InheritsRelationsFromParentModel;```; + +**Upgrade guide:** +- Upgrade to Laravel 5.8 or do ```composer require backpack/base:"1.1.*" +- in your ```App\Models\BackpackUser``` instead of ```Tightenco\Parental\HasParent```, please use ```Backpack\Base\app\Models\Traits\InheritsRelationsFromParentModel```; [here's the diff](https://github.com/Laravel-Backpack/Base/pull/362/files#diff-f075b83ebb2b1ef3ba84dec14b395607); +- if you've overwritten ```inc/head.blade.php``` or ```inc/scripts.blade.php```, please make sure you [use the newest version of Bootstrap](https://github.com/Laravel-Backpack/Base/pull/362/files#diff-96ac3ea4d0cb85053acf44e3772eb5f1); they've fixed a security vulnerability (XSS); + + +---- + +## [1.0.4] - 2018-12-10 + +### Fixed +- Portuguese translation; + ## [1.0.4] - 2018-12-10 From a7489e62722303189c4bcf10f9bd3c6b8bf0a782 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Fri, 1 Mar 2019 09:11:22 +0200 Subject: [PATCH 25/25] changelog --- CHANGELOG.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 064763a5..f9126072 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,12 +48,6 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip - Portuguese translation; -## [1.0.4] - 2018-12-10 - -### Fixed -- Portuguese translation; - - ## [1.0.3] - 2018-12-06 ### Added