Skip to content
This repository has been archived by the owner on Dec 21, 2019. It is now read-only.

Commit

Permalink
Merge pull request #11 from dicarlosystems/master
Browse files Browse the repository at this point in the history
Updated to Laravel 5.5
Braunson authored Dec 31, 2017
2 parents 4f33233 + 43ebd97 commit 38699d5
Showing 6 changed files with 371 additions and 367 deletions.
3 changes: 2 additions & 1 deletion app/Console/Kernel.php
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class Kernel extends ConsoleKernel
* @var array
*/
protected $commands = [
//

];

/**
@@ -36,5 +36,6 @@ protected function schedule(Schedule $schedule)
protected function commands()
{
require base_path('routes/console.php');
$this->load(__DIR__.'/Commands');
}
}
19 changes: 8 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
@@ -8,15 +8,16 @@
"license": "MIT",
"type": "project",
"require": {
"php": ">=5.6.4",
"laravel/framework": "5.4.*",
"php": ">=7.0.0",
"laravel/framework": "5.5.*",
"laravel/tinker": "~1.0",
"mrholek/CoreUI-Free-Bootstrap-Admin-Template": "dev-24d9a64"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "^6.3.0"
"phpunit/phpunit": "~6.0",
"filp/whoops": "~2.0"
},
"repositories": [
{
@@ -53,14 +54,10 @@
"post-create-project-cmd": [
"php artisan key:generate"
],
"post-install-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postInstall",
"php artisan optimize"
],
"post-update-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postUpdate",
"php artisan optimize"
]
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover"
]
},
"config": {
"preferred-install": "dist",
4 changes: 2 additions & 2 deletions public/css/app.css

Large diffs are not rendered by default.

Binary file modified public/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
260 changes: 130 additions & 130 deletions public/js/app.js

Large diffs are not rendered by default.

452 changes: 229 additions & 223 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 38699d5

Please sign in to comment.