Merge branch 'master' of github.com:ZoneMinder/zmNinja

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v1.7.007](https://github.com/ZoneMinder/zmNinja/tree/v1.7.007) (2024-03-03)
+
+[Full Changelog](https://github.com/ZoneMinder/zmNinja/compare/v1.7.006...v1.7.007)
+
+- Switch internal webview paths from https to http
+- This resolves issues on Android loading events and live views from non-https servers.
+
+
 ## [v1.7.006](https://github.com/ZoneMinder/zmNinja/tree/v1.7.006) (2024-01-22)
 
 [Full Changelog](https://github.com/ZoneMinder/zmNinja/compare/v1.7.005...v1.7.006)

docs/guides/validating-api.rst

@@ -32,7 +32,7 @@ helps)
 -  Step 2: Log into ZM
 -  Step 3: Open another tab in the same browser (**IMPORTANT**: Has to
    be from the same browser you logged into ZM)
--  Step 4: Type in ``http://server/zm/api/monitors.json`` --> you
+-  Step 4: Type in ``http://server/zm/api/host/getVersion.json`` --> you
    should see a response like:
 
    .. code:: json
@@ -108,4 +108,4 @@ zmNinja API notes:
    remotely from your desktop browser, ensure it works and then use the
    same DNS/IP for zmNinja
 
-- If you are sure everything looks good, but zmNinja is causing issues, also try and clear API cache (menu->clear API cache)
+- If you are sure everything looks good, but zmNinja is causing issues, also try and clear API cache (menu->clear API cache)

package.json

@@ -75,7 +75,8 @@
       "cordova-plugin-network-information": {},
       "cordova-plugin-statusbar": {},
       "cordova-plugin-photo-library-zm": {},
-      "cordova-plugin-cloud-settings": {}
+      "cordova-plugin-cloud-settings": {},
+      "cordova-plugin-certificates-pp-fork": {}
     }
   },
   "dependencies": {
@@ -138,6 +139,7 @@
     "@ionic/v1-toolkit": "^3.0.22",
     "bower": "^1.8.13",
     "cordova-android": "^12.0.1",
+    "cordova-plugin-certificates-pp-fork": "^0.9.1",
     "cordova-plugin-cloud-settings": "^2.0.0",
     "cordova-plugin-file": "^8.0.0",
     "cordova-plugin-file-transfer": "github:apache/cordova-plugin-file-transfer",

www/templates/monitors-modal.html

@@ -20,7 +20,9 @@
                   image-spinner-src="{{constructSingleStream()}}" ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}"
                   on-swipe-left="onSwipe(monitorId,1)" on-swipe-right="onSwipe(monitorId,-1)" on-double-tap="closeModal();"
                   on-tap="showHideControls();"
-                  imageonload="imageLoaded();"  />
+                  imageonload="imageLoaded();"
+		  image-on-error="processImageError(this);"
+		  />
 
               </div>
               <div ng-if="animationInProgress">