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

Merge branch 'develop' into feature/stream

Browse source 
Conflicts:
	composer.lock
This commit is contained in:
Pierre Rudloff 2017-01-02 00:25:31 +01:00
commit 0437b19e63
2 changed files with 62 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
FAQ.md
View file

@ -42,7 +42,15 @@ sudo apt-get install libav-tools curl
Create a dyno with the following buildpacks:
* `heroku/php`
* `https://github.com/heroku/heroku-buildpack-nodejs`
* `heroku/nodejs`
* `heroku/python`
You might also need to add the following config variables:
```env
CONVERT=1
PYTHON=/app/.heroku/python/bin/python
```
Then push the code to Heroku and it should work out of the box.

107
composer.lock generated
View file

@ -4,7 +4,6 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "4493f6542773480e0317a90a2de2f82e",
"content-hash": "73c835f77628ac1e77dee70447711759",
"packages": [
{
@ -67,7 +66,7 @@
"session",
"sessions"
],
"time": "2016-10-03 20:28:32"
"time": "2016-10-03T20:28:32+00:00"
},
{
"name": "container-interop/container-interop",
@ -94,7 +93,7 @@
"MIT"
],
"description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
"time": "2014-12-30 15:22:37"
"time": "2014-12-30T15:22:37+00:00"
},
{
"name": "guzzlehttp/guzzle",
@ -156,7 +155,7 @@
"rest",
"web service"
],
"time": "2016-10-08 15:01:37"
"time": "2016-10-08T15:01:37+00:00"
},
{
"name": "guzzlehttp/promises",
@ -207,7 +206,7 @@
"keywords": [
"promise"
],
"time": "2016-12-20 10:07:11"
"time": "2016-12-20T10:07:11+00:00"
},
{
"name": "guzzlehttp/psr7",
@ -265,7 +264,7 @@
"stream",
"uri"
],
"time": "2016-06-24 23:00:38"
"time": "2016-06-24T23:00:38+00:00"
},
{
"name": "jeremykendall/php-domain-parser",
@ -327,7 +326,7 @@
"domain parsing",
"url parsing"
],
"time": "2015-03-30 12:49:45"
"time": "2015-03-30T12:49:45+00:00"
},
{
"name": "league/uri",
@ -391,7 +390,7 @@
"url",
"ws"
],
"time": "2016-03-24 08:38:29"
"time": "2016-03-24T08:38:29+00:00"
},
{
"name": "mathmarques/smarty-view",
@ -441,20 +440,20 @@
"template",
"view"
],
"time": "2016-08-25 19:04:49"
"time": "2016-08-25T19:04:49+00:00"
},
{
"name": "nikic/fast-route",
"version": "v1.0.1",
"version": "v1.1.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/FastRoute.git",
"reference": "8ea928195fa9b907f0d6e48312d323c1a13cc2af"
"reference": "f3dcf5130e634b6123d40727d612ec6aa4f61fb3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/FastRoute/zipball/8ea928195fa9b907f0d6e48312d323c1a13cc2af",
"reference": "8ea928195fa9b907f0d6e48312d323c1a13cc2af",
"url": "https://api.github.com/repos/nikic/FastRoute/zipball/f3dcf5130e634b6123d40727d612ec6aa4f61fb3",
"reference": "f3dcf5130e634b6123d40727d612ec6aa4f61fb3",
"shasum": ""
},
"require": {
@ -484,7 +483,7 @@
"router",
"routing"
],
"time": "2016-06-12 19:08:51"
"time": "2016-10-20T17:36:47+00:00"
},
{
"name": "pimple/pimple",
@ -530,7 +529,7 @@
"container",
"dependency injection"
],
"time": "2015-09-11 15:10:35"
"time": "2015-09-11T15:10:35+00:00"
},
{
"name": "psr/http-message",
@ -580,7 +579,7 @@
"request",
"response"
],
"time": "2016-08-06 14:39:51"
"time": "2016-08-06T14:39:51+00:00"
},
{
"name": "ptachoire/process-builder-chain",
@ -616,7 +615,7 @@
}
],
"description": "Add ability to chain symfony processes",
"time": "2016-04-10 08:33:20"
"time": "2016-04-10T08:33:20+00:00"
},
{
"name": "rudloff/rtmpdump-bin",
@ -644,7 +643,7 @@
"GPL-2.0"
],
"description": "rtmpdump binary for Linux 64 bit",
"time": "2016-04-12 19:17:32"
"time": "2016-04-12T19:17:32+00:00"
},
{
"name": "rudloff/smarty-plugin-noscheme",
@ -685,7 +684,7 @@
}
],
"description": "Smarty modifier that removes the scheme in URLs",
"time": "2016-04-09 00:40:13"
"time": "2016-04-09T00:40:13+00:00"
},
{
"name": "slim/slim",
@ -755,7 +754,7 @@
"micro",
"router"
],
"time": "2016-12-20 20:30:47"
"time": "2016-12-20T20:30:47+00:00"
},
{
"name": "smarty/smarty",
@ -808,7 +807,7 @@
"keywords": [
"templating"
],
"time": "2016-12-14 21:57:25"
"time": "2016-12-14T21:57:25+00:00"
},
{
"name": "symfony/process",
@ -857,7 +856,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2016-11-24 10:40:28"
"time": "2016-11-24T10:40:28+00:00"
},
{
"name": "symfony/yaml",
@ -912,7 +911,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2016-12-10 10:07:06"
"time": "2016-12-10T10:07:06+00:00"
}
],
"packages-dev": [
@ -968,7 +967,7 @@
"constructor",
"instantiate"
],
"time": "2015-06-14 21:17:01"
"time": "2015-06-14T21:17:01+00:00"
},
{
"name": "ffmpeg/ffmpeg",
@ -1024,7 +1023,7 @@
"object",
"object graph"
],
"time": "2016-10-31 17:19:45"
"time": "2016-10-31T17:19:45+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@ -1078,7 +1077,7 @@
"reflection",
"static analysis"
],
"time": "2015-12-27 11:43:31"
"time": "2015-12-27T11:43:31+00:00"
},
{
"name": "phpdocumentor/reflection-docblock",
@ -1123,7 +1122,7 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2016-09-30 07:12:33"
"time": "2016-09-30T07:12:33+00:00"
},
{
"name": "phpdocumentor/type-resolver",
@ -1170,7 +1169,7 @@
"email": "me@mikevanriel.com"
}
],
"time": "2016-11-25 06:54:22"
"time": "2016-11-25T06:54:22+00:00"
},
{
"name": "phpspec/prophecy",
@ -1233,7 +1232,7 @@
"spy",
"stub"
],
"time": "2016-11-21 14:58:47"
"time": "2016-11-21T14:58:47+00:00"
},
{
"name": "phpunit/php-code-coverage",
@ -1296,7 +1295,7 @@
"testing",
"xunit"
],
"time": "2016-12-20 15:22:42"
"time": "2016-12-20T15:22:42+00:00"
},
{
"name": "phpunit/php-file-iterator",
@ -1343,7 +1342,7 @@
"filesystem",
"iterator"
],
"time": "2016-10-03 07:40:28"
"time": "2016-10-03T07:40:28+00:00"
},
{
"name": "phpunit/php-text-template",
@ -1384,7 +1383,7 @@
"keywords": [
"template"
],
"time": "2015-06-21 13:50:34"
"time": "2015-06-21T13:50:34+00:00"
},
{
"name": "phpunit/php-timer",
@ -1428,7 +1427,7 @@
"keywords": [
"timer"
],
"time": "2016-05-12 18:03:57"
"time": "2016-05-12T18:03:57+00:00"
},
{
"name": "phpunit/php-token-stream",
@ -1477,20 +1476,20 @@
"keywords": [
"tokenizer"
],
"time": "2016-11-15 14:06:22"
"time": "2016-11-15T14:06:22+00:00"
},
{
"name": "phpunit/phpunit",
"version": "5.7.4",
"version": "5.7.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "af91da3f2671006ff5d0628023de3b7ac4d1ef09"
"reference": "50fd2be8f3e23e91da825f36f08e5f9633076ffe"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/af91da3f2671006ff5d0628023de3b7ac4d1ef09",
"reference": "af91da3f2671006ff5d0628023de3b7ac4d1ef09",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/50fd2be8f3e23e91da825f36f08e5f9633076ffe",
"reference": "50fd2be8f3e23e91da825f36f08e5f9633076ffe",
"shasum": ""
},
"require": {
@ -1559,7 +1558,7 @@
"testing",
"xunit"
],
"time": "2016-12-13 16:19:44"
"time": "2016-12-28T07:18:51+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
@ -1618,7 +1617,7 @@
"mock",
"xunit"
],
"time": "2016-12-08 20:27:08"
"time": "2016-12-08T20:27:08+00:00"
},
{
"name": "rg3/youtube-dl",
@ -1674,7 +1673,7 @@
],
"description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
"time": "2016-02-13 06:45:14"
"time": "2016-02-13T06:45:14+00:00"
},
{
"name": "sebastian/comparator",
@ -1738,7 +1737,7 @@
"compare",
"equality"
],
"time": "2016-11-19 09:18:40"
"time": "2016-11-19T09:18:40+00:00"
},
{
"name": "sebastian/diff",
@ -1790,7 +1789,7 @@
"keywords": [
"diff"
],
"time": "2015-12-08 07:14:41"
"time": "2015-12-08T07:14:41+00:00"
},
{
"name": "sebastian/environment",
@ -1840,7 +1839,7 @@
"environment",
"hhvm"
],
"time": "2016-11-26 07:53:53"
"time": "2016-11-26T07:53:53+00:00"
},
{
"name": "sebastian/exporter",
@ -1907,7 +1906,7 @@
"export",
"exporter"
],
"time": "2016-11-19 08:54:04"
"time": "2016-11-19T08:54:04+00:00"
},
{
"name": "sebastian/global-state",
@ -1958,7 +1957,7 @@
"keywords": [
"global state"
],
"time": "2015-10-12 03:26:01"
"time": "2015-10-12T03:26:01+00:00"
},
{
"name": "sebastian/object-enumerator",
@ -2004,7 +2003,7 @@
],
"description": "Traverses array structures and object graphs to enumerate all referenced objects",
"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
"time": "2016-11-19 07:35:10"
"time": "2016-11-19T07:35:10+00:00"
},
{
"name": "sebastian/recursion-context",
@ -2057,7 +2056,7 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
"time": "2016-11-19 07:33:16"
"time": "2016-11-19T07:33:16+00:00"
},
{
"name": "sebastian/resource-operations",
@ -2099,7 +2098,7 @@
],
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
"time": "2015-07-28 20:34:47"
"time": "2015-07-28T20:34:47+00:00"
},
{
"name": "sebastian/version",
@ -2142,7 +2141,7 @@
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
"time": "2016-10-03 07:35:21"
"time": "2016-10-03T07:35:21+00:00"
},
{
"name": "squizlabs/php_codesniffer",
@ -2220,7 +2219,7 @@
"phpcs",
"standards"
],
"time": "2016-11-30 04:02:31"
"time": "2016-11-30T04:02:31+00:00"
},
{
"name": "symfony/polyfill-mbstring",
@ -2279,7 +2278,7 @@
"portable",
"shim"
],
"time": "2016-11-14 01:06:16"
"time": "2016-11-14T01:06:16+00:00"
},
{
"name": "symfony/var-dumper",
@ -2342,7 +2341,7 @@
"debug",
"dump"
],
"time": "2016-12-11 14:34:22"
"time": "2016-12-11T14:34:22+00:00"
},
{
"name": "webmozart/assert",
@ -2392,7 +2391,7 @@
"check",
"validate"
],
"time": "2016-11-23 20:04:58"
"time": "2016-11-23T20:04:58+00:00"
}
],
"aliases": [],