Merge branch 'master' into Multi-user

resources/views/supportedapps/couchpotato.blade.php

@@ -3,10 +3,14 @@
     <input type="hidden" name="config[enabled]" value="1" />
     <input type="hidden" data-config="dataonly" class="config-item" name="config[dataonly]" value="1" />
     <input type="hidden" data-config="type" class="config-item" name="config[type]" value="\App\SupportedApps\CouchPotato" />
+    <div class="input">
+        <label>{{ strtoupper(__('app.url')) }}</label>
+        {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
+    </div>
     <div class="input">
         <label>{{ __('app.apps.apikey') }}</label>
         {!! Form::text('config[apikey]', null, array('placeholder' => __('app.apps.apikey'), 'data-config' => 'apikey', 'class' => 'form-control config-item')) !!}
-    </div>
+    </div> 
     <div class="input">
         <button style="margin-top: 32px;" class="btn test" id="test_config">Test</button>
     </div>

resources/views/supportedapps/deluge.blade.php

@@ -1,6 +1,15 @@
 <h2>{{ __('app.apps.config') }} ({{ __('app.optional') }})</h2>
 <div class="items">
+    <input type="hidden" name="config[enabled]" value="1" />
     <input type="hidden" data-config="type" class="config-item" name="config[type]" value="\App\SupportedApps\Deluge" />
+    <div class="input">
+        <label>{{ strtoupper(__('app.url')) }}</label>
+        {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
+    </div>
+    <div class="input">
+        <label>{{ __('app.apps.username') }}</label>
+        {!! Form::text('config[username]', null, array('placeholder' => __('app.apps.username'), 'data-config' => 'username', 'class' => 'form-control config-item')) !!}
+    </div>
     <div class="input">
         <label>{{ __('app.apps.password') }}</label>
         {!! Form::text('config[password]', null, array('placeholder' => __('app.apps.password'), 'data-config' => 'password', 'class' => 'form-control config-item')) !!}