Merge branch 'release/2.0.4'

This commit is contained in:
Pierre Rudloff 2019-06-22 18:28:09 +02:00
commit c3c0651efa
4 changed files with 9 additions and 13 deletions

View file

@ -30,7 +30,7 @@ FileETag None
</ifmodule> </ifmodule>
<ifmodule mod_headers.c> <ifmodule mod_headers.c>
Header set X-Frame-Options "ALLOW-FROM https://alltubedownload.net/" Header set X-Frame-Options DENY
Header set X-Content-Type-Options nosniff Header set X-Content-Type-Options nosniff
Header set X-XSS-Protection "1; mode=block" Header set X-XSS-Protection "1; mode=block"
Header set Referrer-Policy no-referrer Header set Referrer-Policy no-referrer

View file

@ -23,7 +23,7 @@
"phpunit/phpunit": "~6.5.2", "phpunit/phpunit": "~6.5.2",
"doctrine/instantiator": "~1.0.0", "doctrine/instantiator": "~1.0.0",
"ffmpeg/ffmpeg": "4.0.3", "ffmpeg/ffmpeg": "4.0.3",
"rg3/youtube-dl": "2019.06.08", "rg3/youtube-dl": "2019.06.21",
"heroku/heroku-buildpack-php": "*", "heroku/heroku-buildpack-php": "*",
"anam/phantomjs-linux-x86-binary": "~2.1.1", "anam/phantomjs-linux-x86-binary": "~2.1.1",
"phpstan/phpstan": "~0.9.2" "phpstan/phpstan": "~0.9.2"
@ -40,10 +40,10 @@
"type": "package", "type": "package",
"package": { "package": {
"name": "rg3/youtube-dl", "name": "rg3/youtube-dl",
"version": "2019.06.08", "version": "2019.06.21",
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/rg3/youtube-dl/archive/2019.06.08.zip" "url": "https://github.com/rg3/youtube-dl/archive/2019.06.21.zip"
} }
} }
}, },

12
composer.lock generated
View file

@ -4,7 +4,7 @@
"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#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "62241b9b42bfa3b460f97329182303b5", "content-hash": "800ee563789a8ddbd1c3917ec223dd19",
"packages": [ "packages": [
{ {
"name": "aura/session", "name": "aura/session",
@ -1492,9 +1492,7 @@
"version": "4.0.3", "version": "4.0.3",
"dist": { "dist": {
"type": "xz", "type": "xz",
"url": "https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-4.0.3-64bit-static.tar.xz", "url": "https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-4.0.3-64bit-static.tar.xz"
"reference": null,
"shasum": null
}, },
"bin": [ "bin": [
"ffmpeg" "ffmpeg"
@ -3044,12 +3042,10 @@
}, },
{ {
"name": "rg3/youtube-dl", "name": "rg3/youtube-dl",
"version": "2019.06.08", "version": "2019.06.21",
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/rg3/youtube-dl/archive/2019.06.08.zip", "url": "https://github.com/rg3/youtube-dl/archive/2019.06.21.zip"
"reference": null,
"shasum": null
}, },
"type": "library" "type": "library"
}, },

View file

@ -1,7 +1,7 @@
{ {
"name": "alltube", "name": "alltube",
"description": "HTML GUI for youtube-dl", "description": "HTML GUI for youtube-dl",
"version": "2.0.3", "version": "2.0.4",
"author": "Pierre Rudloff", "author": "Pierre Rudloff",
"bugs": "https://github.com/Rudloff/alltube/issues", "bugs": "https://github.com/Rudloff/alltube/issues",
"dependencies": { "dependencies": {