From 470d604f0602f492442475048834b8d3a1cbc4a3 Mon Sep 17 00:00:00 2001
From: Massimo Girondi <massimo@girondi.net>
Date: Tue, 10 Jan 2017 14:36:32 +0100
Subject: [PATCH 1/3] fix typo in main page

---
 js/translate/it_IT.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/translate/it_IT.js b/js/translate/it_IT.js
index 5e9d15d..1b80d93 100755
--- a/js/translate/it_IT.js
+++ b/js/translate/it_IT.js
@@ -47,8 +47,8 @@ translations.it_IT = {
 // starred properties
     'Quick Access Settings': 'Accesso rapido',
     'Save settings': 'Salva impostazioni',
-    'Currently no download in line to display, use the': 'Attualmente non c\'è nessun download da mostrare, usa il',
-    'download button to start downloading files!': 'pulsante Aggiungi per cominciare a scaricare!',
+    'Currently no download in line to display, use the': 'Attualmente non c\'è nessun download da mostrare, usa il pulsante ',
+    'download button to start downloading files!': 'dowload per cominciare a scaricare!',
     'Peers': 'Peers',
     'More Info': 'Altre informazioni',
     'Remove': 'Rimuovi',

From 0f7c2d3fc4f2aaa2361eeca628de558dc01d0b32 Mon Sep 17 00:00:00 2001
From: ipcjs <gipcjs@gmail.com>
Date: Mon, 6 Feb 2017 05:47:25 +0800
Subject: [PATCH 2/3] support multi header

---
 .gitignore                       |  1 +
 configuration.js                 |  2 +-
 index.html                       | 40 +++++++++++++++++++-------------
 js/ctrls/modal.js                |  2 +-
 js/ctrls/props.js                |  1 +
 js/services/settings/settings.js |  3 ++-
 6 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6fb0b49..f5f2df9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .DS_STORE
 .idea
 .git
+debug.log
diff --git a/configuration.js b/configuration.js
index 4a4c27d..4119b31 100644
--- a/configuration.js
+++ b/configuration.js
@@ -38,7 +38,7 @@ angular
 ])
 .constant('$downloadProps', [ // Similar to starred Quick Access properties but for adding new downloads.
   // go to Advance Download Options when adding a new download to view the list of possible options
-  'http-user', 'http-passwd', 'pause', 'dir', 'max-connection-per-server'
+  'header', 'http-user', 'http-passwd', 'pause', 'dir', 'max-connection-per-server'
 ])
 .constant('$globalTimeout', 1000)  // interval to update the individual downloads
 ;
diff --git a/index.html b/index.html
index 6c6e80c..e32e682 100755
--- a/index.html
+++ b/index.html
@@ -412,8 +412,9 @@
         <li ng-repeat="prop in properties" class="form-group">
           <label title="{{prop.desc}}" style="width: 100%;">{{prop.name}}</label>
           <div class="form-group">
-            <select style="width: 100%;" ng-show="prop.options.length" class="form-control" ng-options="opt for opt in prop.options" ng-model="prop.val"></select>
-            <input style="width: 100%;" ng-show="!prop.options.length" type="text" class="form-control input-large" ng-model="prop.val"/>
+            <select style="width: 100%;" ng-show="prop.options.length && !prop.multiline" class="form-control" ng-options="opt for opt in prop.options" ng-model="prop.val"></select>
+            <input style="width: 100%;" ng-show="!prop.options.length && !prop.multiline" type="text" class="form-control input-large" ng-model="prop.val"/>
+            <textarea style="width: 100%;" ng-show="prop.multiline" ng-model="prop.val"></textarea>
           </div>
         </li>
         <li>
@@ -827,9 +828,10 @@
               <label class="col-sm-3 control-label">{{name}}</label>
 
               <div class="col-sm-9 controls">
-                <select class="form-control" ng-show="set.options.length" ng-options="opt for opt in set.options" ng-model="set.val">
+                <select class="form-control" ng-show="set.options.length && !set.multiline" ng-options="opt for opt in set.options" ng-model="set.val">
                 </select>
