summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md4
-rw-r--r--config.xml6
-rw-r--r--package.json6
-rw-r--r--www/js/NVR.js2
4 files changed, 10 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c8c5c05..a1f52537 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
# Change Log
-## [v1.3.082](https://github.com/pliablepixels/zmNinja/tree/v1.3.082) (2019-11-08)
+## [v1.3.082](https://github.com/pliablepixels/zmNinja/tree/v1.3.082) (2019-11-12)
[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.3.079...v1.3.082)
**Implemented enhancements:**
@@ -18,6 +18,8 @@
**Merged pull requests:**
+- Update locale-de.json [\#865](https://github.com/pliablepixels/zmNinja/pull/865) ([florie1706](https://github.com/florie1706))
+- optimized translation [\#864](https://github.com/pliablepixels/zmNinja/pull/864) ([florie1706](https://github.com/florie1706))
- \#857 api caching layer [\#862](https://github.com/pliablepixels/zmNinja/pull/862) ([florie1706](https://github.com/florie1706))
- add option to pause streams for simul, turn it off for default [\#861](https://github.com/pliablepixels/zmNinja/pull/861) ([maymaymay](https://github.com/maymaymay))
- \#857 api caching layer [\#860](https://github.com/pliablepixels/zmNinja/pull/860) ([maymaymay](https://github.com/maymaymay))
diff --git a/config.xml b/config.xml
index 716292fd..f31594ca 100644
--- a/config.xml
+++ b/config.xml
@@ -176,10 +176,10 @@
<plugin name="cordova-plugin-photo-library" spec="https://github.com/pliablepixels/cordova-plugin-photo-library">
<variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value=" " />
</plugin>
- <plugin name="cordova-plugin-ionic-webview" spec="https://github.com/pliablepixels/cordova-plugin-ionic-webview.git">
- <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" />
- </plugin>
<plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
<engine name="android" spec="8.0.0" />
<engine name="ios" spec="^5.0.1" />
+ <plugin name="cordova-plugin-ionic-webview" spec="https://github.com/pliablepixels/cordova-plugin-ionic-webview.git">
+ <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" />
+ </plugin>
</widget>
diff --git a/package.json b/package.json
index 6649e40c..318f2569 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "zmninjapro",
"description": "Home security mobile app for ZoneMinder",
- "version": "1.3.080",
+ "version": "1.3.082",
"displayName": "zmNinja",
"author": "Pliable Pixels",
"license": "custom see LICENSE.md",
@@ -58,10 +58,10 @@
"cordova-plugin-photo-library": {
"PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save monitor photos to albums"
},
+ "cordova-plugin-media-pp-fork": {},
"cordova-plugin-ionic-webview": {
"ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
- },
- "cordova-plugin-media-pp-fork": {}
+ }
}
},
"dependencies": {
diff --git a/www/js/NVR.js b/www/js/NVR.js
index 7632ba29..33bf0a8b 100644
--- a/www/js/NVR.js
+++ b/www/js/NVR.js
@@ -21,7 +21,7 @@ angular.module('zmApp.controllers')
DO NOT TOUCH zmAppVersion
It is changed by sync_version.sh
*/
- var zmAppVersion = "1.3.080";
+ var zmAppVersion = "1.3.082";
var zmAPIVersion = null;
var isBackground = false;
var justResumed = false;