From 153554e805fa527109d2af110c92efbdf149d3d2 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Fri, 23 Nov 2018 19:41:12 -0500 Subject: version --- CHANGELOG.md | 24 ++++++++++++++++++------ config.xml | 6 +++--- package.json | 12 ++++++------ www/js/DataModel.js | 2 +- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7e6a1bf..ba133150 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Change Log +## [v1.3.032](https://github.com/pliablepixels/zmNinja/tree/v1.3.032) (2018-11-23) +[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.3.029...v1.3.032) + +**Closed issues:** + +- Events playback doens't work in zmNinja with ZoneMinder 1.32.2 but works on native web interface [\#744](https://github.com/pliablepixels/zmNinja/issues/744) + +**Merged pull requests:** + +- more storage areas fixes [\#743](https://github.com/pliablepixels/zmNinja/pull/743) ([florie1706](https://github.com/florie1706)) +- more storage areas fixes [\#742](https://github.com/pliablepixels/zmNinja/pull/742) ([maymaymay](https://github.com/maymaymay)) +- Some corrections in translation [\#741](https://github.com/pliablepixels/zmNinja/pull/741) ([dado-ca](https://github.com/dado-ca)) + ## [v1.3.029](https://github.com/pliablepixels/zmNinja/tree/v1.3.029) (2018-11-07) [Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.3.018...v1.3.029) @@ -693,7 +706,6 @@ **Closed issues:** - Switching servers without saving first causes the app to freeze \(android/ios\) [\#320](https://github.com/pliablepixels/zmNinja/issues/320) -- Cycle monitors [\#319](https://github.com/pliablepixels/zmNinja/issues/319) ## [v1.2.18](https://github.com/pliablepixels/zmNinja/tree/v1.2.18) (2016-09-02) [Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.2.17...v1.2.18) @@ -1031,7 +1043,7 @@ - Developer setting for Frame Update allows decimals [\#114](https://github.com/pliablepixels/zmNinja/issues/114) ## [v0.87.3](https://github.com/pliablepixels/zmNinja/tree/v0.87.3) (2015-12-15) -[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v0.87.2...v0.87.3) +[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v0.87...v0.87.3) **Closed issues:** @@ -1045,11 +1057,11 @@ - Bulk frames are causing problems with the scrub bar positioning of alarmed frames [\#102](https://github.com/pliablepixels/zmNinja/issues/102) - Gapless playback showing events from non-persisted monitors [\#86](https://github.com/pliablepixels/zmNinja/issues/86) -## [v0.87.2](https://github.com/pliablepixels/zmNinja/tree/v0.87.2) (2015-11-20) -[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v0.87...v0.87.2) - ## [v0.87](https://github.com/pliablepixels/zmNinja/tree/v0.87) (2015-11-20) -[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v0.87.1...v0.87) +[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v0.87.2...v0.87) + +## [v0.87.2](https://github.com/pliablepixels/zmNinja/tree/v0.87.2) (2015-11-20) +[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v0.87.1...v0.87.2) **Closed issues:** diff --git a/config.xml b/config.xml index 39d5f0f6..cae9c5c3 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + zmNinja High performance ZoneMinder client @@ -164,9 +164,9 @@ - - + + diff --git a/package.json b/package.json index 1dd678a8..26369e85 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version": "1.3.029", + "version":"1.3.032", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -48,12 +48,12 @@ "phonegap-plugin-push": { "FCM_VERSION": "11.6.2" }, - "cordova-plugin-ionic-webview": { - "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" - }, "cordova-plugin-advanced-websocket": {}, "cordova-plugin-x-socialsharing": {}, - "cordova-plugin-media-pp-fork": {} + "cordova-plugin-media-pp-fork": {}, + "cordova-plugin-ionic-webview": { + "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" + } } }, "dependencies": { @@ -176,4 +176,4 @@ ] } } -} \ No newline at end of file +} diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 86c9415a..2fe14d46 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -20,7 +20,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.3.030"; + var zmAppVersion = "1.3.032"; var isBackground = false; var justResumed = false; var timeSinceResumed = -1; -- cgit v1.2.3