From a06930f5405f8e22832460fb1f6cb928468c9014 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 1 Mar 2019 12:16:51 +0800 Subject: [PATCH 1/3] update to laravel 5.7 --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 6b9a75c..16413f8 100644 --- a/composer.json +++ b/composer.json @@ -6,17 +6,17 @@ "type": "project", "require": { "php": "^7.1.3", - "fideloper/proxy": "^4.0", - "laravel/framework": "5.6.*", - "laravel/tinker": "^1.0", - "mrholek/CoreUI-Free-Bootstrap-Admin-Template": "dev-24d9a64" + "fideloper/proxy": "*", + "laravel/framework": "5.7.*", + "laravel/tinker": "*", + "mrholek/coreui-free-bootstrap-admin-template": "*" }, "require-dev": { - "filp/whoops": "^2.0", - "fzaninotto/faker": "^1.4", - "mockery/mockery": "^1.0", - "nunomaduro/collision": "^2.0", - "phpunit/phpunit": "^7.0" + "filp/whoops": "*", + "fzaninotto/faker": "*", + "mockery/mockery": "*", + "nunomaduro/collision": "*", + "phpunit/phpunit": "*" }, "repositories": [ { From b4bcb580d32a78cff5dbd02362ab8e024736aa91 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 1 Mar 2019 12:20:47 +0800 Subject: [PATCH 2/3] and update readme to match --- readme.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/readme.md b/readme.md index 261bfdd..ab6f58d 100644 --- a/readme.md +++ b/readme.md @@ -1,20 +1,16 @@ -# Laravel 5.6 + CoreUI Admin Bootstrap Template VueJS - +# Laravel 5.7 + CoreUI Admin Bootstrap Template VueJS ## What is this? -A clean install of Laravel 5.5 with the [CoreUI Full Bootstrap Admin Template VueJS Version](https://github.com/mrholek/CoreUI-Free-Bootstrap-Admin-Template) added in. This implementation is nowhere near to perfect but it's a working start. Pull Requests are welcome! - +A clean install of Laravel 5.7 with the [CoreUI Full Bootstrap Admin Template VueJS Version](https://github.com/mrholek/CoreUI-Free-Bootstrap-Admin-Template) added in. This implementation is nowhere near to perfect but it's a working start. Pull Requests are welcome! ## What's it look like? [Here's a demo of the CoreUI theme running.](https://coreui.io/demo/) - ## Getting Started -If your here, you most likely know what Laravel is and hopefully how to get up and running with it. If not, [click here to check the docs on getting up and running](https://laravel.com/docs/5.6/). Also [Laracasts](https://laracasts.com) is a fantastic resource for getting up to speed with everything Laravel from pretty much any version. - +If your here, you most likely know what Laravel is and hopefully how to get up and running with it. If not, [click here to check the docs on getting up and running](https://laravel.com/docs/5.7/). Also [Laracasts](https://laracasts.com) is a fantastic resource for getting up to speed with everything Laravel from pretty much any version. ## Head Up From 9f3ccd68ed403efc02f17fd8dbb129b6df5081c2 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 1 Mar 2019 12:36:27 +0800 Subject: [PATCH 3/3] update to v2.1.12 of coreui-free-bootstrap-admin-template --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 16413f8..f57a61f 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "fideloper/proxy": "*", "laravel/framework": "5.7.*", "laravel/tinker": "*", - "mrholek/coreui-free-bootstrap-admin-template": "*" + "mrholek/coreui-free-bootstrap-admin-template": "2.1.12" }, "require-dev": { "filp/whoops": "*", @@ -23,11 +23,11 @@ "type": "package", "package": { "name": "mrholek/coreui-free-bootstrap-admin-template", - "version": "dev-24d9a64", + "version": "v2.1.12", "source": { "url": "https://github.com/coreui/coreui-free-bootstrap-admin-template.git", "type": "git", - "reference": "24d9a64" + "reference": "07e8192" } }