summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md21
-rw-r--r--config.xml2
-rwxr-xr-xmaketag.sh2
3 files changed, 21 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69d60177..a6f3b830 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
# Change Log
+## [v1.2.19](https://github.com/pliablepixels/zmNinja/tree/v1.2.19) (2016-09-04)
+[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.2.18...v1.2.19)
+
+**Implemented enhancements:**
+
+- Cycle monitors [\#319](https://github.com/pliablepixels/zmNinja/issues/319)
+
+**Fixed bugs:**
+
+- Switching servers without saving first causes the app to freeze \(android/ios\) [\#320](https://github.com/pliablepixels/zmNinja/issues/320)
+
## [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)
@@ -8,7 +19,7 @@
- for all event related views \(event list, footage, analyze\) show "relative time from now" like "1 day ago" or "2 hours ago" [\#317](https://github.com/pliablepixels/zmNinja/issues/317)
## [v1.2.17](https://github.com/pliablepixels/zmNinja/tree/v1.2.17) (2016-09-01)
-[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.2.0...v1.2.17)
+[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.2.13...v1.2.17)
**Implemented enhancements:**
@@ -28,7 +39,6 @@
**Closed issues:**
-- modal close via back action on Android - make sure all timers re-start/resources released [\#305](https://github.com/pliablepixels/zmNinja/issues/305)
- ZMninja API issue with zoneminder 1.30 [\#300](https://github.com/pliablepixels/zmNinja/issues/300)
**Merged pull requests:**
@@ -39,6 +49,13 @@
- tweaks to Sleep/Wake/Reset \#306 [\#308](https://github.com/pliablepixels/zmNinja/pull/308) ([pliablepixels](https://github.com/pliablepixels))
- Added Wake-Sleep-Reset control commands [\#307](https://github.com/pliablepixels/zmNinja/pull/307) ([sctt](https://github.com/sctt))
+## [v1.2.13](https://github.com/pliablepixels/zmNinja/tree/v1.2.13) (2016-08-18)
+[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.2.0...v1.2.13)
+
+**Closed issues:**
+
+- modal close via back action on Android - make sure all timers re-start/resources released [\#305](https://github.com/pliablepixels/zmNinja/issues/305)
+
## [v1.2.0](https://github.com/pliablepixels/zmNinja/tree/v1.2.0) (2016-08-10)
[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/vv1.2.0...v1.2.0)
diff --git a/config.xml b/config.xml
index a342ed41..c7a5e5f7 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.18" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.19" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>zmNinja</name>
<description>
High performance ZoneMinder client
diff --git a/maketag.sh b/maketag.sh
index 3ce39e11..f5abe316 100755
--- a/maketag.sh
+++ b/maketag.sh
@@ -3,5 +3,5 @@ read -p "Please generate CHANGELOG and commit it BEFORE you tag. Press a key whe
orig=$1
VER="${orig/v//}"
echo "Creating tag:$VER"
-git tag -fa v$1 -m'v$1'
+git tag -fa v$VER -m'v$VER'
git push -f --tags