Merge branch 'develop' into feature/stream

Conflicts:
	composer.lock
This commit is contained in:
Pierre Rudloff 2017-01-16 11:06:39 +01:00
commit 8e6c33c260
14 changed files with 288 additions and 64 deletions

View file

@ -80,13 +80,16 @@ class FrontController
*/
public function index(Request $request, Response $response)
{
$uri = $request->getUri();
$this->view->render(
$response,
'index.tpl',
[
'convert' => $this->config->convert,
'class' => 'index',
'description' => 'Easily download videos from Youtube, Dailymotion, Vimeo and other websites.',
'convert' => $this->config->convert,
'uglyUrls' => $this->config->uglyUrls,
'class' => 'index',
'description' => 'Easily download videos from Youtube, Dailymotion, Vimeo and other websites.',
'domain' => $uri->getScheme().'://'.$uri->getAuthority(),
]
);
}