StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/vuejs-auth

Browse source
This commit is contained in:
Dane Everitt 2018-05-26 12:17:14 -07:00
commit cf90f56777
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
188 changed files with 854 additions and 625 deletions
Download patch file Download diff file Expand all files Collapse all files

18
composer.json
View file

@ -19,24 +19,23 @@
"aws/aws-sdk-php": "^3.48",
"cakephp/chronos": "^1.1",
"doctrine/dbal": "^2.5",
"fideloper/proxy": "^3.3",
"fideloper/proxy": "^4.0",
"guzzlehttp/guzzle": "^6.3",
"hashids/hashids": "^2.0",
"igaster/laravel-theme": "^2.0.6",
"laracasts/utilities": "^3.0",
"laravel/framework": "5.5.*",
"laravel/framework": "5.6.*",
"laravel/tinker": "^1.0",
"lord/laroute": "^2.4",
"matriphe/iso-639": "^1.2",
"mtdowling/cron-expression": "^1.2",
"nesbot/carbon": "^1.22",
"pragmarx/google2fa": "^2.0",
"predis/predis": "^1.1",
"prologue/alerts": "^0.4",
"ramsey/uuid": "^3.7",
"s1lentium/iptools": "^1.1",
"sofa/eloquence-base": "v5.5",
"sofa/eloquence-validable": "v5.5",
"sofa/eloquence-base": "v5.6",
"sofa/eloquence-validable": "v5.6",
"spatie/laravel-fractal": "^5.3",
"webmozart/assert": "^1.2",
"znck/belongs-to-through": "^2.3"
@ -44,14 +43,15 @@
"require-dev": {
"barryvdh/laravel-debugbar": "^3.1",
"barryvdh/laravel-ide-helper": "^2.4",
"codedungeon/phpunit-result-printer": "^0.6.0",
"codedungeon/phpunit-result-printer": "^0.17.1",
"filp/whoops": "^2.1",
"friendsofphp/php-cs-fixer": "^2.8.0",
"friendsofphp/php-cs-fixer": "^2.11.1",
"fzaninotto/faker": "^1.6",
"martinlindhe/laravel-vue-i18n-generator": "^0.1.28",
"mockery/mockery": "^1.0",
"php-mock/php-mock-phpunit": "^2.0",
"phpunit/phpunit": "~6.4.0",
"nunomaduro/collision": "^2.0",
"php-mock/php-mock-phpunit": "^2.1",
"phpunit/phpunit": "~7.0",
"tightenco/ziggy": "^0.5.0"
},
"autoload": {