From 44b1fae6ff034a06c712747abe02c3945ab09b63 Mon Sep 17 00:00:00 2001
From: Dave <aioslike@gmail.com>
Date: Mon, 20 Aug 2018 15:49:00 +0300
Subject: [PATCH 1/7] Fixed #919

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6ac9487ce..2e16495d1 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ SleepingOwl Admin is an administrative interface builder for Laravel.
 
  1. Require this package in your composer.json and run composer update:
 
-  	`composer require laravelrus/sleepingowl:5.6`
+  	`composer require laravelrus/sleepingowl:5.6.*`
     
 
  2. Run this command in the terminal (if you want to know more about what exactly this command does, see [install command documentation](https://en.sleepingowladmin.ru/docs/installation)):

From b2afc4be7700bbd4ca50b6f36f772e2fe57f6c91 Mon Sep 17 00:00:00 2001
From: Alexej <lunatik31@yandex.ru>
Date: Tue, 28 Aug 2018 14:49:03 +0300
Subject: [PATCH 2/7] Update header.blade.php

---
 resources/views/default/_partials/header.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/default/_partials/header.blade.php b/resources/views/default/_partials/header.blade.php
index c97875891..7958b04ce 100644
--- a/resources/views/default/_partials/header.blade.php
+++ b/resources/views/default/_partials/header.blade.php
@@ -8,6 +8,7 @@
 	<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
 		<span class="sr-only">Toggle navigation</span>
 	</a>
+	@stack('navbar.left')	
 	<div class="navbar-custom-menu">	
 		<ul class="nav navbar-nav">
 			@stack('navbar')

From 50c9de2f64aea404b6afdb2fb9111cd7799e84e4 Mon Sep 17 00:00:00 2001
From: SweetRewenge <sweetrewenge@yandex.ru>
Date: Wed, 5 Sep 2018 00:32:54 +0300
Subject: [PATCH 3/7] Update SelectOptionsFromModel.php

added field selection from the table for select
---
 src/Traits/SelectOptionsFromModel.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Traits/SelectOptionsFromModel.php b/src/Traits/SelectOptionsFromModel.php
index bf8e0c259..4d7b20b70 100644
--- a/src/Traits/SelectOptionsFromModel.php
+++ b/src/Traits/SelectOptionsFromModel.php
@@ -58,8 +58,12 @@ public function getModelForOptions()
      * @return $this
      * @throws SelectException
      */
-    public function setModelForOptions($modelForOptions)
+    public function setModelForOptions($modelForOptions, $display = null)
     {
+        if ($display){
+            $this->display = $display;    
+        }
+        
         if (is_string($modelForOptions)) {
             $modelForOptions = app($modelForOptions);
         }

From 5f9b6db31867c0b33890a784fa6f38d01ee73b3e Mon Sep 17 00:00:00 2001
From: SweetRewenge <sweetrewenge@yandex.ru>
Date: Wed, 5 Sep 2018 00:45:51 +0300
Subject: [PATCH 4/7] code style

---
 src/Traits/SelectOptionsFromModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Traits/SelectOptionsFromModel.php b/src/Traits/SelectOptionsFromModel.php
index 4d7b20b70..af6e33f15 100644
--- a/src/Traits/SelectOptionsFromModel.php
+++ b/src/Traits/SelectOptionsFromModel.php
@@ -60,7 +60,7 @@ public function getModelForOptions()
      */
     public function setModelForOptions($modelForOptions, $display = null)
     {
-        if ($display){
+        if ($display) {
             $this->display = $display;    
         }
         

From f123a9a346a1d627cf9e129721ab0a79d2dac262 Mon Sep 17 00:00:00 2001
From: Dave <aioslike@gmail.com>
Date: Wed, 5 Sep 2018 08:50:24 +0000
Subject: [PATCH 5/7] Apply fixes from StyleCI

---
 src/Traits/SelectOptionsFromModel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Traits/SelectOptionsFromModel.php b/src/Traits/SelectOptionsFromModel.php
index af6e33f15..d0f0e659a 100644
--- a/src/Traits/SelectOptionsFromModel.php
+++ b/src/Traits/SelectOptionsFromModel.php
@@ -61,9 +61,9 @@ public function getModelForOptions()
     public function setModelForOptions($modelForOptions, $display = null)
     {
         if ($display) {
-            $this->display = $display;    
+            $this->display = $display;
         }
-        
+
         if (is_string($modelForOptions)) {
             $modelForOptions = app($modelForOptions);
         }

From ac041dac5b26eb7296db74260d33d1c4a81a087a Mon Sep 17 00:00:00 2001
From: Alexey <butochnikov@gmail.com>
Date: Fri, 7 Sep 2018 18:01:39 +0300
Subject: [PATCH 6/7] Update composer.json

---
 composer.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index f797a30f4..973046a2d 100644
--- a/composer.json
+++ b/composer.json
@@ -62,8 +62,7 @@
     ]
   }, 
   "extra": {
-    "branch-alias": {
-      "dev-master": "5.6.x-latest",
+    "branch-alias": {      
       "dev-development": "5.6.x-dev"
     },
     "laravel": {

From 11a92a9facba35f4528e34c6c14a05d32425e030 Mon Sep 17 00:00:00 2001
From: Aios <aioslike@gmail.com>
Date: Thu, 13 Sep 2018 19:24:30 +0300
Subject: [PATCH 7/7] Fix laravel collective

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 973046a2d..845681b10 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
     "kodicomponents/support": "0.*",
     "kodicomponents/navigation": "0.*",
     "doctrine/dbal": "~2.3",
-    "laravelcollective/html": "5.5.*",
+    "laravelcollective/html": "5.5.* || 5.6.* || 5.7.*",
     "kodicms/laravel-assets": "0.*",
     "erusev/parsedown": "1.*",
     "davejamesmiller/laravel-breadcrumbs": "^3.0",