Merge branch 'release-1.2.2'
This commit is contained in:
commit
0bf315d95f
5 changed files with 37 additions and 37 deletions
|
@ -23,7 +23,7 @@
|
|||
"phpunit/phpunit": "~6.5.2",
|
||||
"doctrine/instantiator": "~1.0.0",
|
||||
"ffmpeg/ffmpeg": "4.0.2",
|
||||
"rg3/youtube-dl": "2018.06.02",
|
||||
"rg3/youtube-dl": "2018.09.10",
|
||||
"heroku/heroku-buildpack-php": "*",
|
||||
"anam/phantomjs-linux-x86-binary": "~2.1.1"
|
||||
},
|
||||
|
@ -39,10 +39,10 @@
|
|||
"type": "package",
|
||||
"package": {
|
||||
"name": "rg3/youtube-dl",
|
||||
"version": "2018.06.02",
|
||||
"version": "2018.09.10",
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://github.com/rg3/youtube-dl/archive/2018.06.02.zip"
|
||||
"url": "https://github.com/rg3/youtube-dl/archive/2018.09.10.zip"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
40
composer.lock
generated
40
composer.lock
generated
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"_readme": [
|
||||
"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#composer-lock-the-lock-file",
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "97e79d42b6efffd556ad9245d94f4ecc",
|
||||
"content-hash": "c4f6a7bd1b31e8a6cf1cec103821a820",
|
||||
"packages": [
|
||||
{
|
||||
"name": "aura/session",
|
||||
|
@ -1201,16 +1201,16 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/process",
|
||||
"version": "v3.4.14",
|
||||
"version": "v3.4.15",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/process.git",
|
||||
"reference": "0414db29bd770ec5a4152683e655f55efd4fa60f"
|
||||
"reference": "4d6b125d5293cbceedc2aa10f2c71617e76262e7"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/process/zipball/0414db29bd770ec5a4152683e655f55efd4fa60f",
|
||||
"reference": "0414db29bd770ec5a4152683e655f55efd4fa60f",
|
||||
"url": "https://api.github.com/repos/symfony/process/zipball/4d6b125d5293cbceedc2aa10f2c71617e76262e7",
|
||||
"reference": "4d6b125d5293cbceedc2aa10f2c71617e76262e7",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
@ -1246,20 +1246,20 @@
|
|||
],
|
||||
"description": "Symfony Process Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-07-26T11:19:56+00:00"
|
||||
"time": "2018-08-03T10:42:44+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/yaml",
|
||||
"version": "v3.4.14",
|
||||
"version": "v3.4.15",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/yaml.git",
|
||||
"reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2"
|
||||
"reference": "c2f4812ead9f847cb69e90917ca7502e6892d6b8"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/yaml/zipball/810af2d35fc72b6cf5c01116806d2b65ccaaf2e2",
|
||||
"reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2",
|
||||
"url": "https://api.github.com/repos/symfony/yaml/zipball/c2f4812ead9f847cb69e90917ca7502e6892d6b8",
|
||||
"reference": "c2f4812ead9f847cb69e90917ca7502e6892d6b8",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
@ -1305,7 +1305,7 @@
|
|||
],
|
||||
"description": "Symfony Yaml Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-07-26T11:19:56+00:00"
|
||||
"time": "2018-08-10T07:34:36+00:00"
|
||||
},
|
||||
{
|
||||
"name": "zonuexe/http-accept-language",
|
||||
|
@ -2076,16 +2076,16 @@
|
|||
},
|
||||
{
|
||||
"name": "phpunit/phpunit",
|
||||
"version": "6.5.11",
|
||||
"version": "6.5.13",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||
"reference": "7bab54cb366076023bbf457a2a0d513332cd40f2"
|
||||
"reference": "0973426fb012359b2f18d3bd1e90ef1172839693"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7bab54cb366076023bbf457a2a0d513332cd40f2",
|
||||
"reference": "7bab54cb366076023bbf457a2a0d513332cd40f2",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0973426fb012359b2f18d3bd1e90ef1172839693",
|
||||
"reference": "0973426fb012359b2f18d3bd1e90ef1172839693",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
@ -2156,7 +2156,7 @@
|
|||
"testing",
|
||||
"xunit"
|
||||
],
|
||||
"time": "2018-08-07T07:05:35+00:00"
|
||||
"time": "2018-09-08T15:10:43+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/phpunit-mock-objects",
|
||||
|
@ -2219,10 +2219,10 @@
|
|||
},
|
||||
{
|
||||
"name": "rg3/youtube-dl",
|
||||
"version": "2018.06.02",
|
||||
"version": "2018.09.10",
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://github.com/rg3/youtube-dl/archive/2018.06.02.zip",
|
||||
"url": "https://github.com/rg3/youtube-dl/archive/2018.09.10.zip",
|
||||
"reference": null,
|
||||
"shasum": null
|
||||
},
|
||||
|
@ -2899,7 +2899,7 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/var-dumper",
|
||||
"version": "v3.4.14",
|
||||
"version": "v3.4.15",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/var-dumper.git",
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "alltube",
|
||||
"description": "HTML GUI for youtube-dl",
|
||||
"version": "1.2.1",
|
||||
"version": "1.2.2",
|
||||
"author": "Pierre Rudloff",
|
||||
"bugs": "https://github.com/Rudloff/alltube/issues",
|
||||
"dependencies": {
|
||||
|
@ -18,7 +18,7 @@
|
|||
"grunt-githash": "~0.1.3",
|
||||
"grunt-jslint": "~1.1.15",
|
||||
"grunt-jsonlint": "~1.1.0",
|
||||
"grunt-markdownlint": "~1.1.2",
|
||||
"grunt-markdownlint": "~2.1.0",
|
||||
"grunt-phpcs": "~0.4.0",
|
||||
"grunt-phpdocumentor": "~0.4.1",
|
||||
"grunt-phpunit": "~0.3.6"
|
||||
|
|
|
@ -187,7 +187,7 @@ class VideoDownloadTest extends TestCase
|
|||
],
|
||||
[
|
||||
'http://www.bbc.co.uk/programmes/b039g8p7', 'bestaudio/best',
|
||||
'Leonard_Cohen_Kaleidoscope_-_BBC_Radio_4-b039d07m',
|
||||
'Kaleidoscope_Leonard_Cohen-b039d07m',
|
||||
'flv',
|
||||
'bbcodspdns.fcod.llnwd.net',
|
||||
],
|
||||
|
|
22
yarn.lock
22
yarn.lock
|
@ -741,11 +741,11 @@ grunt-legacy-util@~1.1.1:
|
|||
underscore.string "~3.3.4"
|
||||
which "~1.3.0"
|
||||
|
||||
grunt-markdownlint@~1.1.2:
|
||||
version "1.1.6"
|
||||
resolved "https://registry.yarnpkg.com/grunt-markdownlint/-/grunt-markdownlint-1.1.6.tgz#2a7c89a6949b84cf6141107e2bb3d10e4dbb53da"
|
||||
grunt-markdownlint@~2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/grunt-markdownlint/-/grunt-markdownlint-2.1.0.tgz#8d9b1abeebb588893576c40221acd7c4098e1f37"
|
||||
dependencies:
|
||||
markdownlint "^0.10.0"
|
||||
markdownlint "^0.11.0"
|
||||
|
||||
grunt-phpcs@~0.4.0:
|
||||
version "0.4.0"
|
||||
|
@ -1028,9 +1028,9 @@ map-obj@^1.0.0, map-obj@^1.0.1:
|
|||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
|
||||
|
||||
markdown-it@8.4.1:
|
||||
version "8.4.1"
|
||||
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.1.tgz#206fe59b0e4e1b78a7c73250af9b34a4ad0aaf44"
|
||||
markdown-it@8.4.2:
|
||||
version "8.4.2"
|
||||
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
|
||||
dependencies:
|
||||
argparse "^1.0.7"
|
||||
entities "~1.1.1"
|
||||
|
@ -1038,11 +1038,11 @@ markdown-it@8.4.1:
|
|||
mdurl "^1.0.1"
|
||||
uc.micro "^1.0.5"
|
||||
|
||||
markdownlint@^0.10.0:
|
||||
version "0.10.0"
|
||||
resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.10.0.tgz#ee941ee943f78ff6adbc1ff0fad49365e600b664"
|
||||
markdownlint@^0.11.0:
|
||||
version "0.11.0"
|
||||
resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.11.0.tgz#3858bbdbc1ab78abf0c098d841c72b63dd3206a0"
|
||||
dependencies:
|
||||
markdown-it "8.4.1"
|
||||
markdown-it "8.4.2"
|
||||
|
||||
maxmin@^2.1.0:
|
||||
version "2.1.0"
|
||||
|
|
Loading…
Reference in a new issue