Merge branch 'develop' into feature/stream

Conflicts: composer.lock
2017-01-16 11:06:39 +01:00 · 2017-01-16 11:06:39 +01:00 · 8e6c33c260
commit 8e6c33c260
parent 0437b19e63 d1e744e42c
14 changed files with 288 additions and 64 deletions
--- a/templates/video.tpl
+++ b/templates/video.tpl
@ -24,6 +24,9 @@
    <h3><label for="format">Available formats:</label></h3>
    <form action="{path_for name="redirect"}">
        <input type="hidden" name="url" value="{$video->webpage_url}" />
+        {if uglyUrls}
+            <input type="hidden" name="page" value="redirect" />
+        {/if}
        <select name="format" id="format" class="formats monospace">
            <optgroup label="Generic formats">
                <option value="best">