Merge branch 'release/3.4.0'

* release/3.4.0: (24 commits) Bump version Update media manager config per austintoddj/easel#141 Updates require block Add composer.lock into repo Removed JsValidator alias Total downloads fix Update to total downloads badge Fix permissions Demo instructions update Fixed readme Move the demo copy WIP readme Cleanup code Fixed spacing Added live demo link with credentials Fix permissions Adds the Laravel Debugbar Demo instructions update Fixed readme Move the demo copy ...
austintoddj · Jun 29, 2017 · f6c8ec0 · f6c8ec0
2 parents 75dbb5e + 4d6b2f6
commit f6c8ec0
Show file tree

Hide file tree

Showing 71 changed files with 4,917 additions and 29 deletions.
diff --git a/.env.example b/.env.example
@@ -21,3 +21,5 @@ MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
 SCOUT_DRIVER=tntsearch
+
+MEDIA_MANAGER_ROUTE_PREFIX=/
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
@@ -20,7 +20,5 @@ phpunit.xml
 *.map
 
 config/blog.php
-composer.lock
-yarn.lock
 
 npm-debug.log
diff --git a/.styleci.yml b/.styleci.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
diff --git a/artisan b/artisan
diff --git a/bootstrap/app.php b/bootstrap/app.php
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore
diff --git a/composer.json b/composer.json
@@ -10,17 +10,18 @@
         }
     ],
     "require": {
-        "laravel/framework": "5.3.*",
-        "cnvs/easel": "3.3.*",
         "cnvs/paper-dark": "*",
         "doctrine/dbal": "2.5.*",
-        "fzaninotto/faker": "~1.4"
+        "fzaninotto/faker": "~1.4",
+        "cnvs/easel": "3.4.*",
+        "laravel/framework": "5.3.*",
+        "barryvdh/laravel-debugbar": "^2.3"
     },
     "require-dev": {
-        "mockery/mockery": "0.9.*",
         "phpunit/phpunit": "~5.0",
-        "symfony/css-selector": "~3.0",
-        "symfony/dom-crawler": "~3.0"
+        "mockery/mockery": "0.9.*",
+        "symfony/dom-crawler": "~3.0",
+        "symfony/css-selector": "~3.0"
     },
     "autoload": {
         "classmap": [
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,3 +21,5 @@ MAIL_PASSWORD=null
		MAIL_ENCRYPTION=null

		SCOUT_DRIVER=tntsearch

		MEDIA_MANAGER_ROUTE_PREFIX=/