-                <input ng-show="!set.options.length" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
+                <input ng-show="!set.options.length && !set.multiline" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
+                <textarea ng-show="set.multiline" ng-model="set.val"></textarea>
               </div>
               <br />
             </div>
@@ -847,9 +849,10 @@
 
               <label class="col-sm-3 control-label">{{name}}</label>
               <div class="col-sm-9 controls">
-                <select class="form-control" ng-show="set.options.length" ng-options="opt for opt in set.options" ng-model="set.val">
+                <select class="form-control" ng-show="set.options.length && !set.multiline" ng-options="opt for opt in set.options" ng-model="set.val">
                 </select>
-                <input ng-show="!set.options.length" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
+                <input ng-show="!set.options.length && !set.multiline" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
+                <textarea ng-show="set.multiline" ng-model="set.val"></textarea>
               </div>
               <br />
             </div>
@@ -895,9 +898,10 @@
             <label class="col-sm-3 control-label">{{name}}</label>
 
             <div class="col-sm-9 controls">
-              <select class="form-control" ng-show="set.options.length" ng-options="opt for opt in set.options" ng-model="set.val">
+              <select class="form-control" ng-show="set.options.length && !set.multiline" ng-options="opt for opt in set.options" ng-model="set.val">
               </select>
-              <input ng-show="!set.options.length" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
+              <input ng-show="!set.options.length && !set.multiline" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
+              <textarea ng-show="set.multiline" ng-model="set.val"></textarea>
             </div>
             <br />
           </div>
@@ -915,9 +919,10 @@
 
             <label class="col-sm-3 control-label">{{name}}</label>
             <div class="col-sm-9 controls">
-              <select class="form-control" ng-show="set.options.length" ng-options="opt for opt in set.options" ng-model="set.val">
+              <select class="form-control" ng-show="set.options.length && !set.multiline" ng-options="opt for opt in set.options" ng-model="set.val">
               </select>
-              <input ng-show="!set.options.length" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
+              <input ng-show="!set.options.length && !set.multiline" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
+              <textarea ng-show="set.multiline" ng-model="set.val"></textarea>
             </div>
             <br />
           </div>
@@ -962,9 +967,10 @@
             <label class="col-sm-3 control-label">{{name}}</label>
 
             <div class="col-sm-9 controls">
-              <select class="form-control" ng-show="set.options.length" ng-options="opt for opt in set.options" ng-model="set.val">
+              <select class="form-control" ng-show="set.options.length && !set.multiline" ng-options="opt for opt in set.options" ng-model="set.val">
               </select>
-              <input ng-show="!set.options.length" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
+              <input ng-show="!set.options.length && !set.multiline" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
+              <textarea ng-show="set.multiline" ng-model="set.val"></textarea>
             </div>
             <br />
           </div>
@@ -982,9 +988,10 @@
 
             <label class="col-sm-3 control-label">{{name}}</label>
             <div class="col-sm-9 controls">
-              <select class="form-control" ng-show="set.options.length" ng-options="opt for opt in set.options" ng-model="set.val">
+              <select class="form-control" ng-show="set.options.length && !set.multiline" ng-options="opt for opt in set.options" ng-model="set.val">
               </select>
-              <input ng-show="!set.options.length" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
+              <input ng-show="!set.options.length && !set.multiline" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
+              <textarea ng-show="set.multiline" ng-model="set.val"></textarea>
             </div>
             <br />
           </div>
@@ -1044,9 +1051,10 @@
           <label class="col-sm-3 control-label">{{name}}</label>
 
           <div class="col-sm-9 controls">
-            <select class="form-control" ng-show="set.options.length" ng-options="opt for opt in set.options" ng-model="set.val">
+            <select class="form-control" ng-show="set.options.length && !set.multiline" ng-options="opt for opt in set.options" ng-model="set.val">
             </select>
