Merge branch 'master' into fixes

z-song · web-flow · commit 985d670bbe7e · 2018-04-24T19:53:10.000+08:00
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "~6.0",
-        "laravel/laravel": "5.*"
+        "laravel/laravel": "~5.5"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/BootExtension.php b/src/BootExtension.php
@@ -36,7 +36,7 @@ protected static function registerRoutes()
      */
     public static function import()
     {
-        parent::createMenu('Log Viewer', 'logs', 'fa-database');
+        parent::createMenu('Log viewer', 'logs', 'fa-database');
 
         parent::createPermission('Logs', 'ext.log-viewer', 'logs*');
     }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ protected static function registerRoutes()`
`36`	`36`	`*/`
`37`	`37`	`public static function import()`
`38`	`38`	`{`
`39`		`- parent::createMenu('Log Viewer', 'logs', 'fa-database');`
	`39`	`+ parent::createMenu('Log viewer', 'logs', 'fa-database');`
`40`	`40`
`41`	`41`	`parent::createPermission('Logs', 'ext.log-viewer', 'logs*');`
`42`	`42`	`}`