From 6c4a09cda7a653a3c4b0699dc4a7e7455ce9397b Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 18 Jan 2024 09:37:50 -0500 Subject: [PATCH 1/5] Add processImageError to monitors modal to help dbug failed image loading --- www/templates/monitors-modal.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 69b25323b..82238cbef 100644 --- a/www/templates/monitors-modal.html +++ b/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);" + />
From 087da93fdf1f916a276057356c8c53268bc06c13 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 18 Jan 2024 09:55:17 -0500 Subject: [PATCH 2/5] Add cordova-plugin-certificates-pp-fork which i think gets added when building packages --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 3d225cec3..c09084816 100644 --- a/package.json +++ b/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", From 5f26078d75dda9a9882191b06f6d11f0ac364d10 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 18 Jan 2024 09:41:23 -0500 Subject: [PATCH 3/5] Add .idea dir which I think comes from android studio --- .idea/.gitignore | 3 +++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ .idea/zmNinja.iml | 9 +++++++++ 5 files changed, 32 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/zmNinja.iml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..26d33521a --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..639900d13 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..f4c04f40c --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..35eb1ddfb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/zmNinja.iml b/.idea/zmNinja.iml new file mode 100644 index 000000000..d6ebd4805 --- /dev/null +++ b/.idea/zmNinja.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file From a3f3e895b9607d3efeebb09b483ab0558b5a26ba Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 3 Mar 2024 14:15:33 -0500 Subject: [PATCH 4/5] Update changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fbb4f3c5..6c5845498 100644 --- a/CHANGELOG.md +++ b/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) From 88b71a30c9bdd8075e4d341c8ec3eeea9bb5118b Mon Sep 17 00:00:00 2001 From: Nicholas Date: Wed, 28 Aug 2024 13:53:14 -0400 Subject: [PATCH 5/5] zmNinja/docs/guides/validating-api.rst: fixed link in step 4 to point to version info rather than monitors --- docs/guides/validating-api.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/validating-api.rst b/docs/guides/validating-api.rst index 1ac01d057..2bcdf3bb7 100644 --- a/docs/guides/validating-api.rst +++ b/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) \ No newline at end of file +- If you are sure everything looks good, but zmNinja is causing issues, also try and clear API cache (menu->clear API cache)