Merge remote-tracking branch 'origin/development' into halali

# Conflicts:
#	bazarr/check_update.py

bazarr/check_update.py

@@ -1,11 +1,15 @@
-# coding=utf-8
+from get_argv import config_dir
+
+from get_settings import get_general_settings
+
 import os
 import logging
 import sqlite3
 import json
 import requests
 
-import git
+if not no_update:
+    import git
 
 from get_argv import config_dir
 

bazarr/main.py

@@ -1752,12 +1752,12 @@ def test_url(protocol, url):
         return dict(status=True, version=result)
 
 
-@route(base_url + 'test_notification/<provider>', method='GET')
+@route(base_url + 'test_notification/<protocol>/<provider:path>', method='GET')
 @custom_auth_basic(check_credentials)
-def test_notification(provider):
+def test_notification(protocol, provider):
     provider = urllib.unquote(provider)
     apobj = apprise.Apprise()
-    apobj.add(provider)
+    apobj.add(protocol + "://" + provider)
 
     apobj.notify(
         title='Bazarr test notification',

views/settings.tpl

@@ -1366,8 +1366,14 @@
 
 <script>
     $('.test_notification').on('click', function() {
+        const url_field = $(this).prev().val();
+        const url_protocol = url_field.split(':')[0];
+        const url_string = url_field.split('://')[1];
+        alert(url_protocol);
+        alert(url_string);
+
         $.ajax({
-            url: "{{base_url}}test_notification/" + encodeURIComponent($(this).prev().val()),
+            url: "{{base_url}}test_notification/" + url_protocol + "/" + encodeURIComponent(url_string),
             beforeSend: function () {
                 $('#loader').addClass('active');
             },