diff options
| -rw-r--r-- | CHANGELOG.md | 10 | ||||
| -rw-r--r-- | config.xml | 5 | ||||
| -rw-r--r-- | 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) @@ -80,9 +80,4 @@ </platform> <icon src="resources/android/icon/drawable-xhdpi-icon.png" /> <plugin name="cordova-sqlite-storage" spec="~1.4.6-pre6a" /> - <preference name="xwalkVersion" value="20+" /> - <preference name="xwalkCommandLine" value="--disable-pull-to-refresh-effect" /> - <preference name="xwalkMode" value="embedded" /> - <preference name="xwalkMultipleApk" value="true" /> - <preference name="android-minSdkVersion" value="16" /> </widget> 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, |