diff --git a/classes/LocaleManager.php b/classes/LocaleManager.php index 3efa390..6cd94b2 100644 --- a/classes/LocaleManager.php +++ b/classes/LocaleManager.php @@ -93,7 +93,7 @@ class LocaleManager public function setLocale(Locale $locale) { putenv('LANG='.$locale); - setlocale(LC_ALL, [$locale, $locale.'.utf8']); + setlocale(LC_ALL, [$locale.'.utf8', $locale]); $this->curLocale = $locale; $this->sessionSegment->set('locale', $locale); } diff --git a/composer.json b/composer.json index cfa909a..9aa497d 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "phpunit/phpunit": "~6.5.2", "doctrine/instantiator": "~1.0.0", "ffmpeg/ffmpeg": "4.0", - "rg3/youtube-dl": "2018.05.01", + "rg3/youtube-dl": "2018.06.02", "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.05.01", + "version": "2018.06.02", "dist": { "type": "zip", - "url": "https://github.com/rg3/youtube-dl/archive/2018.05.01.zip" + "url": "https://github.com/rg3/youtube-dl/archive/2018.06.02.zip" } } }, diff --git a/composer.lock b/composer.lock index 7612273..89323b4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "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": "034aef1b6cbec50422b1f99f03cc5197", + "content-hash": "0373d67592f91e34e33a0c094c7d74d5", "packages": [ { "name": "aura/session", @@ -420,16 +420,16 @@ }, { "name": "mockery/mockery", - "version": "1.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38" + "reference": "99e29d3596b16dabe4982548527d5ddf90232e99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/1bac8c362b12f522fdd1f1fa3556284c91affa38", - "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38", + "url": "https://api.github.com/repos/mockery/mockery/zipball/99e29d3596b16dabe4982548527d5ddf90232e99", + "reference": "99e29d3596b16dabe4982548527d5ddf90232e99", "shasum": "" }, "require": { @@ -438,7 +438,8 @@ "php": ">=5.6.0" }, "require-dev": { - "phpunit/phpunit": "~5.7|~6.1" + "phpdocumentor/phpdocumentor": "^2.9", + "phpunit/phpunit": "~5.7.10|~6.5" }, "type": "library", "extra": { @@ -467,8 +468,8 @@ "homepage": "http://davedevelopment.co.uk" } ], - "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succinct API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.", - "homepage": "http://github.com/mockery/mockery", + "description": "Mockery is a simple yet flexible PHP mock object framework", + "homepage": "https://github.com/mockery/mockery", "keywords": [ "BDD", "TDD", @@ -481,7 +482,7 @@ "test double", "testing" ], - "time": "2017-10-06T16:20:43+00:00" + "time": "2018-05-08T08:54:48+00:00" }, { "name": "nikic/fast-route", @@ -1141,17 +1142,72 @@ "time": "2018-04-24T14:53:33+00:00" }, { - "name": "symfony/process", - "version": "v3.4.9", + "name": "symfony/polyfill-ctype", + "version": "v1.8.0", "source": { "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "4b7d64e852886319e93ddfdecff0d744ab87658b" + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/4b7d64e852886319e93ddfdecff0d744ab87658b", - "reference": "4b7d64e852886319e93ddfdecff0d744ab87658b", + "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/process", + "version": "v3.4.11", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/4cbf2db9abcb01486a21b7a059e03a62fae63187", + "reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187", "shasum": "" }, "require": { @@ -1187,24 +1243,25 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-04-03T05:22:50+00:00" + "time": "2018-05-16T08:49:21+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.9", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "033cfa61ef06ee0847e056e530201842b6e926c3" + "reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/033cfa61ef06ee0847e056e530201842b6e926c3", - "reference": "033cfa61ef06ee0847e056e530201842b6e926c3", + "url": "https://api.github.com/repos/symfony/yaml/zipball/c5010cc1692ce1fa328b1fb666961eb3d4a85bb0", + "reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^5.5.9|>=7.0.8", + "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/console": "<3.4" @@ -1245,7 +1302,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-04-08T08:21:29+00:00" + "time": "2018-05-03T23:18:14+00:00" }, { "name": "zonuexe/http-accept-language", @@ -1402,16 +1459,16 @@ }, { "name": "heroku/heroku-buildpack-php", - "version": "v135", + "version": "v136", "source": { "type": "git", "url": "https://github.com/heroku/heroku-buildpack-php.git", - "reference": "c295fcefa13c67fd678839cc5ae4bb7bc7ea9d8e" + "reference": "2840e48240769316777d6548409aa75fef16de09" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/c295fcefa13c67fd678839cc5ae4bb7bc7ea9d8e", - "reference": "c295fcefa13c67fd678839cc5ae4bb7bc7ea9d8e", + "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/2840e48240769316777d6548409aa75fef16de09", + "reference": "2840e48240769316777d6548409aa75fef16de09", "shasum": "" }, "bin": [ @@ -1442,7 +1499,7 @@ "nginx", "php" ], - "time": "2018-04-26T13:18:31+00:00" + "time": "2018-05-24T20:47:48+00:00" }, { "name": "myclabs/deep-copy", @@ -2100,16 +2157,16 @@ }, { "name": "phpunit/phpunit-mock-objects", - "version": "5.0.6", + "version": "5.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf" + "reference": "3eaf040f20154d27d6da59ca2c6e28ac8fd56dce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/33fd41a76e746b8fa96d00b49a23dadfa8334cdf", - "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3eaf040f20154d27d6da59ca2c6e28ac8fd56dce", + "reference": "3eaf040f20154d27d6da59ca2c6e28ac8fd56dce", "shasum": "" }, "require": { @@ -2155,14 +2212,14 @@ "mock", "xunit" ], - "time": "2018-01-06T05:45:45+00:00" + "time": "2018-05-29T13:50:43+00:00" }, { "name": "rg3/youtube-dl", - "version": "2018.05.01", + "version": "2018.06.02", "dist": { "type": "zip", - "url": "https://github.com/rg3/youtube-dl/archive/2018.05.01.zip", + "url": "https://github.com/rg3/youtube-dl/archive/2018.06.02.zip", "reference": null, "shasum": null }, @@ -2839,7 +2896,7 @@ }, { "name": "symfony/var-dumper", - "version": "v3.4.9", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", diff --git a/controllers/FrontController.php b/controllers/FrontController.php index 1c9dba2..3d1e2f5 100644 --- a/controllers/FrontController.php +++ b/controllers/FrontController.php @@ -97,7 +97,9 @@ class FrontController $session_factory = new SessionFactory(); $session = $session_factory->newInstance($cookies); $this->sessionSegment = $session->getSegment(self::class); - if ($this->config->stream) { + if ($this->config->remux) { + $this->defaultFormat = 'bestvideo+bestaudio'; + } elseif ($this->config->stream) { $this->defaultFormat = 'best'; } } @@ -466,7 +468,7 @@ class FrontController } catch (EmptyUrlException $e) { /* If this happens it is probably a playlist - so it will either be handle by getStream() or throw an exception anyway. + so it will either be handled by getStream() or throw an exception anyway. */ $videoUrls = []; } diff --git a/i18n/fr_FR/LC_MESSAGES/Alltube.po b/i18n/fr_FR/LC_MESSAGES/Alltube.po index 14b0d45..34ab3a6 100644 --- a/i18n/fr_FR/LC_MESSAGES/Alltube.po +++ b/i18n/fr_FR/LC_MESSAGES/Alltube.po @@ -1,11 +1,19 @@ msgid "" msgstr "" +"Project-Id-Version: AllTube Download\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: Pierre Rudloff \n" +"Language-Team: \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: POEditor.com\n" -"Project-Id-Version: AllTube Download\n" -"Language: fr\n" +"X-Generator: Poedit 1.8.11\n" + +#: templates/error.tpl:5 +msgid "An error occurred" +msgstr "Une erreur est survenue" #: templates/error.tpl:6 msgid "Please check the URL of your video." @@ -19,9 +27,9 @@ msgstr "Vidéos extraites depuis" msgid ":" msgstr " :" -#: templates/playlist.tpl:26 templates/password.tpl:10 templates/video.tpl:97 -#: templates/video.tpl:100 templates/index.tpl:19 -#: controllers/FrontController.php:270 +#: templates/playlist.tpl:26 templates/password.tpl:10 templates/video.tpl:96 +#: templates/video.tpl:99 templates/index.tpl:19 +#: controllers/FrontController.php:275 msgid "Download" msgstr "Télécharger" @@ -41,7 +49,7 @@ msgstr "L'accès à cette vidéo nécessite un mot de passe." msgid "Video password" msgstr "Mot de passe de la vidéo" -#: templates/extractors.tpl:4 controllers/FrontController.php:164 +#: templates/extractors.tpl:4 controllers/FrontController.php:165 msgid "Supported websites" msgstr "Sites web supportés" @@ -73,6 +81,18 @@ msgstr "Pire qualité" msgid "Detailed formats" msgstr "Formats détaillés" +#: templates/video.tpl:85 +msgid "Convert into a custom format:" +msgstr "Convertir dans un format personnalisé :" + +#: templates/video.tpl:91 +msgid "with" +msgstr "avec de l'audio à" + +#: templates/video.tpl:93 +msgid "kbit/s audio" +msgstr "kbit/s" + #: templates/inc/footer.tpl:4 msgid "Code by" msgstr "Développé par" @@ -81,22 +101,26 @@ msgstr "Développé par" msgid "Design by" msgstr "Designé par" -#: templates/inc/footer.tpl:12 -msgid "AllTube Download on Facebook" -msgstr "AllTube Download sur Facebook" - -#: templates/inc/footer.tpl:12 -msgid "Like us on Facebook" -msgstr "Suivez-nous sur Facebook" - -#: templates/inc/footer.tpl:14 +#: templates/inc/footer.tpl:10 msgid "Get the code" msgstr "Obtenir le code" -#: templates/inc/footer.tpl:16 +#: templates/inc/footer.tpl:12 msgid "Based on" msgstr "Basé sur" +#: templates/inc/footer.tpl:14 +msgid "Donate using Liberapay" +msgstr "Faire un don avec Liberapay" + +#: templates/inc/footer.tpl:14 +msgid "Donate" +msgstr "Faire un don" + +#: templates/inc/header.tpl:4 +msgid "Switch language" +msgstr "Changer de langue" + #: templates/inc/header.tpl:21 msgid "Share on Twitter" msgstr "Partager sur Twitter" @@ -125,85 +149,92 @@ msgstr "Glissez ce lien dans votre barre de favoris :" msgid "Bookmarklet" msgstr "Bookmarklet" -#: templates/inc/header.tpl:4 -msgid "Switch language" -msgstr "Changer de langue" - -#: templates/error.tpl:5 -msgid "An error occurred" -msgstr "Une erreur est survenue" - -#: templates/video.tpl:86 -msgid "Convert into a custom format:" -msgstr "Convertir dans un format personnalisé :" - -#: templates/video.tpl:94 -msgid "kbit/s audio" -msgstr "kbit/s" - -#: templates/video.tpl:92 -msgid "with" -msgstr "avec de l'audio à" - #: classes/VideoDownload.php:117 msgid "Wrong password" msgstr "Mauvais mot de passe" -#: classes/VideoDownload.php:329 classes/VideoDownload.php:488 -msgid "Conversion of M3U8 files is not supported." -msgstr "La conversion des fichiers M3U8 n'est pas possible." +#: classes/VideoDownload.php:158 +msgid "youtube-dl returned an empty URL." +msgstr "youtube-dl a retourné une URL vide." -#: classes/VideoDownload.php:337 classes/VideoDownload.php:374 -#: classes/VideoDownload.php:407 classes/VideoDownload.php:440 -#: classes/VideoDownload.php:496 -msgid "Could not open popen stream." -msgstr "Impossible d'ouvrir le flux popen." - -#: classes/VideoDownload.php:464 -msgid "Could not open fopen stream." -msgstr "Impossible d'ouvrir le flux fopen." - -#: controllers/FrontController.php:121 -msgid "Easily download videos from Youtube, Dailymotion, Vimeo and other websites." -msgstr "Téléchargez facilement des vidéos depuis Youtube, Dailymotion, Vimeo et d'autres sites web." - -#: controllers/FrontController.php:165 -msgid "List of all supported websites from which Alltube Download can extract video or audio files" -msgstr "Liste de tous les sites web depuis lesquels Alltube Download peut extraire des fichiers vidéo ou audio" - -#: controllers/FrontController.php:190 -msgid "Password prompt" -msgstr "Demande de mot de passe" - -#: controllers/FrontController.php:191 -msgid "You need a password in order to download this video with Alltube Download" -msgstr "Vous avez besoin d'un mot de passe pour télécharger cette vidéo avec Alltube Download" - -#: controllers/FrontController.php:266 -msgid "Video download" -msgstr "Téléchargement d'une vidéo" - -#: controllers/FrontController.php:267 -msgid "Download video from " -msgstr "Téléchargement d'une vidéo depuis " - -#: controllers/FrontController.php:270 -msgid "from" -msgstr "depuis" - -#: controllers/FrontController.php:333 -msgid "Error" -msgstr "Erreur" - -#: controllers/FrontController.php:405 -msgid "You need to enable remux mode to merge two formats." -msgstr "Vous devez activer le mode remux pour fusionner deux formats." - -#: controllers/FrontController.php:472 -msgid "Can't find URL of video." -msgstr "Impossible de trouver l'URL de la vidéo." - -#: classes/VideoDownload.php:273 classes/VideoDownload.php:356 +#: classes/VideoDownload.php:279 classes/VideoDownload.php:369 msgid "Can't find avconv or ffmpeg at " msgstr "Impossible de trouver avconv ou ffmpeg à " +#: classes/VideoDownload.php:336 +msgid "Conversion of playlists is not supported." +msgstr "Impossible de convertir une playlist." + +#: classes/VideoDownload.php:340 classes/VideoDownload.php:501 +msgid "Conversion of M3U8 files is not supported." +msgstr "La conversion des fichiers M3U8 n'est pas possible." + +#: classes/VideoDownload.php:342 +msgid "Conversion of DASH segments is not supported." +msgstr "Impossible de convertir des segments DASH." + +#: classes/VideoDownload.php:350 classes/VideoDownload.php:387 +#: classes/VideoDownload.php:420 classes/VideoDownload.php:453 +#: classes/VideoDownload.php:509 +msgid "Could not open popen stream." +msgstr "Impossible d'ouvrir le flux popen." + +#: classes/VideoDownload.php:477 +msgid "Could not open fopen stream." +msgstr "Impossible d'ouvrir le flux fopen." + +#: controllers/FrontController.php:122 +msgid "" +"Easily download videos from Youtube, Dailymotion, Vimeo and other websites." +msgstr "" +"Téléchargez facilement des vidéos depuis Youtube, Dailymotion, Vimeo et " +"d'autres sites web." + +#: controllers/FrontController.php:166 +msgid "" +"List of all supported websites from which Alltube Download can extract video " +"or audio files" +msgstr "" +"Liste de tous les sites web depuis lesquels Alltube Download peut extraire " +"des fichiers vidéo ou audio" + +#: controllers/FrontController.php:191 +msgid "Password prompt" +msgstr "Demande de mot de passe" + +#: controllers/FrontController.php:192 +msgid "" +"You need a password in order to download this video with Alltube Download" +msgstr "" +"Vous avez besoin d'un mot de passe pour télécharger cette vidéo avec Alltube " +"Download" + +#: controllers/FrontController.php:271 +msgid "Video download" +msgstr "Téléchargement d'une vidéo" + +#: controllers/FrontController.php:272 +msgid "Download video from " +msgstr "Téléchargement d'une vidéo depuis " + +#: controllers/FrontController.php:275 +msgid "from" +msgstr "depuis" + +#: controllers/FrontController.php:338 +msgid "Error" +msgstr "Erreur" + +#: controllers/FrontController.php:410 +msgid "You need to enable remux mode to merge two formats." +msgstr "Vous devez activer le mode remux pour fusionner deux formats." + +#: controllers/FrontController.php:485 +msgid "Can't find URL of video." +msgstr "Impossible de trouver l'URL de la vidéo." + +#~ msgid "AllTube Download on Facebook" +#~ msgstr "AllTube Download sur Facebook" + +#~ msgid "Like us on Facebook" +#~ msgstr "Suivez-nous sur Facebook" diff --git a/i18n/template.pot b/i18n/template.pot index e440737..6f88d80 100644 --- a/i18n/template.pot +++ b/i18n/template.pot @@ -17,9 +17,9 @@ msgstr "" msgid ":" msgstr "" -#: templates/playlist.tpl:26 templates/password.tpl:10 templates/video.tpl:97 -#: templates/video.tpl:100 templates/index.tpl:19 -#: controllers/FrontController.php:270 +#: templates/playlist.tpl:26 templates/password.tpl:10 templates/video.tpl:96 +#: templates/video.tpl:99 templates/index.tpl:19 +#: controllers/FrontController.php:275 msgid "Download" msgstr "" @@ -39,7 +39,7 @@ msgstr "" msgid "Video password" msgstr "" -#: templates/extractors.tpl:4 controllers/FrontController.php:164 +#: templates/extractors.tpl:4 controllers/FrontController.php:165 msgid "Supported websites" msgstr "" @@ -71,15 +71,15 @@ msgstr "" msgid "Detailed formats" msgstr "" -#: templates/video.tpl:86 +#: templates/video.tpl:85 msgid "Convert into a custom format:" msgstr "" -#: templates/video.tpl:92 +#: templates/video.tpl:91 msgid "with" msgstr "" -#: templates/video.tpl:94 +#: templates/video.tpl:93 msgid "kbit/s audio" msgstr "" @@ -99,6 +99,14 @@ msgstr "" msgid "Based on" msgstr "" +#: templates/inc/footer.tpl:14 +msgid "Donate using Liberapay" +msgstr "" + +#: templates/inc/footer.tpl:14 +msgid "Donate" +msgstr "" + #: templates/inc/header.tpl:4 msgid "Switch language" msgstr "" @@ -135,64 +143,76 @@ msgstr "" msgid "Wrong password" msgstr "" -#: classes/VideoDownload.php:273 classes/VideoDownload.php:356 +#: classes/VideoDownload.php:158 +msgid "youtube-dl returned an empty URL." +msgstr "" + +#: classes/VideoDownload.php:279 classes/VideoDownload.php:369 msgid "Can't find avconv or ffmpeg at " msgstr "" -#: classes/VideoDownload.php:329 classes/VideoDownload.php:488 +#: classes/VideoDownload.php:336 +msgid "Conversion of playlists is not supported." +msgstr "" + +#: classes/VideoDownload.php:340 classes/VideoDownload.php:501 msgid "Conversion of M3U8 files is not supported." msgstr "" -#: classes/VideoDownload.php:337 classes/VideoDownload.php:374 -#: classes/VideoDownload.php:407 classes/VideoDownload.php:440 -#: classes/VideoDownload.php:496 +#: classes/VideoDownload.php:342 +msgid "Conversion of DASH segments is not supported." +msgstr "" + +#: classes/VideoDownload.php:350 classes/VideoDownload.php:387 +#: classes/VideoDownload.php:420 classes/VideoDownload.php:453 +#: classes/VideoDownload.php:509 msgid "Could not open popen stream." msgstr "" -#: classes/VideoDownload.php:464 +#: classes/VideoDownload.php:477 msgid "Could not open fopen stream." msgstr "" -#: controllers/FrontController.php:121 +#: controllers/FrontController.php:122 msgid "" "Easily download videos from Youtube, Dailymotion, Vimeo and other websites." msgstr "" -#: controllers/FrontController.php:165 +#: controllers/FrontController.php:166 msgid "" "List of all supported websites from which Alltube Download can extract video " "or audio files" msgstr "" -#: controllers/FrontController.php:190 +#: controllers/FrontController.php:191 msgid "Password prompt" msgstr "" -#: controllers/FrontController.php:191 +#: controllers/FrontController.php:192 msgid "" "You need a password in order to download this video with Alltube Download" msgstr "" -#: controllers/FrontController.php:266 +#: controllers/FrontController.php:271 msgid "Video download" msgstr "" -#: controllers/FrontController.php:267 +#: controllers/FrontController.php:272 msgid "Download video from " msgstr "" -#: controllers/FrontController.php:270 +#: controllers/FrontController.php:275 msgid "from" msgstr "" -#: controllers/FrontController.php:333 +#: controllers/FrontController.php:338 msgid "Error" msgstr "" -#: controllers/FrontController.php:405 +#: controllers/FrontController.php:410 msgid "You need to enable remux mode to merge two formats." msgstr "" -#: controllers/FrontController.php:472 +#: controllers/FrontController.php:485 msgid "Can't find URL of video." msgstr "" diff --git a/package.json b/package.json index bbec7a4..08dc658 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "alltube", "description": "HTML GUI for youtube-dl", - "version": "1.1.2", + "version": "1.1.3", "author": "Pierre Rudloff", "bugs": "https://github.com/Rudloff/alltube/issues", "dependencies": { diff --git a/phpdoc.xml b/phpdoc.xml index 17bc322..75431bc 100644 --- a/phpdoc.xml +++ b/phpdoc.xml @@ -1,4 +1,4 @@ - AllTube Download library documentation + AllTube Download library documentation diff --git a/phpunit.xml b/phpunit.xml index da84e25..20daa9a 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,18 +1,18 @@ - - - classes/ - controllers/ - - - - - tests/ - - - - - - + + + classes/ + controllers/ + + + + + tests/ + + + + + + diff --git a/resources/error.xhtml b/resources/error.xhtml index ef6883d..b62b34f 100644 --- a/resources/error.xhtml +++ b/resources/error.xhtml @@ -1,18 +1,21 @@ - + AllTube Download - Maintenance - - + + +
-
-

-
An error occurred in the application and your page could not be served. Please try again in a few moments.
-
+
+

+ +

+
An error occurred in the application and your page could not be served. Please try again in a few moments.
+
- + diff --git a/resources/maintenance.xhtml b/resources/maintenance.xhtml index ba724de..f84d871 100644 --- a/resources/maintenance.xhtml +++ b/resources/maintenance.xhtml @@ -1,18 +1,21 @@ - + AllTube Download - Maintenance - - + + +
-
-

-
This application is undergoing maintenance right now. Please check back later.
-
+
+

+ +

+
This application is undergoing maintenance right now. Please check back later.
+
- + diff --git a/resources/sitemap.xml b/resources/sitemap.xml index 9d3433b..cb423ae 100644 --- a/resources/sitemap.xml +++ b/resources/sitemap.xml @@ -1,12 +1,12 @@ - - - http://alltubedownload.net/ + + + https://alltubedownload.net/ yearly 1 - - - http://alltubedownload.net/extractors + + + https://alltubedownload.net/extractors weekly - - + + diff --git a/robots.txt b/robots.txt index d645b36..fa5e4af 100644 --- a/robots.txt +++ b/robots.txt @@ -1 +1 @@ -Sitemap: http://alltubedownload.net/resources/sitemap.xml +Sitemap: https://alltubedownload.net/resources/sitemap.xml diff --git a/templates/inc/footer.tpl b/templates/inc/footer.tpl index 4262e82..88a3ece 100644 --- a/templates/inc/footer.tpl +++ b/templates/inc/footer.tpl @@ -10,6 +10,8 @@ {t}Get the code{/t} · {t}Based on{/t} youtube-dl + · + {t}Donate{/t} diff --git a/yarn.lock b/yarn.lock index 5062bbb..7f23c66 100644 --- a/yarn.lock +++ b/yarn.lock @@ -30,10 +30,20 @@ ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + dependencies: + color-convert "^1.9.0" + ansi-styles@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178" @@ -68,8 +78,8 @@ archiver@^1.3.0: zip-stream "^1.1.0" are-we-there-yet@~1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" dependencies: delegates "^1.0.0" readable-stream "^2.0.6" @@ -97,10 +107,10 @@ async@^1.5.0, async@~1.5.2: resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" async@^2.0.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4" + version "2.6.1" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" dependencies: - lodash "^4.14.0" + lodash "^4.17.10" asynckit@^0.4.0: version "0.4.0" @@ -111,8 +121,8 @@ aws-sign2@~0.7.0: resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" aws4@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" + version "1.7.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289" balanced-match@^1.0.0: version "1.0.0" @@ -156,18 +166,6 @@ body-parser@~1.14.0: raw-body "~2.1.5" type-is "~1.6.10" -boom@4.x.x: - version "4.3.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31" - dependencies: - hoek "4.x.x" - -boom@5.x.x: - version "5.2.0" - resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02" - dependencies: - hoek "4.x.x" - brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -175,10 +173,25 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +buffer-alloc-unsafe@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" + +buffer-alloc@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" + dependencies: + buffer-alloc-unsafe "^1.1.0" + buffer-fill "^1.0.0" + buffer-crc32@^0.2.1: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" +buffer-fill@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" + buffer-shims@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" @@ -210,7 +223,7 @@ caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" -chalk@^1.0.0, chalk@^1.1.1, chalk@~1.1.1: +chalk@^1.0.0, chalk@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" dependencies: @@ -228,6 +241,14 @@ chalk@~0.4.0: has-color "~0.1.0" strip-ansi "~0.1.0" +chalk@~2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + chownr@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" @@ -239,8 +260,8 @@ clean-css@~4.1.1: source-map "0.5.x" clone@~2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" + version "2.1.1" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb" co@^4.6.0: version "4.6.0" @@ -254,9 +275,19 @@ coffeescript@~1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.10.0.tgz#e7aa8301917ef621b35d8a39f348dcdd1db7e33e" +color-convert@^1.9.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed" + dependencies: + color-name "^1.1.1" + +color-name@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + colors@*: - version "1.2.1" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.1.tgz#f4a3d302976aaf042356ba1ade3b1a2c62d9d794" + version "1.3.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.0.tgz#5f20c9fef6945cb1134260aab33bfbdc8295e04e" colors@~1.1.2: version "1.1.2" @@ -304,12 +335,6 @@ crc@^3.4.4: version "3.5.0" resolved "https://registry.yarnpkg.com/crc/-/crc-3.5.0.tgz#98b8ba7d489665ba3979f59b21381374101a1964" -cryptiles@3.x.x: - version "3.1.2" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe" - dependencies: - boom "5.x.x" - csslint@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/csslint/-/csslint-1.0.5.tgz#19cc3eda322160fd3f7232af1cb2a360e898a2e9" @@ -352,14 +377,14 @@ decompress-response@^3.3.0: dependencies: mimic-response "^1.0.0" +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + deep-extend@~0.2.5: version "0.2.11" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.2.11.tgz#7a16ba69729132340506170494bc83f7076fe08f" -deep-extend@~0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" - delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -435,8 +460,8 @@ exit@~0.1.1, exit@~0.1.2: resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" expand-template@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-1.1.0.tgz#e09efba977bf98f9ee0ed25abd0c692e02aec3fc" + version "1.1.1" + resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-1.1.1.tgz#981f188c0c3a87d2e28f559bc541426ff94f21dd" extend-object@^1.0.0: version "1.0.0" @@ -509,6 +534,10 @@ form-data@~2.3.1: combined-stream "1.0.6" mime-types "^2.1.12" +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -535,9 +564,9 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" -gaze@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105" +gaze@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a" dependencies: globule "^1.0.0" @@ -596,11 +625,11 @@ glob@~7.0.0: path-is-absolute "^1.0.0" globule@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09" + version "1.2.1" + resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d" dependencies: glob "~7.1.1" - lodash "~4.17.4" + lodash "~4.17.10" minimatch "~3.0.2" graceful-fs@^4.1.0, graceful-fs@^4.1.2: @@ -646,12 +675,12 @@ grunt-contrib-cssmin@~2.2.1: maxmin "^2.1.0" grunt-contrib-watch@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/grunt-contrib-watch/-/grunt-contrib-watch-1.0.0.tgz#84a1a7a1d6abd26ed568413496c73133e990018f" + version "1.0.1" + resolved "https://registry.yarnpkg.com/grunt-contrib-watch/-/grunt-contrib-watch-1.0.1.tgz#ca65934b6e04dbd26da684d598f79ee22f47fdac" dependencies: async "^1.5.0" - gaze "^1.0.0" - lodash "^3.10.1" + gaze "^1.1.0" + lodash "^4.0.0" tiny-lr "^0.2.1" grunt-fixpack@~0.1.0: @@ -684,40 +713,39 @@ grunt-known-options@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/grunt-known-options/-/grunt-known-options-1.1.0.tgz#a4274eeb32fa765da5a7a3b1712617ce3b144149" -grunt-legacy-log-utils@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/grunt-legacy-log-utils/-/grunt-legacy-log-utils-1.0.0.tgz#a7b8e2d0fb35b5a50f4af986fc112749ebc96f3d" +grunt-legacy-log-utils@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.0.1.tgz#d2f442c7c0150065d9004b08fd7410d37519194e" dependencies: - chalk "~1.1.1" - lodash "~4.3.0" + chalk "~2.4.1" + lodash "~4.17.10" -grunt-legacy-log@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/grunt-legacy-log/-/grunt-legacy-log-1.0.1.tgz#c7731b2745f4732aa9950ee4d7ae63c553f68469" +grunt-legacy-log@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/grunt-legacy-log/-/grunt-legacy-log-2.0.0.tgz#c8cd2c6c81a4465b9bbf2d874d963fef7a59ffb9" dependencies: colors "~1.1.2" - grunt-legacy-log-utils "~1.0.0" + grunt-legacy-log-utils "~2.0.0" hooker "~0.2.3" lodash "~4.17.5" - underscore.string "~3.3.4" -grunt-legacy-util@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/grunt-legacy-util/-/grunt-legacy-util-1.0.0.tgz#386aa78dc6ed50986c2b18957265b1b48abb9b86" +grunt-legacy-util@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/grunt-legacy-util/-/grunt-legacy-util-1.1.1.tgz#e10624e7c86034e5b870c8a8616743f0a0845e42" dependencies: async "~1.5.2" exit "~0.1.1" getobject "~0.1.0" hooker "~0.2.3" - lodash "~4.3.0" - underscore.string "~3.2.3" - which "~1.2.1" + lodash "~4.17.10" + underscore.string "~3.3.4" + which "~1.3.0" grunt-markdownlint@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/grunt-markdownlint/-/grunt-markdownlint-1.1.2.tgz#beb961e1685a064183ebad3c5afc0ca135c37e7f" + version "1.1.6" + resolved "https://registry.yarnpkg.com/grunt-markdownlint/-/grunt-markdownlint-1.1.6.tgz#2a7c89a6949b84cf6141107e2bb3d10e4dbb53da" dependencies: - markdownlint "^0.8.0" + markdownlint "^0.10.0" grunt-phpcs@~0.4.0: version "0.4.0" @@ -738,8 +766,8 @@ grunt-potomo@~3.5.0: shelljs "~0.7.5" grunt@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.0.2.tgz#4e6a5e695b70472fd5304f5fa9e34236836a73bc" + version "1.0.3" + resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.0.3.tgz#b3c99260c51d1b42835766e796527b60f7bba374" dependencies: coffeescript "~1.10.0" dateformat "~1.0.12" @@ -749,14 +777,15 @@ grunt@~1.0.1: glob "~7.0.0" grunt-cli "~1.2.0" grunt-known-options "~1.1.0" - grunt-legacy-log "~1.0.0" - grunt-legacy-util "~1.0.0" + grunt-legacy-log "~2.0.0" + grunt-legacy-util "~1.1.1" iconv-lite "~0.4.13" js-yaml "~3.5.2" minimatch "~3.0.2" + mkdirp "~0.5.1" nopt "~3.0.6" path-is-absolute "~1.0.0" - rimraf "~2.2.8" + rimraf "~2.6.2" gzip-size@^3.0.0: version "3.0.0" @@ -785,23 +814,14 @@ has-color@~0.1.0: version "0.1.7" resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f" +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" -hawk@~6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038" - dependencies: - boom "4.x.x" - cryptiles "3.x.x" - hoek "4.x.x" - sntp "2.x.x" - -hoek@4.x.x: - version "4.2.1" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb" - hooker@~0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/hooker/-/hooker-0.2.3.tgz#b834f723cc4a242aa65963459df6d984c5d3d959" @@ -818,8 +838,8 @@ http-errors@~1.3.1: statuses "1" http-parser-js@>=0.4.0: - version "0.4.11" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.11.tgz#5b720849c650903c27e521633d94696ee95f3529" + version "0.4.13" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137" http-signature@~1.2.0: version "1.2.0" @@ -834,8 +854,10 @@ iconv-lite@0.4.13: resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2" iconv-lite@~0.4.13: - version "0.4.19" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" + version "0.4.23" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" + dependencies: + safer-buffer ">= 2.1.2 < 3" iltorb@^1.0.13: version "1.3.10" @@ -893,6 +915,10 @@ is-fullwidth-code-point@^1.0.0: dependencies: number-is-nan "^1.0.0" +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -987,17 +1013,9 @@ load-json-file@^1.0.0: pinkie-promise "^2.0.0" strip-bom "^2.0.0" -lodash@^3.10.1: - version "3.10.1" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" - -lodash@^4.14.0, lodash@^4.7.0, lodash@^4.8.0, lodash@^4.8.2, lodash@~4.17.4, lodash@~4.17.5: - version "4.17.5" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" - -lodash@~4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.3.0.tgz#efd9c4a6ec53f3b05412429915c3e4824e4d25a4" +lodash@^4.0.0, lodash@^4.17.10, lodash@^4.7.0, lodash@^4.8.0, lodash@^4.8.2, lodash@~4.17.10, lodash@~4.17.5: + version "4.17.10" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" loud-rejection@^1.0.0: version "1.6.0" @@ -1020,9 +1038,9 @@ markdown-it@8.4.1: mdurl "^1.0.1" uc.micro "^1.0.5" -markdownlint@^0.8.0: - version "0.8.1" - resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.8.1.tgz#a87572ccc84273b2a723205e65fa657437fe06c6" +markdownlint@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.10.0.tgz#ee941ee943f78ff6adbc1ff0fad49365e600b664" dependencies: markdown-it "8.4.1" @@ -1090,7 +1108,7 @@ minimist@~0.0.7: version "0.0.10" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" -"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1: +"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: @@ -1105,8 +1123,8 @@ nan@^2.6.2: resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" node-abi@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.3.0.tgz#f3d554d6ac72a9ee16f0f4dc9548db7c08de4986" + version "2.4.1" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.4.1.tgz#7628c4d4ec4e9cd3764ceb3652f36b2e7f8d4923" dependencies: semver "^5.4.1" @@ -1267,8 +1285,8 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" prebuild-install@^2.3.0: - version "2.5.1" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.5.1.tgz#0f234140a73760813657c413cdccdda58296b1da" + version "2.5.3" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.5.3.tgz#9f65f242782d370296353710e9bc843490c19f69" dependencies: detect-libc "^1.0.3" expand-template "^1.0.2" @@ -1331,8 +1349,8 @@ qs@~5.1.0: resolved "https://registry.yarnpkg.com/qs/-/qs-5.1.0.tgz#4d932e5c7ea411cca76a312d39a606200fd50cd9" qs@~6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" raw-body@~2.1.5: version "2.1.7" @@ -1352,10 +1370,10 @@ rc@^0.6.0: strip-json-comments "0.1.x" rc@^1.1.6: - version "1.2.6" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.6.tgz#eb18989c6d4f4f162c399f79ddd29f3835568092" + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" dependencies: - deep-extend "~0.4.0" + deep-extend "^0.6.0" ini "~1.3.0" minimist "^1.2.0" strip-json-comments "~2.0.1" @@ -1375,16 +1393,16 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.3.5: - version "2.3.5" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d" +readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.3.0, readable-stream@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" dependencies: core-util-is "~1.0.0" inherits "~2.0.3" isarray "~1.0.0" process-nextick-args "~2.0.0" safe-buffer "~5.1.1" - string_decoder "~1.0.3" + string_decoder "~1.1.1" util-deprecate "~1.0.1" readable-stream@~2.1.2: @@ -1423,8 +1441,8 @@ repeating@^2.0.0: is-finite "^1.0.0" request@2: - version "2.85.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa" + version "2.87.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e" dependencies: aws-sign2 "~0.7.0" aws4 "^1.6.0" @@ -1434,7 +1452,6 @@ request@2: forever-agent "~0.6.1" form-data "~2.3.1" har-validator "~5.0.3" - hawk "~6.0.2" http-signature "~1.2.0" is-typedarray "~1.0.0" isstream "~0.1.2" @@ -1444,14 +1461,13 @@ request@2: performance-now "^2.1.0" qs "~6.5.1" safe-buffer "^5.1.1" - stringstream "~0.0.5" tough-cookie "~2.3.3" tunnel-agent "^0.6.0" uuid "^3.1.0" resolve@^1.1.6: - version "1.6.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c" + version "1.7.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3" dependencies: path-parse "^1.0.5" @@ -1459,19 +1475,19 @@ resolve@~1.1.0: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" -rimraf@2: +rimraf@2, rimraf@~2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" dependencies: glob "^7.0.5" -rimraf@~2.2.8: - version "2.2.8" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582" - safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + +"safer-buffer@>= 2.1.2 < 3": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" "semver@2 || 3 || 4 || 5", semver@^5.4.1: version "5.5.0" @@ -1502,19 +1518,13 @@ simple-concat@^1.0.0: resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6" simple-get@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-2.7.0.tgz#ad37f926d08129237ff08c4f2edfd6f10e0380b5" + version "2.8.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-2.8.1.tgz#0e22e91d4575d87620620bc91308d57a77f44b5d" dependencies: decompress-response "^3.3.0" once "^1.3.1" simple-concat "^1.0.0" -sntp@2.x.x: - version "2.1.0" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8" - dependencies: - hoek "4.x.x" - source-map@0.5.x: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -1571,7 +1581,7 @@ stream-buffers@^2.1.0: version "2.2.0" resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4" -string-width@^1.0.1, string-width@^1.0.2: +string-width@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" dependencies: @@ -1579,26 +1589,35 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" +"string-width@^1.0.2 || 2": + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + string_decoder@~0.10.x: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" -string_decoder@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" dependencies: safe-buffer "~5.1.0" -stringstream@~0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" - strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" dependencies: ansi-regex "^2.0.0" +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + dependencies: + ansi-regex "^3.0.0" + strip-ansi@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991" @@ -1627,9 +1646,15 @@ supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" +supports-color@^5.3.0: + version "5.4.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" + dependencies: + has-flag "^3.0.0" + tar-fs@^1.13.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.0.tgz#e877a25acbcc51d8c790da1c57c9cf439817b896" + version "1.16.2" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.2.tgz#17e5239747e399f7e77344f5f53365f04af53577" dependencies: chownr "^1.0.1" mkdirp "^0.5.1" @@ -1637,12 +1662,15 @@ tar-fs@^1.13.0: tar-stream "^1.1.2" tar-stream@^1.1.2, tar-stream@^1.5.0: - version "1.5.5" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.5.tgz#5cad84779f45c83b1f2508d96b09d88c7218af55" + version "1.6.1" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.1.tgz#f84ef1696269d6223ca48f6e1eeede3f7e81f395" dependencies: bl "^1.0.0" + buffer-alloc "^1.1.0" end-of-stream "^1.0.0" - readable-stream "^2.0.0" + fs-constants "^1.0.0" + readable-stream "^2.3.0" + to-buffer "^1.1.0" xtend "^4.0.0" tar@^2.0.0: @@ -1664,6 +1692,10 @@ tiny-lr@^0.2.1: parseurl "~1.3.0" qs "~5.1.0" +to-buffer@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" + tough-cookie@~2.3.3: version "2.3.4" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655" @@ -1695,10 +1727,6 @@ uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376" -underscore.string@~3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.2.3.tgz#806992633665d5e5fcb4db1fb3a862eb68e9e6da" - underscore.string@~3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.4.tgz#2c2a3f9f83e64762fdc45e6ceac65142864213db" @@ -1756,23 +1784,17 @@ which-pm-runs@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" -which@1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" - dependencies: - isexe "^2.0.0" - -which@~1.2.1: - version "1.2.14" - resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5" +which@1, which@~1.3.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" dependencies: isexe "^2.0.0" wide-align@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" dependencies: - string-width "^1.0.2" + string-width "^1.0.2 || 2" wrappy@1: version "1.0.2"