-            <input ng-show="!set.options.length" type="text" class="form-control input-xlarge" ng-model="set.val"/>
+            <input ng-show="!set.options.length && !set.multiline" type="text" class="form-control input-xlarge" ng-model="set.val"/>
+            <textarea ng-show="set.multiline" ng-model="set.val"></textarea>
             <div class="checkbox" ng-show="set.starred != undefined">
               <label>
                 <input type="checkbox" ng-model="set.starred"/>
diff --git a/js/ctrls/modal.js b/js/ctrls/modal.js
index 3955985..3177c3d 100644
--- a/js/ctrls/modal.js
+++ b/js/ctrls/modal.js
@@ -37,7 +37,7 @@ angular
     open: function(cb) {
       var self = this;
       this.uris = "";
-      this.downloadSettingsCollapsed = true;
+      this.downloadSettingsCollapsed = false;
       this.advancedSettingsCollapsed = true;
       this.settings = {};
       this.fsettings = _.cloneDeep(fsettings);
diff --git a/js/ctrls/props.js b/js/ctrls/props.js
index a4ba2a7..9a33bfd 100644
--- a/js/ctrls/props.js
+++ b/js/ctrls/props.js
@@ -70,6 +70,7 @@ angular.module('webui.ctrls.props', [
       nprop = nprop || {};
       nprop.name = prop.name;
       nprop.options = prop.options;
+      nprop.multiline = prop.multiline;
       if (nprop._val == nprop.val || nprop.val == prop.val) {
         nprop._val = prop.val;
         nprop.val = prop.val;
diff --git a/js/services/settings/settings.js b/js/services/settings/settings.js
index 7446d0c..0afa670 100644
--- a/js/services/settings/settings.js
+++ b/js/services/settings/settings.js
@@ -271,7 +271,8 @@ angular.module('webui.services.settings', [])
 
   "header": {
     val: '',
-    desc: "Append HEADER to HTTP request header."
+    desc: "Append HEADER to HTTP request header.",
+    multiline: true,
   },
 
   "http-accept-gzip": {

From 4b941a711a86724ff9a78163528a4e2505d949dd Mon Sep 17 00:00:00 2001
From: Peter Xia <xia@Peters-MacBook-Pro.local>
Date: Sun, 12 Feb 2017 01:06:30 -0800
Subject: [PATCH 3/3] Update Dockerfile to handle zip releases from
 https://github.com/mattn/goreman/releases.

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8418659..1dbb291 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ RUN groupadd -r dummy && useradd -r -g dummy dummy -u 1000
 
 # webui + aria2
 RUN apt-get update \
-	&& apt-get install -y aria2 busybox curl \
+	&& apt-get install -y aria2 busybox curl unzip \
 	&& rm -rf /var/lib/apt/lists/*
 
 ADD . /webui-aria2
@@ -19,8 +19,8 @@ RUN GITHUB_REPO="https://github.com/tianon/gosu" \
 # goreman supervisor install latest
 RUN GITHUB_REPO="https://github.com/mattn/goreman" \
   && LATEST=`curl -s  $GITHUB_REPO"/releases/latest" | grep -Eo "v[0-9]*.[0-9]*.[0-9]*"` \
-  && curl -L $GITHUB_REPO"/releases/download/"$LATEST"/goreman_linux_amd64.tar.gz" > goreman.tar.gz \
-  && tar -xvzf goreman.tar.gz && mv /goreman_linux_amd64/goreman /usr/local/bin/goreman && rm -R goreman*
+  && curl -L $GITHUB_REPO"/releases/download/"$LATEST"/goreman_linux_amd64.zip" > goreman.zip \
+  && unzip goreman.zip && mv /goreman /usr/local/bin/goreman && rm -R goreman*
 
 # goreman setup
 RUN echo "web: gosu dummy /bin/busybox httpd -f -p 8080 -h /webui-aria2\nbackend: gosu dummy /usr/bin/aria2c --enable-rpc --rpc-listen-all --dir=/data" > Procfile