Merge branch 'devel'

Author: rakieta2015

database/seeds/MenusTableSeeder.php

@@ -130,6 +130,14 @@ public function run()
         ]);
         $this->menuId = DB::getPdo()->lastInsertId();  //set menuId
         $this->insertLink('guest,user,admin', 'Dashboard', '/', 'cil-speedometer');
+        $this->beginDropdown('admin', 'Settings', 'cil-calculator');
+            $id = $this->insertLink('admin', 'Notes',                   '/notes');
+            $id = $this->insertLink('admin', 'Users',                   '/users');
+            $id = $this->insertLink('admin', 'Edit menu',               '/menu/menu');
+            $id = $this->insertLink('admin', 'Edit menu elements',      '/menu/element');
+            $id = $this->insertLink('admin', 'Edit roles',              '/roles');
+            $id = $this->insertLink('admin', 'Media',                   '/media');
+        $this->endDropdown();
         $this->insertLink('guest', 'Login', '/login', 'cil-account-logout');
         $this->insertLink('guest', 'Register', '/register', 'cil-account-logout');
         $this->insertTitle('user,admin', 'Theme');

public/mix-manifest.json

@@ -12,6 +12,7 @@
     "/js/coreui.bundle.min.js": "/js/coreui.bundle.min.js",
     "/js/Chart.min.js": "/js/Chart.min.js",
     "/js/coreui-chartjs.bundle.js": "/js/coreui-chartjs.bundle.js",
+    "/js/coreui-chartjs.js": "/js/coreui-chartjs.js",
     "/js/cropper.js": "/js/cropper.js",
     "/js/main.js": "/js/main.js",
     "/js/colors.js": "/js/colors.js",