Merge branch 'develop' into feature/stream

This commit is contained in:
Pierre Rudloff 2016-04-10 19:01:13 +02:00
commit f267bac3ba
12 changed files with 12 additions and 8 deletions

19
composer.lock generated
View file

@ -545,25 +545,30 @@
}, },
{ {
"name": "rudloff/smarty-plugin-noscheme", "name": "rudloff/smarty-plugin-noscheme",
"version": "0.1.0", "version": "0.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Rudloff/smarty-plugin-noscheme.git", "url": "https://github.com/Rudloff/smarty-plugin-noscheme.git",
"reference": "537bcb2f7576252af70d8f9f817bfe050d873072" "reference": "7b64350bd255690e44db497e50bb5edc5e87d5e6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Rudloff/smarty-plugin-noscheme/zipball/537bcb2f7576252af70d8f9f817bfe050d873072", "url": "https://api.github.com/repos/Rudloff/smarty-plugin-noscheme/zipball/7b64350bd255690e44db497e50bb5edc5e87d5e6",
"reference": "537bcb2f7576252af70d8f9f817bfe050d873072", "reference": "7b64350bd255690e44db497e50bb5edc5e87d5e6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"league/uri": "~4.0" "league/uri": "~4.1.1"
}, },
"require-dev": { "require-dev": {
"symfony/var-dumper": "~2.7.6" "symfony/var-dumper": "~3.0.1"
}, },
"type": "library", "type": "library",
"autoload": {
"files": [
"modifier.noscheme.php"
]
},
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"GPL-3.0" "GPL-3.0"
@ -577,7 +582,7 @@
} }
], ],
"description": "Smarty modifier that removes the scheme in URLs", "description": "Smarty modifier that removes the scheme in URLs",
"time": "2015-10-31 10:25:47" "time": "2016-04-09 00:40:13"
}, },
{ {
"name": "slim/slim", "name": "slim/slim",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 730 B

After

Width:  |  Height:  |  Size: 728 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 127 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Before After
Before After

View file

@ -13,7 +13,6 @@
* @link http://rudloff.pro * @link http://rudloff.pro
* */ * */
require_once __DIR__.'/vendor/autoload.php'; require_once __DIR__.'/vendor/autoload.php';
require_once __DIR__.'/vendor/rudloff/smarty-plugin-noscheme/modifier.noscheme.php';
use Alltube\VideoDownload; use Alltube\VideoDownload;
use Alltube\Controller\FrontController; use Alltube\Controller\FrontController;