Merge lunar:sandbox/zmNinja

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.zoneminder.zmNinja" version="1.6.010" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.zoneminder.zmNinja" version="1.7.000" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>zmNinja</name>
     <description>
 	High performance ZoneMinder client

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zmninjapro",
   "description": "Home security mobile app for ZoneMinder",
-  "version": "1.6.010",
+  "version": "1.7.000",
   "displayName": "zmNinja",
   "author": "Zoneminder Inc, Pliable Pixels",
   "repository": {
@@ -146,7 +146,7 @@
     "cordova-plugin-photo-library-zm": "^3.0.5",
     "cordova-plugin-x-socialsharing-android12": "^6.0.5",
     "dotenv": "^16.0.1",
-    "electron": "^20.0.1",
+    "electron": "^22.3.25",
     "electron-builder": "^23.3.3",
     "electron-cli": "^0.2.8",
     "electron-notarize": "^1.2.1",
@@ -252,4 +252,4 @@
       ]
     }
   }
-}
+}

www/js/NVR.js

@@ -22,7 +22,7 @@ angular.module('zmApp.controllers')
         DO NOT TOUCH zmAppVersion
         It is changed by sync_version.sh
       */
-      var zmAppVersion = "1.6.010";
+      var zmAppVersion = "1.7.000";
 
       var isBackground = false;
       var justResumed = false;

www/lang/README.md

@@ -1,10 +1,10 @@
 
-If you are familiar with using git, I'd prefer if you follow the Pull Request process [here](https://github.com/pliablepixels/zmNinja/blob/master/CONTRIBUTING.md#steps-for-code-contribution).
+If you are familiar with using git, I'd prefer if you follow the Pull Request process [here](https://github.com/ZoneMinder/zmNinja/blob/master/CONTRIBUTING.md#steps-for-code-contribution).
 
 #### Adding a new language
-* Languages translations are available [here](https://github.com/pliablepixels/zmNinja/tree/master/www/lang)
+* Languages translations are available [here](https://github.com/ZoneMinder/zmNinja/tree/master/www/lang)
 * To contribute a new language, add a new ``locale-xx.json`` (where `xx` is your language code).
-* Ideally, you should also provide a language translation for the zmNinja help file inside [lang/help](https://github.com/pliablepixels/zmNinja/tree/master/www/lang/help)
+* Ideally, you should also provide a language translation for the zmNinja help file inside [lang/help](https://github.com/ZoneMinder/zmNinja/tree/master/www/lang/help)
 
 The best way is to simply look at an existing language translation and follow the same model for yours. If any language translation keywords are missed, it will fallback to English.
 

www/lang/help/help-de.html

@@ -21,5 +21,5 @@ <h2>
   <h2>
     <b>Wie kontaktiere ich den Programmierer?</b>
   </h2>
-  Am Besten erstellst Du bitte eine <a href="https://github.com/pliablepixels/zmninja/issues">GitHub Meldung</a>, alternativ kannst Du auch eine E-Mail an pliablepixels@gmail.com schicken.
+  Am Besten erstellst Du bitte eine <a href="https://github.com/ZoneMinder/zmninja/issues">GitHub Meldung</a>, alternativ kannst Du auch eine E-Mail an info@zoneminder.com schicken.
 </ion-item>

www/lang/help/help-en.html

@@ -22,5 +22,5 @@ <h2>
   <h2>
     <b>How do I contact the author?</b>
   </h2> 
-  Create a <a href="https://github.com/pliablepixels/zmninja/issues">GitHub issue</a> or email me at pliablepixels@gmail.com (I prefer GitHub issues for bug reports)
+  Create a <a href="https://github.com/ZoneMinder/zmninja/issues">GitHub issue</a> or email me at info@zoneminder.com (I prefer GitHub issues for bug reports)
 </ion-item>

www/lang/help/help-it.html

@@ -22,5 +22,5 @@ <h2>
   <h2>
     <b>Come posso contattare lo sviluppatore?</b>
   </h2> 
-  Crea un <a href="https://github.com/pliablepixels/zmninja/issues">GitHub issue</a> o mandami una mail a pliablepixels@gmail.com (Preferisco gli issue Github per tenere traccia dei problemi e dei bug)
+  Crea un <a href="https://github.com/ZoneMinder/zmninja/issues">GitHub issue</a> o mandami una mail a info@zoneminder.com (Preferisco gli issue Github per tenere traccia dei problemi e dei bug)
 </ion-item>

www/lang/help/help-pl.html

@@ -22,5 +22,5 @@ <h2>
   <h2>
     <b>Jak skontaktuję się z autorem?</b>
   </h2> 
-  Utwórz <a href="https://github.com/pliablepixels/zmninja/issues">issue na GitHub</a> lub wyślij email na pliablepixels@gmail.com (Do zgłaszania błędów preferuję GitHub)
+  Utwórz <a href="https://github.com/ZoneMinder/zmNinja/issues">issue na GitHub</a> lub wyślij email na info@zoneminder.com (Do zgłaszania błędów preferuję GitHub)
 </ion-item>

www/lang/help/help-se.html

@@ -21,6 +21,6 @@ <h2>
 <ion-item class="item-text-wrap">
   <h2>
     <b>Hur kontaktar jag författaren?</b>
-  </h2> Skicka mig ett email <button class="button icon ion-play button-small button-outline button-positive" ng-click="launchUrl('mailto:pliablepixels@gmail.com')"></button>
+  </h2> Skicka mig ett email <button class="button icon ion-play button-small button-outline button-positive" ng-click="launchUrl('mailto:info@zoneminder.com')"></button>
 </ion-item>