Merge branch 'development' into 'master'

Development See merge request nexus/laravel!2

Merge branch 'development' into 'master'
Development See merge request nexus/laravel!2
c6f2b704 · Marco Schmiedel · fe091835 · c9ab0d82 · c6f2b704 · c6f2b704
Commit c6f2b704 authored Jan 19, 2020 by Marco Schmiedel
87 changed files
--- a/.editorconfig
+++ b/.editorconfig
--- a/.env.example
+++ b/.env.example
--- a/.gitattributes
+++ b/.gitattributes
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
+composer.lock
--- a/.styleci.yml
+++ b/.styleci.yml
--- a/README.md
+++ b/README.md
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
--- a/app/Http/Controllers/Auth/ConfirmPasswordController.php
+++ b/app/Http/Controllers/Auth/ConfirmPasswordController.php
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
--- a/app/Http/Controllers/Auth/VerificationController.php
+++ b/app/Http/Controllers/Auth/VerificationController.php
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
--- a/app/Http/Middleware/CheckForMaintenanceMode.php
+++ b/app/Http/Middleware/CheckForMaintenanceMode.php
--- a/app/Http/Middleware/EncryptCookies.php
+++ b/app/Http/Middleware/EncryptCookies.php
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
--- a/app/Http/Middleware/TrimStrings.php
+++ b/app/Http/Middleware/TrimStrings.php
--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
--- a/app/Http/Middleware/VerifyCsrfToken.php
+++ b/app/Http/Middleware/VerifyCsrfToken.php
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
--- a/app/Providers/BroadcastServiceProvider.php
+++ b/app/Providers/BroadcastServiceProvider.php
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
--- a/app/User.php
+++ b/app/User.php
--- a/artisan
+++ b/artisan
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
--- a/bootstrap/cache/.gitignore
+++ b/bootstrap/cache/.gitignore
--- a/composer.json
+++ b/composer.json
 {
-    "name": "laravel/laravel",
+   "name":"laravel/laravel",
-    "type": "project",
+   "type":"project",
-    "description": "The Laravel Framework.",
+   "description":"The Laravel Framework.",
-    "keywords": [
+   "keywords":[
      "framework",
      "laravel"
   ],
-    "license": "MIT",
+   "license":"MIT",
-    "require": {
+   "require":{
-        "php": "^7.2",
+      "php":"^7.2",
-        "fideloper/proxy": "^4.0",
+      "fideloper/proxy":"^4.0",
-        "laravel/framework": "^6.2",
+      "laravel/framework":"^6.2",
-        "laravel/tinker": "^2.0"
+      "laravel/tinker":"^2.0",
-    },
+      "nexus/ninox":"dev-master"
-    "require-dev": {
+   },
-        "facade/ignition": "^1.4",
+   "require-dev":{
-        "fzaninotto/faker": "^1.4",
+      "facade/ignition":"^1.4",
-        "mockery/mockery": "^1.0",
+      "fzaninotto/faker":"^1.4",
-        "nunomaduro/collision": "^3.0",
+      "mockery/mockery":"^1.0",
-        "phpunit/phpunit": "^8.0"
+      "nunomaduro/collision":"^3.0",
-    },
+      "phpunit/phpunit":"^8.0"
-    "config": {
+   },
-        "optimize-autoloader": true,
+   "config":{
-        "preferred-install": "dist",
+      "optimize-autoloader":true,
-        "sort-packages": true
+      "preferred-install":"dist",
-    },
+      "sort-packages":true
-    "extra": {
+   },
-        "laravel": {
+   "extra":{
-            "dont-discover": []
+      "laravel":{
+         "dont-discover":[
+         ]
      }
   },
-    "autoload": {
+   "autoload":{
-        "psr-4": {
+      "psr-4":{
-            "App\\": "app/"
+         "App\\":"app/"
      },
-        "classmap": [
+      "classmap":[
         "database/seeds",
         "database/factories"
      ]
   },
-    "autoload-dev": {
+   "autoload-dev":{
-        "psr-4": {
+      "psr-4":{
-            "Tests\\": "tests/"
+         "Tests\\":"tests/"
      }
   },
-    "minimum-stability": "dev",
+   "minimum-stability":"dev",
-    "prefer-stable": true,
+   "prefer-stable":true,
-    "scripts": {
+   "scripts":{
-        "post-autoload-dump": [
+      "post-autoload-dump":[
         "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
         "@php artisan package:discover --ansi"
      ],
-        "post-root-package-install": [
+      "post-root-package-install":[
         "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
      ],
-        "post-create-project-cmd": [
+      "post-create-project-cmd":[
         "@php artisan key:generate --ansi"
      ]
+   },
+   "repositories":[
+      {
+         "type":"git",
+         "url":"git@gitlab.bugsmasher.online:nexus/packages/ninox-api.git"
      }
+   ]
 }
--- a/composer.lock
+++ b/composer.lock
--- a/config/app.php
+++ b/config/app.php
--- a/config/auth.php
+++ b/config/auth.php
--- a/config/broadcasting.php
+++ b/config/broadcasting.php
--- a/config/cache.php
+++ b/config/cache.php
@@ -18,7 +18,7 @@ return [
    |
    */
-    'default' => env('CACHE_DRIVER', 'file'),
+    'default' => env('CACHE_DRIVER', 'redis'),
    /*
    |--------------------------------------------------------------------------

--- a/config/database.php
+++ b/config/database.php
--- a/config/filesystems.php
+++ b/config/filesystems.php
--- a/config/hashing.php
+++ b/config/hashing.php
--- a/config/logging.php
+++ b/config/logging.php
--- a/config/mail.php
+++ b/config/mail.php
--- a/config/queue.php
+++ b/config/queue.php
--- a/config/services.php
+++ b/config/services.php
--- a/config/session.php
+++ b/config/session.php
--- a/config/view.php
+++ b/config/view.php
--- a/database/.gitignore
+++ b/database/.gitignore
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
--- a/database/migrations/2014_10_12_100000_create_password_resets_table.php
+++ b/database/migrations/2014_10_12_100000_create_password_resets_table.php
--- a/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
+++ b/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
--- a/package.json
+++ b/package.json
--- a/phpunit.xml
+++ b/phpunit.xml
--- a/public/.htaccess
+++ b/public/.htaccess
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/index.php
+++ b/public/index.php
--- a/public/robots.txt
+++ b/public/robots.txt
--- a/public/web.config
+++ b/public/web.config
--- a/resources/js/app.js
+++ b/resources/js/app.js
--- a/resources/js/bootstrap.js
+++ b/resources/js/bootstrap.js
--- a/resources/lang/en/auth.php
+++ b/resources/lang/en/auth.php
--- a/resources/lang/en/pagination.php
+++ b/resources/lang/en/pagination.php
--- a/resources/lang/en/passwords.php
+++ b/resources/lang/en/passwords.php
--- a/resources/lang/en/validation.php
+++ b/resources/lang/en/validation.php
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
--- a/routes/api.php
+++ b/routes/api.php
--- a/routes/channels.php
+++ b/routes/channels.php
--- a/routes/console.php
+++ b/routes/console.php
--- a/routes/web.php
+++ b/routes/web.php
--- a/server.php
+++ b/server.php
--- a/storage/app/.gitignore
+++ b/storage/app/.gitignore
--- a/storage/app/public/.gitignore
+++ b/storage/app/public/.gitignore
--- a/storage/framework/.gitignore
+++ b/storage/framework/.gitignore
--- a/storage/framework/cache/.gitignore
+++ b/storage/framework/cache/.gitignore
--- a/storage/framework/cache/data/.gitignore
+++ b/storage/framework/cache/data/.gitignore
--- a/storage/framework/sessions/.gitignore
+++ b/storage/framework/sessions/.gitignore
--- a/storage/framework/testing/.gitignore
+++ b/storage/framework/testing/.gitignore
--- a/storage/framework/views/.gitignore
+++ b/storage/framework/views/.gitignore
--- a/storage/logs/.gitignore
+++ b/storage/logs/.gitignore
--- a/tests/CreatesApplication.php
+++ b/tests/CreatesApplication.php
--- a/tests/Feature/ExampleTest.php
+++ b/tests/Feature/ExampleTest.php
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
--- a/tests/Unit/ExampleTest.php
+++ b/tests/Unit/ExampleTest.php
--- a/webpack.mix.js
+++ b/webpack.mix.js