Merge branch 'develop' into feature/node-maintenance
This commit is contained in:
Dane Everitt
GitHub
commit
8aadc62882
6 changed files with 190 additions and 154 deletions
314
composer.lock
generated
314
composer.lock
generated
|
|
@ -1,10 +1,10 @@
|
||||||
{
|
{
|
||||||
"_readme": [
|
"_readme": [
|
||||||
"This file locks the dependencies of your project to a known state",
|
"This file locks the dependencies of your project to a known state",
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "146950cbea496a5c754d3b441ebf0118",
|
"content-hash": "36fe7d95a4e28ceee9aeb6e63e2187a0",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "appstract/laravel-blade-directives",
|
"name": "appstract/laravel-blade-directives",
|
||||||
|
|
@ -61,16 +61,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "aws/aws-sdk-php",
|
"name": "aws/aws-sdk-php",
|
||||||
"version": "3.55.11",
|
"version": "3.57.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/aws/aws-sdk-php.git",
|
"url": "https://github.com/aws/aws-sdk-php.git",
|
||||||
"reference": "237f2acff17238ac723845e0f302d5672d0bf0a1"
|
"reference": "795332f5f3a81474e85653e62d1d7b306bd4eeae"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/237f2acff17238ac723845e0f302d5672d0bf0a1",
|
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/795332f5f3a81474e85653e62d1d7b306bd4eeae",
|
||||||
"reference": "237f2acff17238ac723845e0f302d5672d0bf0a1",
|
"reference": "795332f5f3a81474e85653e62d1d7b306bd4eeae",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -137,7 +137,7 @@
|
||||||
"s3",
|
"s3",
|
||||||
"sdk"
|
"sdk"
|
||||||
],
|
],
|
||||||
"time": "2018-05-10T19:27:13+00:00"
|
"time": "2018-05-25T21:34:30+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "cakephp/chronos",
|
"name": "cakephp/chronos",
|
||||||
|
|
@ -1162,16 +1162,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "igaster/laravel-theme",
|
"name": "igaster/laravel-theme",
|
||||||
"version": "v2.0.7",
|
"version": "v2.0.8",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/igaster/laravel-theme.git",
|
"url": "https://github.com/igaster/laravel-theme.git",
|
||||||
"reference": "b37c53021e1f523e7448a1c41e09a9d7ade11f18"
|
"reference": "697548f755d81175bef8c0f37c1f189a62e205bd"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/igaster/laravel-theme/zipball/b37c53021e1f523e7448a1c41e09a9d7ade11f18",
|
"url": "https://api.github.com/repos/igaster/laravel-theme/zipball/697548f755d81175bef8c0f37c1f189a62e205bd",
|
||||||
"reference": "b37c53021e1f523e7448a1c41e09a9d7ade11f18",
|
"reference": "697548f755d81175bef8c0f37c1f189a62e205bd",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -1221,7 +1221,7 @@
|
||||||
"themes",
|
"themes",
|
||||||
"views"
|
"views"
|
||||||
],
|
],
|
||||||
"time": "2018-04-27T12:29:41+00:00"
|
"time": "2018-05-24T08:05:30+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "jakub-onderka/php-console-color",
|
"name": "jakub-onderka/php-console-color",
|
||||||
|
|
@ -1369,16 +1369,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/framework",
|
"name": "laravel/framework",
|
||||||
"version": "v5.6.21",
|
"version": "v5.6.23",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/framework.git",
|
"url": "https://github.com/laravel/framework.git",
|
||||||
"reference": "458a89b1c5ff73072c27308566f444c790f76f28"
|
"reference": "f547f0a71a12763d1adb8493237d541c9e3a5d10"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/framework/zipball/458a89b1c5ff73072c27308566f444c790f76f28",
|
"url": "https://api.github.com/repos/laravel/framework/zipball/f547f0a71a12763d1adb8493237d541c9e3a5d10",
|
||||||
"reference": "458a89b1c5ff73072c27308566f444c790f76f28",
|
"reference": "f547f0a71a12763d1adb8493237d541c9e3a5d10",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -1504,20 +1504,20 @@
|
||||||
"framework",
|
"framework",
|
||||||
"laravel"
|
"laravel"
|
||||||
],
|
],
|
||||||
"time": "2018-05-08T13:30:15+00:00"
|
"time": "2018-05-22T14:55:57+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/tinker",
|
"name": "laravel/tinker",
|
||||||
"version": "v1.0.6",
|
"version": "v1.0.7",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/tinker.git",
|
"url": "https://github.com/laravel/tinker.git",
|
||||||
"reference": "b22fe905fcefdffae76b011e27c7ac09e07e052b"
|
"reference": "e3086ee8cb1f54a39ae8dcb72d1c37d10128997d"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/tinker/zipball/b22fe905fcefdffae76b011e27c7ac09e07e052b",
|
"url": "https://api.github.com/repos/laravel/tinker/zipball/e3086ee8cb1f54a39ae8dcb72d1c37d10128997d",
|
||||||
"reference": "b22fe905fcefdffae76b011e27c7ac09e07e052b",
|
"reference": "e3086ee8cb1f54a39ae8dcb72d1c37d10128997d",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -1567,7 +1567,7 @@
|
||||||
"laravel",
|
"laravel",
|
||||||
"psysh"
|
"psysh"
|
||||||
],
|
],
|
||||||
"time": "2018-04-16T12:10:37+00:00"
|
"time": "2018-05-17T13:42:07+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "league/flysystem",
|
"name": "league/flysystem",
|
||||||
|
|
@ -1890,50 +1890,6 @@
|
||||||
],
|
],
|
||||||
"time": "2017-06-19T01:22:40+00:00"
|
"time": "2017-06-19T01:22:40+00:00"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "mtdowling/cron-expression",
|
|
||||||
"version": "v1.2.1",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/mtdowling/cron-expression.git",
|
|
||||||
"reference": "9504fa9ea681b586028adaaa0877db4aecf32bad"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/9504fa9ea681b586028adaaa0877db4aecf32bad",
|
|
||||||
"reference": "9504fa9ea681b586028adaaa0877db4aecf32bad",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"php": ">=5.3.2"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"phpunit/phpunit": "~4.0|~5.0"
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"autoload": {
|
|
||||||
"psr-4": {
|
|
||||||
"Cron\\": "src/Cron/"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Michael Dowling",
|
|
||||||
"email": "mtdowling@gmail.com",
|
|
||||||
"homepage": "https://github.com/mtdowling"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due",
|
|
||||||
"keywords": [
|
|
||||||
"cron",
|
|
||||||
"schedule"
|
|
||||||
],
|
|
||||||
"time": "2017-01-23T04:29:33+00:00"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "mtdowling/jmespath.php",
|
"name": "mtdowling/jmespath.php",
|
||||||
"version": "2.4.0",
|
"version": "2.4.0",
|
||||||
|
|
@ -2570,16 +2526,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "psy/psysh",
|
"name": "psy/psysh",
|
||||||
"version": "v0.9.3",
|
"version": "v0.9.4",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/bobthecow/psysh.git",
|
"url": "https://github.com/bobthecow/psysh.git",
|
||||||
"reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4"
|
"reference": "4d969a0e08e1e05e7207c07cb4207017ecc9a331"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/79c280013cf0b30fa23f3ba8bd3649218075adf4",
|
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/4d969a0e08e1e05e7207c07cb4207017ecc9a331",
|
||||||
"reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4",
|
"reference": "4d969a0e08e1e05e7207c07cb4207017ecc9a331",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -2591,9 +2547,9 @@
|
||||||
"symfony/var-dumper": "~2.7|~3.0|~4.0"
|
"symfony/var-dumper": "~2.7|~3.0|~4.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
"bamarni/composer-bin-plugin": "^1.2",
|
||||||
"hoa/console": "~2.15|~3.16",
|
"hoa/console": "~2.15|~3.16",
|
||||||
"phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0",
|
"phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0"
|
||||||
"symfony/finder": "~2.1|~3.0|~4.0"
|
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
|
"ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
|
||||||
|
|
@ -2638,7 +2594,7 @@
|
||||||
"interactive",
|
"interactive",
|
||||||
"shell"
|
"shell"
|
||||||
],
|
],
|
||||||
"time": "2018-04-18T12:32:50+00:00"
|
"time": "2018-05-22T06:48:07+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "ramsey/uuid",
|
"name": "ramsey/uuid",
|
||||||
|
|
@ -3107,16 +3063,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/console",
|
"name": "symfony/console",
|
||||||
"version": "v4.0.9",
|
"version": "v4.0.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/console.git",
|
"url": "https://github.com/symfony/console.git",
|
||||||
"reference": "3e820bc2c520a87ca209ad8fa961c97f42e0b4ae"
|
"reference": "058f120b8e06ebcd7b211de5ffae07b2db00fbdd"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/console/zipball/3e820bc2c520a87ca209ad8fa961c97f42e0b4ae",
|
"url": "https://api.github.com/repos/symfony/console/zipball/058f120b8e06ebcd7b211de5ffae07b2db00fbdd",
|
||||||
"reference": "3e820bc2c520a87ca209ad8fa961c97f42e0b4ae",
|
"reference": "058f120b8e06ebcd7b211de5ffae07b2db00fbdd",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -3171,20 +3127,20 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony Console Component",
|
"description": "Symfony Console Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2018-04-30T01:23:47+00:00"
|
"time": "2018-05-16T09:05:32+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/css-selector",
|
"name": "symfony/css-selector",
|
||||||
"version": "v4.0.9",
|
"version": "v4.0.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/css-selector.git",
|
"url": "https://github.com/symfony/css-selector.git",
|
||||||
"reference": "03f965583147957f1ecbad7ea1c9d6fd5e525ec2"
|
"reference": "0383a1a4eb1ffcac28719975d3e01bfa14be8ab3"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/css-selector/zipball/03f965583147957f1ecbad7ea1c9d6fd5e525ec2",
|
"url": "https://api.github.com/repos/symfony/css-selector/zipball/0383a1a4eb1ffcac28719975d3e01bfa14be8ab3",
|
||||||
"reference": "03f965583147957f1ecbad7ea1c9d6fd5e525ec2",
|
"reference": "0383a1a4eb1ffcac28719975d3e01bfa14be8ab3",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -3224,20 +3180,20 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony CssSelector Component",
|
"description": "Symfony CssSelector Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2018-03-19T22:35:49+00:00"
|
"time": "2018-05-11T15:58:37+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/debug",
|
"name": "symfony/debug",
|
||||||
"version": "v4.0.9",
|
"version": "v4.0.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/debug.git",
|
"url": "https://github.com/symfony/debug.git",
|
||||||
"reference": "e1d57cdb357e5b10f5fdacbb0b86689c0a435e6e"
|
"reference": "4e7c98de67cc4171d4c986554e09a511da40f3d8"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/debug/zipball/e1d57cdb357e5b10f5fdacbb0b86689c0a435e6e",
|
"url": "https://api.github.com/repos/symfony/debug/zipball/4e7c98de67cc4171d4c986554e09a511da40f3d8",
|
||||||
"reference": "e1d57cdb357e5b10f5fdacbb0b86689c0a435e6e",
|
"reference": "4e7c98de67cc4171d4c986554e09a511da40f3d8",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -3280,11 +3236,11 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony Debug Component",
|
"description": "Symfony Debug Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2018-04-30T16:59:37+00:00"
|
"time": "2018-05-16T09:05:32+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/event-dispatcher",
|
"name": "symfony/event-dispatcher",
|
||||||
"version": "v4.0.9",
|
"version": "v4.0.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/event-dispatcher.git",
|
"url": "https://github.com/symfony/event-dispatcher.git",
|
||||||
|
|
@ -3347,16 +3303,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/finder",
|
"name": "symfony/finder",
|
||||||
"version": "v4.0.9",
|
"version": "v4.0.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/finder.git",
|
"url": "https://github.com/symfony/finder.git",
|
||||||
"reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49"
|
"reference": "8c633f5a815903a1fe6e3fc135f207267a8a79af"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/finder/zipball/ca27c02b7a3fef4828c998c2ff9ba7aae1641c49",
|
"url": "https://api.github.com/repos/symfony/finder/zipball/8c633f5a815903a1fe6e3fc135f207267a8a79af",
|
||||||
"reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49",
|
"reference": "8c633f5a815903a1fe6e3fc135f207267a8a79af",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -3392,20 +3348,20 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony Finder Component",
|
"description": "Symfony Finder Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2018-04-04T05:10:37+00:00"
|
"time": "2018-05-16T09:05:32+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/http-foundation",
|
"name": "symfony/http-foundation",
|
||||||
"version": "v4.0.9",
|
"version": "v4.0.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/http-foundation.git",
|
"url": "https://github.com/symfony/http-foundation.git",
|
||||||
"reference": "014487772c22d893168e5d628a13e882009fea29"
|
"reference": "277b757a2d3960170d99d372e171a8a18916467a"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/014487772c22d893168e5d628a13e882009fea29",
|
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/277b757a2d3960170d99d372e171a8a18916467a",
|
||||||
"reference": "014487772c22d893168e5d628a13e882009fea29",
|
"reference": "277b757a2d3960170d99d372e171a8a18916467a",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -3445,20 +3401,20 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony HttpFoundation Component",
|
"description": "Symfony HttpFoundation Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2018-04-30T01:05:59+00:00"
|
"time": "2018-05-25T11:08:56+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/http-kernel",
|
"name": "symfony/http-kernel",
|
||||||
"version": "v4.0.9",
|
"version": "v4.0.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/http-kernel.git",
|
"url": "https://github.com/symfony/http-kernel.git",
|
||||||
"reference": "8333264b6de323ea27a08627d5396aa564fb9c25"
|
"reference": "450a1bda817f2dce25a9e13f0f011336743f2a48"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/8333264b6de323ea27a08627d5396aa564fb9c25",
|
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/450a1bda817f2dce25a9e13f0f011336743f2a48",
|
||||||
"reference": "8333264b6de323ea27a08627d5396aa564fb9c25",
|
"reference": "450a1bda817f2dce25a9e13f0f011336743f2a48",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -3466,7 +3422,8 @@
|
||||||
"psr/log": "~1.0",
|
"psr/log": "~1.0",
|
||||||
"symfony/debug": "~3.4|~4.0",
|
"symfony/debug": "~3.4|~4.0",
|
||||||
"symfony/event-dispatcher": "~3.4|~4.0",
|
"symfony/event-dispatcher": "~3.4|~4.0",
|
||||||
"symfony/http-foundation": "~3.4.4|~4.0.4"
|
"symfony/http-foundation": "~3.4.4|~4.0.4",
|
||||||
|
"symfony/polyfill-ctype": "~1.8"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"symfony/config": "<3.4",
|
"symfony/config": "<3.4",
|
||||||
|
|
@ -3531,7 +3488,62 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony HttpKernel Component",
|
"description": "Symfony HttpKernel Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2018-04-30T19:45:57+00:00"
|
"time": "2018-05-25T13:32:52+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "symfony/polyfill-ctype",
|
||||||
|
"version": "v1.8.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/symfony/polyfill-ctype.git",
|
||||||
|
"reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
|
||||||
|
"reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3.3"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "1.8-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Symfony\\Polyfill\\Ctype\\": ""
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
"bootstrap.php"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Symfony Community",
|
||||||
|
"homepage": "https://symfony.com/contributors"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Gert de Pagter",
|
||||||
|
"email": "BackEndTea@gmail.com"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Symfony polyfill for ctype functions",
|
||||||
|
"homepage": "https://symfony.com",
|
||||||
|
"keywords": [
|
||||||
|
"compatibility",
|
||||||
|
"ctype",
|
||||||
|
"polyfill",
|
||||||
|
"portable"
|
||||||
|
],
|
||||||
|
"time": "2018-04-30T19:57:29+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-mbstring",
|
"name": "symfony/polyfill-mbstring",
|
||||||
|
|
@ -3757,16 +3769,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/process",
|
"name": "symfony/process",
|
||||||
"version": "v4.0.9",
|
"version": "v4.0.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/process.git",
|
"url": "https://github.com/symfony/process.git",
|
||||||
"reference": "d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25"
|
"reference": "3621fa74d0576a6f89d63bc44fabd376711bd0b0"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/process/zipball/d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25",
|
"url": "https://api.github.com/repos/symfony/process/zipball/3621fa74d0576a6f89d63bc44fabd376711bd0b0",
|
||||||
"reference": "d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25",
|
"reference": "3621fa74d0576a6f89d63bc44fabd376711bd0b0",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -3802,20 +3814,20 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony Process Component",
|
"description": "Symfony Process Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2018-04-03T05:24:00+00:00"
|
"time": "2018-05-16T09:05:32+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/routing",
|
"name": "symfony/routing",
|
||||||
"version": "v4.0.9",
|
"version": "v4.0.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/routing.git",
|
"url": "https://github.com/symfony/routing.git",
|
||||||
"reference": "1dfbfdf060bbc80da8dedc062050052e694cd027"
|
"reference": "e8833b64b139926cbe1610d53722185e55c18e44"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/routing/zipball/1dfbfdf060bbc80da8dedc062050052e694cd027",
|
"url": "https://api.github.com/repos/symfony/routing/zipball/e8833b64b139926cbe1610d53722185e55c18e44",
|
||||||
"reference": "1dfbfdf060bbc80da8dedc062050052e694cd027",
|
"reference": "e8833b64b139926cbe1610d53722185e55c18e44",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -3880,20 +3892,20 @@
|
||||||
"uri",
|
"uri",
|
||||||
"url"
|
"url"
|
||||||
],
|
],
|
||||||
"time": "2018-04-20T06:20:23+00:00"
|
"time": "2018-05-16T14:21:07+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/translation",
|
"name": "symfony/translation",
|
||||||
"version": "v4.0.9",
|
"version": "v4.0.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/translation.git",
|
"url": "https://github.com/symfony/translation.git",
|
||||||
"reference": "ad3abf08eb3450491d8d76513100ef58194cd13e"
|
"reference": "e1f5863d0a9e79cfec7f031421ced3fe1d403e66"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/translation/zipball/ad3abf08eb3450491d8d76513100ef58194cd13e",
|
"url": "https://api.github.com/repos/symfony/translation/zipball/e1f5863d0a9e79cfec7f031421ced3fe1d403e66",
|
||||||
"reference": "ad3abf08eb3450491d8d76513100ef58194cd13e",
|
"reference": "e1f5863d0a9e79cfec7f031421ced3fe1d403e66",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -3948,11 +3960,11 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony Translation Component",
|
"description": "Symfony Translation Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2018-04-30T01:23:47+00:00"
|
"time": "2018-05-21T10:09:47+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/var-dumper",
|
"name": "symfony/var-dumper",
|
||||||
"version": "v4.0.9",
|
"version": "v4.0.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/var-dumper.git",
|
"url": "https://github.com/symfony/var-dumper.git",
|
||||||
|
|
@ -4222,16 +4234,16 @@
|
||||||
"packages-dev": [
|
"packages-dev": [
|
||||||
{
|
{
|
||||||
"name": "barryvdh/laravel-debugbar",
|
"name": "barryvdh/laravel-debugbar",
|
||||||
"version": "v3.1.4",
|
"version": "v3.1.5",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/barryvdh/laravel-debugbar.git",
|
"url": "https://github.com/barryvdh/laravel-debugbar.git",
|
||||||
"reference": "7a91480cc6e597caed5117a3c5d685f06d35c5a1"
|
"reference": "d3cdca2ad6cc6e67735b4a63e7551c690a497f5f"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/7a91480cc6e597caed5117a3c5d685f06d35c5a1",
|
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/d3cdca2ad6cc6e67735b4a63e7551c690a497f5f",
|
||||||
"reference": "7a91480cc6e597caed5117a3c5d685f06d35c5a1",
|
"reference": "d3cdca2ad6cc6e67735b4a63e7551c690a497f5f",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4286,7 +4298,7 @@
|
||||||
"profiler",
|
"profiler",
|
||||||
"webprofiler"
|
"webprofiler"
|
||||||
],
|
],
|
||||||
"time": "2018-03-06T08:35:31+00:00"
|
"time": "2018-05-03T18:27:04+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "barryvdh/laravel-ide-helper",
|
"name": "barryvdh/laravel-ide-helper",
|
||||||
|
|
@ -4412,16 +4424,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "codedungeon/php-cli-colors",
|
"name": "codedungeon/php-cli-colors",
|
||||||
"version": "1.10.3",
|
"version": "1.10.7",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/mikeerickson/php-cli-colors.git",
|
"url": "https://github.com/mikeerickson/php-cli-colors.git",
|
||||||
"reference": "1beb5c21b21b2c125aff26a75caf02fcec12571f"
|
"reference": "5649ef76ec0c9ed626e95bf40fdfaf4b8efcf79b"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/mikeerickson/php-cli-colors/zipball/1beb5c21b21b2c125aff26a75caf02fcec12571f",
|
"url": "https://api.github.com/repos/mikeerickson/php-cli-colors/zipball/5649ef76ec0c9ed626e95bf40fdfaf4b8efcf79b",
|
||||||
"reference": "1beb5c21b21b2c125aff26a75caf02fcec12571f",
|
"reference": "5649ef76ec0c9ed626e95bf40fdfaf4b8efcf79b",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
|
@ -4452,7 +4464,7 @@
|
||||||
"package",
|
"package",
|
||||||
"php"
|
"php"
|
||||||
],
|
],
|
||||||
"time": "2017-09-12T17:12:52+00:00"
|
"time": "2018-05-17T01:34:14+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "codedungeon/phpunit-result-printer",
|
"name": "codedungeon/phpunit-result-printer",
|
||||||
|
|
@ -6652,7 +6664,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/class-loader",
|
"name": "symfony/class-loader",
|
||||||
"version": "v3.4.9",
|
"version": "v3.4.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/class-loader.git",
|
"url": "https://github.com/symfony/class-loader.git",
|
||||||
|
|
@ -6708,20 +6720,21 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/filesystem",
|
"name": "symfony/filesystem",
|
||||||
"version": "v4.0.9",
|
"version": "v4.0.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/filesystem.git",
|
"url": "https://github.com/symfony/filesystem.git",
|
||||||
"reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21"
|
"reference": "7a69e728e9f0044958c2fd7d72bfe5e7bd1a4d04"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/filesystem/zipball/5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21",
|
"url": "https://api.github.com/repos/symfony/filesystem/zipball/7a69e728e9f0044958c2fd7d72bfe5e7bd1a4d04",
|
||||||
"reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21",
|
"reference": "7a69e728e9f0044958c2fd7d72bfe5e7bd1a4d04",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^7.1.3"
|
"php": "^7.1.3",
|
||||||
|
"symfony/polyfill-ctype": "~1.8"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
|
|
@ -6753,20 +6766,20 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony Filesystem Component",
|
"description": "Symfony Filesystem Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2018-02-22T10:50:29+00:00"
|
"time": "2018-05-16T09:05:32+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/options-resolver",
|
"name": "symfony/options-resolver",
|
||||||
"version": "v4.0.9",
|
"version": "v4.0.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/options-resolver.git",
|
"url": "https://github.com/symfony/options-resolver.git",
|
||||||
"reference": "371532a2cfe932f7a3766dd4c45364566def1dd0"
|
"reference": "ac1c3a814ddcad9d0cc2d0382e215d3bff8ae2d2"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/371532a2cfe932f7a3766dd4c45364566def1dd0",
|
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/ac1c3a814ddcad9d0cc2d0382e215d3bff8ae2d2",
|
||||||
"reference": "371532a2cfe932f7a3766dd4c45364566def1dd0",
|
"reference": "ac1c3a814ddcad9d0cc2d0382e215d3bff8ae2d2",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -6807,7 +6820,7 @@
|
||||||
"configuration",
|
"configuration",
|
||||||
"options"
|
"options"
|
||||||
],
|
],
|
||||||
"time": "2018-01-18T22:19:33+00:00"
|
"time": "2018-05-11T15:58:37+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-php70",
|
"name": "symfony/polyfill-php70",
|
||||||
|
|
@ -6870,7 +6883,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/stopwatch",
|
"name": "symfony/stopwatch",
|
||||||
"version": "v4.0.9",
|
"version": "v4.0.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/stopwatch.git",
|
"url": "https://github.com/symfony/stopwatch.git",
|
||||||
|
|
@ -6919,20 +6932,21 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/yaml",
|
"name": "symfony/yaml",
|
||||||
"version": "v4.0.9",
|
"version": "v4.0.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/yaml.git",
|
"url": "https://github.com/symfony/yaml.git",
|
||||||
"reference": "275ad099e4cbe612a2acbca14a16dd1c5311324d"
|
"reference": "048b1be5fb96e73ff1d065f5e7e23f84415ac907"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/yaml/zipball/275ad099e4cbe612a2acbca14a16dd1c5311324d",
|
"url": "https://api.github.com/repos/symfony/yaml/zipball/048b1be5fb96e73ff1d065f5e7e23f84415ac907",
|
||||||
"reference": "275ad099e4cbe612a2acbca14a16dd1c5311324d",
|
"reference": "048b1be5fb96e73ff1d065f5e7e23f84415ac907",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^7.1.3"
|
"php": "^7.1.3",
|
||||||
|
"symfony/polyfill-ctype": "~1.8"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"symfony/console": "<3.4"
|
"symfony/console": "<3.4"
|
||||||
|
|
@ -6973,7 +6987,7 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony Yaml Component",
|
"description": "Symfony Yaml Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2018-04-08T08:49:08+00:00"
|
"time": "2018-05-07T07:12:24+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "theseer/tokenizer",
|
"name": "theseer/tokenizer",
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -61,6 +61,18 @@
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
}, false);
|
}, false);
|
||||||
|
|
||||||
|
window.foldersDetectedInDrag = function (event) {
|
||||||
|
var folderDetected = false;
|
||||||
|
var files = event.dataTransfer.files;
|
||||||
|
for (var i = 0, f; f = files[i]; i++) {
|
||||||
|
if (!f.type && f.size === 0) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return folderDetected;
|
||||||
|
};
|
||||||
|
|
||||||
var dropCounter = 0;
|
var dropCounter = 0;
|
||||||
$('#load_files').bind({
|
$('#load_files').bind({
|
||||||
dragenter: function (event) {
|
dragenter: function (event) {
|
||||||
|
|
@ -75,6 +87,15 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
drop: function (event) {
|
drop: function (event) {
|
||||||
|
if (window.foldersDetectedInDrag(event.originalEvent)) {
|
||||||
|
$.notify({
|
||||||
|
message: 'Folder uploads are not supported. Please use SFTP to upload whole directories.',
|
||||||
|
}, {
|
||||||
|
type: 'warning',
|
||||||
|
delay: 0
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
dropCounter = 0;
|
dropCounter = 0;
|
||||||
$(this).removeClass('hasFileHover');
|
$(this).removeClass('hasFileHover');
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@
|
||||||
<header class="main-header">
|
<header class="main-header">
|
||||||
<a href="{{ route('index') }}" class="logo">
|
<a href="{{ route('index') }}" class="logo">
|
||||||
<span class="logo-lg">{{ config('app.name', 'Pterodactyl') }}</span>
|
<span class="logo-lg">{{ config('app.name', 'Pterodactyl') }}</span>
|
||||||
<span class="logo-mini"><img src="favicons/android-chrome-192x192.png"></span>
|
<span class="logo-mini"><img src="/favicons/android-chrome-192x192.png"></span>
|
||||||
</a>
|
</a>
|
||||||
<nav class="navbar navbar-static-top">
|
<nav class="navbar navbar-static-top">
|
||||||
<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
|
<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
Editor.setValue($('#editorSetContent').val(), -1);
|
Editor.setValue($('#editorSetContent').val(), -1);
|
||||||
|
Editor.getSession().setUndoManager(new ace.UndoManager());
|
||||||
$('#editorLoadingOverlay').hide();
|
$('#editorLoadingOverlay').hide();
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue