PrivateCoffee/alltube
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:Rudloff/alltube into develop

Browse source
This commit is contained in:
Pierre Rudloff 2017-09-24 12:44:28 +02:00
commit fff2a64ff1
6 changed files with 51 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
composer.json
View file

@ -23,7 +23,7 @@
"squizlabs/php_codesniffer": "~3.0.0", "squizlabs/php_codesniffer": "~3.0.0",
"phpunit/phpunit": "~5.7.2", "phpunit/phpunit": "~5.7.2",
"ffmpeg/ffmpeg": "dev-release", "ffmpeg/ffmpeg": "dev-release",
"rg3/youtube-dl": "~2017.05.09", "rg3/youtube-dl": "~2017.09.11",
"rudloff/rtmpdump-bin": "~2.3.0", "rudloff/rtmpdump-bin": "~2.3.0",
"heroku/heroku-buildpack-php": "*" "heroku/heroku-buildpack-php": "*"
}, },
@ -39,10 +39,10 @@
"type": "package", "type": "package",
"package": { "package": {
"name": "rg3/youtube-dl", "name": "rg3/youtube-dl",
"version": "2017.05.09", "version": "2017.09.11",
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/rg3/youtube-dl/archive/2017.05.09.zip" "url": "https://github.com/rg3/youtube-dl/archive/2017.09.11.zip"
} }
} }
}, },

88
composer.lock generated
View file

@ -4,8 +4,8 @@
"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#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "43832e17cc768672af7305037a58b8b2", "hash": "785c3eddbd168d1ae700136520aff319",
"content-hash": "22e16312bcf339c90850660d9e5923e7", "content-hash": "80a7d12432e1c7e202dfb8d997bbea0f",
"packages": [ "packages": [
{ {
"name": "aura/session", "name": "aura/session",
@ -1065,16 +1065,16 @@
}, },
{ {
"name": "heroku/heroku-buildpack-php", "name": "heroku/heroku-buildpack-php",
"version": "v122", "version": "v124",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/heroku/heroku-buildpack-php.git", "url": "https://github.com/heroku/heroku-buildpack-php.git",
"reference": "82b6fbf8d6a9693ec2f01ccf993202bfc1bc528a" "reference": "ae364349c513e569d7d4614ab3b1767eb883b858"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/82b6fbf8d6a9693ec2f01ccf993202bfc1bc528a", "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/ae364349c513e569d7d4614ab3b1767eb883b858",
"reference": "82b6fbf8d6a9693ec2f01ccf993202bfc1bc528a", "reference": "ae364349c513e569d7d4614ab3b1767eb883b858",
"shasum": "" "shasum": ""
}, },
"bin": [ "bin": [
@ -1105,7 +1105,7 @@
"nginx", "nginx",
"php" "php"
], ],
"time": "2017-08-03 22:13:11" "time": "2017-09-07 23:07:36"
}, },
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",
@ -1151,16 +1151,16 @@
}, },
{ {
"name": "phpdocumentor/reflection-common", "name": "phpdocumentor/reflection-common",
"version": "1.0", "version": "1.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/ReflectionCommon.git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1201,26 +1201,26 @@
"reflection", "reflection",
"static analysis" "static analysis"
], ],
"time": "2015-12-27 11:43:31" "time": "2017-09-11 18:02:19"
}, },
{ {
"name": "phpdocumentor/reflection-docblock", "name": "phpdocumentor/reflection-docblock",
"version": "3.2.1", "version": "4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "183824db76118b9dddffc7e522b91fa175f75119" "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/183824db76118b9dddffc7e522b91fa175f75119", "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/2d3d238c433cf69caeb4842e97a3223a116f94b2",
"reference": "183824db76118b9dddffc7e522b91fa175f75119", "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.5", "php": "^7.0",
"phpdocumentor/reflection-common": "^1.0@dev", "phpdocumentor/reflection-common": "^1.0@dev",
"phpdocumentor/type-resolver": "^0.3.0", "phpdocumentor/type-resolver": "^0.4.0",
"webmozart/assert": "^1.0" "webmozart/assert": "^1.0"
}, },
"require-dev": { "require-dev": {
@ -1246,20 +1246,20 @@
} }
], ],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2017-08-04 20:55:59" "time": "2017-08-30 18:51:59"
}, },
{ {
"name": "phpdocumentor/type-resolver", "name": "phpdocumentor/type-resolver",
"version": "0.3.0", "version": "0.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git", "url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773" "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773", "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
"reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773", "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1293,26 +1293,26 @@
"email": "me@mikevanriel.com" "email": "me@mikevanriel.com"
} }
], ],
"time": "2017-06-03 08:32:36" "time": "2017-07-14 14:27:02"
}, },
{ {
"name": "phpspec/prophecy", "name": "phpspec/prophecy",
"version": "v1.7.0", "version": "v1.7.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpspec/prophecy.git", "url": "https://github.com/phpspec/prophecy.git",
"reference": "93d39f1f7f9326d746203c7c056f300f7f126073" "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
"reference": "93d39f1f7f9326d746203c7c056f300f7f126073", "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/instantiator": "^1.0.2", "doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0", "php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
"sebastian/comparator": "^1.1|^2.0", "sebastian/comparator": "^1.1|^2.0",
"sebastian/recursion-context": "^1.0|^2.0|^3.0" "sebastian/recursion-context": "^1.0|^2.0|^3.0"
}, },
@ -1323,7 +1323,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.6.x-dev" "dev-master": "1.7.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -1356,7 +1356,7 @@
"spy", "spy",
"stub" "stub"
], ],
"time": "2017-03-02 20:05:34" "time": "2017-09-04 11:05:03"
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
@ -1560,16 +1560,16 @@
}, },
{ {
"name": "phpunit/php-token-stream", "name": "phpunit/php-token-stream",
"version": "2.0.0", "version": "2.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git", "url": "https://github.com/sebastianbergmann/php-token-stream.git",
"reference": "ecb0b2cdaa0add708fe6f329ef65ae0c5225130b" "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ecb0b2cdaa0add708fe6f329ef65ae0c5225130b", "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9a02332089ac48e704c70f6cefed30c224e3c0b0",
"reference": "ecb0b2cdaa0add708fe6f329ef65ae0c5225130b", "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1605,7 +1605,7 @@
"keywords": [ "keywords": [
"tokenizer" "tokenizer"
], ],
"time": "2017-08-03 14:17:41" "time": "2017-08-20 05:47:52"
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
@ -1750,10 +1750,10 @@
}, },
{ {
"name": "rg3/youtube-dl", "name": "rg3/youtube-dl",
"version": "2017.05.09", "version": "2017.09.11",
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/rg3/youtube-dl/archive/2017.05.09.zip", "url": "https://github.com/rg3/youtube-dl/archive/2017.09.11.zip",
"reference": null, "reference": null,
"shasum": null "shasum": null
}, },
@ -2353,16 +2353,16 @@
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.4.0", "version": "v1.5.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "f29dca382a6485c3cbe6379f0c61230167681937" "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f29dca382a6485c3cbe6379f0c61230167681937", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
"reference": "f29dca382a6485c3cbe6379f0c61230167681937", "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2374,7 +2374,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.4-dev" "dev-master": "1.5-dev"
} }
}, },
"autoload": { "autoload": {
@ -2408,7 +2408,7 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2017-06-09 14:24:12" "time": "2017-06-14 15:44:48"
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",

3
i18n/fr_FR/LC_MESSAGES/Alltube.po
View file

@ -8,7 +8,7 @@ msgstr ""
"Language: fr\n" "Language: fr\n"
#: templates/error.tpl:5 #: templates/error.tpl:5
msgid "An error occured" msgid "An error occurred"
msgstr "Une erreur est survenue" msgstr "Une erreur est survenue"
#: templates/error.tpl:6 #: templates/error.tpl:6
@ -131,4 +131,3 @@ msgstr "Bookmarklet"
#: templates/inc/header.tpl:4 #: templates/inc/header.tpl:4
msgid "Switch language" msgid "Switch language"
msgstr "Changer de langue" msgstr "Changer de langue"

2
i18n/template.pot
View file

@ -2,7 +2,7 @@ msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n" msgstr "Content-Type: text/plain; charset=UTF-8\n"
#: templates/error.tpl:5 #: templates/error.tpl:5
msgid "An error occured" msgid "An error occurred"
msgstr "" msgstr ""
#: templates/error.tpl:6 #: templates/error.tpl:6

2
i18n/zh_CN/LC_MESSAGES/Alltube.po
View file

@ -13,7 +13,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n" "Plural-Forms: nplurals=1; plural=0;\n"
#: ..\..\..\templates/error.tpl:5 #: ..\..\..\templates/error.tpl:5
msgid "An error occured" msgid "An error occurred"
msgstr "出错了" msgstr "出错了"
#: ..\..\..\templates/error.tpl:6 #: ..\..\..\templates/error.tpl:6

2
templates/error.tpl
View file

@ -2,7 +2,7 @@
<div class="wrapper"> <div class="wrapper">
<div class="main error"> <div class="main error">
{include file="inc/logo.tpl"} {include file="inc/logo.tpl"}
<h2>{t}An error occured{/t}</h2> <h2>{t}An error occurred{/t}</h2>
{t}Please check the URL of your video.{/t} {t}Please check the URL of your video.{/t}
<p><i> <p><i>
{foreach $errors as $error} {foreach $errors as $error}