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

Merge branch 'develop' into feature/PTDL-472

Browse source
This commit is contained in:
Dane Everitt 2017-06-25 15:36:39 -05:00
commit b7b046c044
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
24 changed files with 672 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

96
composer.lock generated
View file

@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"content-hash": "5d246e0c5756d5c2d4410c1011db5a14",
"content-hash": "d3edf73b6618705ee34a76fa0319f0de",
"packages": [
{
"name": "aws/aws-sdk-php",
"version": "3.26.5",
"version": "3.29.7",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "5fd52d91aa168134f13a57df7fbf7d1f7b7a85ca"
"reference": "76540001ff938c072db5367a7c945296984b999b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5fd52d91aa168134f13a57df7fbf7d1f7b7a85ca",
"reference": "5fd52d91aa168134f13a57df7fbf7d1f7b7a85ca",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/76540001ff938c072db5367a7c945296984b999b",
"reference": "76540001ff938c072db5367a7c945296984b999b",
"shasum": ""
},
"require": {
@ -84,24 +84,24 @@
"s3",
"sdk"
],
"time": "2017-04-28T23:15:22+00:00"
"time": "2017-06-16T17:29:33+00:00"
},
{
"name": "barryvdh/laravel-debugbar",
"version": "v2.3.2",
"version": "v2.4.0",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-debugbar.git",
"reference": "24e4f0261e352d3fd86d0447791b56ae49398674"
"reference": "de15d00a74696db62e1b4782474c27ed0c4fc763"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/24e4f0261e352d3fd86d0447791b56ae49398674",
"reference": "24e4f0261e352d3fd86d0447791b56ae49398674",
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/de15d00a74696db62e1b4782474c27ed0c4fc763",
"reference": "de15d00a74696db62e1b4782474c27ed0c4fc763",
"shasum": ""
},
"require": {
"illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*",
"illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*",
"maximebf/debugbar": "~1.13.0",
"php": ">=5.5.9",
"symfony/finder": "~2.7|~3.0"
@ -109,7 +109,15 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.3-dev"
"dev-master": "2.4-dev"
},
"laravel": {
"providers": [
"Barryvdh\\Debugbar\\ServiceProvider"
],
"aliases": {
"Debugbar": "Barryvdh\\Debugbar\\Facade"
}
}
},
"autoload": {
@ -138,7 +146,7 @@
"profiler",
"webprofiler"
],
"time": "2017-01-19T08:19:49+00:00"
"time": "2017-06-01T17:46:08+00:00"
},
{
"name": "christian-riesen/base32",
@ -837,16 +845,16 @@
},
{
"name": "fideloper/proxy",
"version": "3.3.0",
"version": "3.3.3",
"source": {
"type": "git",
"url": "https://github.com/fideloper/TrustedProxy.git",
"reference": "4ac60dbd4bcd6636bf231ea0fd87c40ece4bdce0"
"reference": "985eac8f966c03b4d9503cad9b5e5a51d41ce477"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/4ac60dbd4bcd6636bf231ea0fd87c40ece4bdce0",
"reference": "4ac60dbd4bcd6636bf231ea0fd87c40ece4bdce0",
"url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/985eac8f966c03b4d9503cad9b5e5a51d41ce477",
"reference": "985eac8f966c03b4d9503cad9b5e5a51d41ce477",
"shasum": ""
},
"require": {
@ -855,7 +863,8 @@
},
"require-dev": {
"illuminate/http": "~5.0",
"mockery/mockery": "~0.9.3"
"mockery/mockery": "~0.9.3",
"phpunit/phpunit": "^5.7"
},
"type": "library",
"extra": {
@ -884,7 +893,7 @@
"proxy",
"trusted proxy"
],
"time": "2017-03-23T23:17:29+00:00"
"time": "2017-05-31T12:50:41+00:00"
},
{
"name": "guzzlehttp/guzzle",
@ -1066,16 +1075,16 @@
},
{
"name": "igaster/laravel-theme",
"version": "v1.14",
"version": "v1.16",
"source": {
"type": "git",
"url": "https://github.com/igaster/laravel-theme.git",
"reference": "2f15e330c6fb3fec3a8ebbe424f4f22933ce3afb"
"reference": "7816c4497feb326d11447737e8477779a713fc96"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/igaster/laravel-theme/zipball/2f15e330c6fb3fec3a8ebbe424f4f22933ce3afb",
"reference": "2f15e330c6fb3fec3a8ebbe424f4f22933ce3afb",
"url": "https://api.github.com/repos/igaster/laravel-theme/zipball/7816c4497feb326d11447737e8477779a713fc96",
"reference": "7816c4497feb326d11447737e8477779a713fc96",
"shasum": ""
},
"require": {
@ -1118,7 +1127,7 @@
"themes",
"views"
],
"time": "2017-03-30T11:50:54+00:00"
"time": "2017-06-07T15:24:25+00:00"
},
{
"name": "jakub-onderka/php-console-color",
@ -1253,16 +1262,16 @@
},
{
"name": "laravel/framework",
"version": "v5.4.21",
"version": "v5.4.27",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "2ed668f96d1a6ca42f50d5c87ee9ceecfc0a6eee"
"reference": "66f5e1b37cbd66e730ea18850ded6dc0ad570404"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/2ed668f96d1a6ca42f50d5c87ee9ceecfc0a6eee",
"reference": "2ed668f96d1a6ca42f50d5c87ee9ceecfc0a6eee",
"url": "https://api.github.com/repos/laravel/framework/zipball/66f5e1b37cbd66e730ea18850ded6dc0ad570404",
"reference": "66f5e1b37cbd66e730ea18850ded6dc0ad570404",
"shasum": ""
},
"require": {
@ -1378,20 +1387,20 @@
"framework",
"laravel"
],
"time": "2017-04-28T15:40:01+00:00"
"time": "2017-06-15T19:08:25+00:00"
},
{
"name": "laravel/tinker",
"version": "v1.0.0",
"version": "v1.0.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/tinker.git",
"reference": "3d5b675b55b24ccbf86395964042dbe061d5a965"
"reference": "7eb2e281395131897407285672ef5532e87e17f9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/tinker/zipball/3d5b675b55b24ccbf86395964042dbe061d5a965",
"reference": "3d5b675b55b24ccbf86395964042dbe061d5a965",
"url": "https://api.github.com/repos/laravel/tinker/zipball/7eb2e281395131897407285672ef5532e87e17f9",
"reference": "7eb2e281395131897407285672ef5532e87e17f9",
"shasum": ""
},
"require": {
@ -1412,6 +1421,11 @@
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
},
"laravel": {
"providers": [
"Laravel\\Tinker\\TinkerServiceProvider"
]
}
},
"autoload": {
@ -1436,7 +1450,7 @@
"laravel",
"psysh"
],
"time": "2016-12-30T18:13:17+00:00"
"time": "2017-06-01T16:31:26+00:00"
},
{
"name": "league/flysystem",
@ -2690,16 +2704,16 @@
},
{
"name": "spatie/laravel-fractal",
"version": "4.0.0",
"version": "4.0.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-fractal.git",
"reference": "7ddbb8131f20dd101a1699f3e622954fd73a97e1"
"reference": "3b95780f5f3ca79e29d445a5df87eac9f7c7c053"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-fractal/zipball/7ddbb8131f20dd101a1699f3e622954fd73a97e1",
"reference": "7ddbb8131f20dd101a1699f3e622954fd73a97e1",
"url": "https://api.github.com/repos/spatie/laravel-fractal/zipball/3b95780f5f3ca79e29d445a5df87eac9f7c7c053",
"reference": "3b95780f5f3ca79e29d445a5df87eac9f7c7c053",
"shasum": ""
},
"require": {
@ -2744,7 +2758,7 @@
"spatie",
"transform"
],
"time": "2017-04-26T15:13:38+00:00"
"time": "2017-05-05T19:01:43+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@ -5898,8 +5912,8 @@
"platform": {
"php": ">=7.0.0",
"ext-mbstring": "*",
"ext-pdo_mysql": "*",
"ext-zip": "*"
"ext-zip": "*",
"ext-pdo_mysql": "*"
},
"platform-dev": []
}