From 88c841cdc8669c498b3fee5e04c30750ffe72881 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Fri, 2 Sep 2016 16:36:46 -0400 Subject: bump Former-commit-id: 3a26cdab244416ae35e31515b097af510db2164f --- CHANGELOG.md | 10 ++-------- config.xml | 5 ----- plugins/fetch.json | 12 ++---------- 3 files changed, 4 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2d80fda..32524d8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Change Log ## [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.13...v1.2.17) +[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.2.0...v1.2.17) **Implemented enhancements:** @@ -21,6 +21,7 @@ **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:** @@ -31,13 +32,6 @@ - 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 ab9131d2..a342ed41 100644 --- a/config.xml +++ b/config.xml @@ -80,9 +80,4 @@ - - - - - diff --git a/plugins/fetch.json b/plugins/fetch.json index ab0b287b..adfb9ae0 100644 --- a/plugins/fetch.json +++ b/plugins/fetch.json @@ -186,18 +186,10 @@ "is_top_level": true, "variables": {} }, - "cordova-plugin-crosswalk-webview": { - "source": { - "type": "registry", - "id": "cordova-plugin-crosswalk-webview" - }, - "is_top_level": true, - "variables": {} - }, - "cordova-plugin-crosswalk-certificate": { + "cordova-plugin-certificates": { "source": { "type": "git", - "url": "https://github.com/danjarvis/cordova-plugin-crosswalk-certificate", + "url": "https://github.com/hypery2k/cordova-certificate-plugin", "subdir": "." }, "is_top_level": true, -- cgit v1.2.3