From c2bf5166db03a34432dea4fc469c416f8b93b4cb Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Tue, 9 Feb 2016 15:21:29 -0500 Subject: 1.0.7 Former-commit-id: 17d987a9e85ccb3fd8c9ae25201f0fd5e80d7e69 --- CHANGELOG.md | 22 ++++++++++++++++------ config.xml | 2 +- www/js/MontageHistoryCtrl.js | 8 ++++---- www/templates/montage-history.html | 33 +++++++++++++++------------------ 4 files changed, 36 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5050640..f27e8c69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,26 @@ # Change Log -## [1.0.6](https://github.com/pliablepixels/zmNinja/tree/1.0.6) (2016-02-05) -[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.0.5...1.0.6) +## [1.0.7](https://github.com/pliablepixels/zmNinja/tree/1.0.7) (2016-02-09) +[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.0.6...1.0.7) + +**Implemented enhancements:** + +- Refine montage history to accept from/to dates [\#160](https://github.com/pliablepixels/zmNinja/issues/160) + +**Closed issues:** + +- Build is failing [\#156](https://github.com/pliablepixels/zmNinja/issues/156) + +## [v1.0.6](https://github.com/pliablepixels/zmNinja/tree/v1.0.6) (2016-02-05) +[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.0.5...v1.0.6) **Implemented enhancements:** - Allow event server to work without SSL - requires zmeventserver upgrade [\#159](https://github.com/pliablepixels/zmNinja/issues/159) -- Introduce a montage timeline function (BETA) [\#154](https://github.com/pliablepixels/zmNinja/issues/154) +- Introduce a montage timeline function [\#154](https://github.com/pliablepixels/zmNinja/issues/154) - Addition Next frame/prev frame buttons when viewing event - for fine grained snapshot control. [\#150](https://github.com/pliablepixels/zmNinja/issues/150) - Add ability to save a snapshot of an event playback to disk [\#148](https://github.com/pliablepixels/zmNinja/issues/148) -- Notification icon and sound - add ability to play default sounds - requires event server upgrade [\#135](https://github.com/pliablepixels/zmNinja/issues/135) +- Notification icon and sound - add ability to play default sounds [\#135](https://github.com/pliablepixels/zmNinja/issues/135) **Fixed bugs:** @@ -24,7 +35,6 @@ - installing ios-deploy ends with an error [\#152](https://github.com/pliablepixels/zmNinja/issues/152) - Progress bar is ignored in Event View when playback is paused. [\#149](https://github.com/pliablepixels/zmNinja/issues/149) - Viewing events on slow connection basically doesn't work [\#145](https://github.com/pliablepixels/zmNinja/issues/145) -- zmNinja fails to log in over open internet [\#126](https://github.com/pliablepixels/zmNinja/issues/126) ## [v1.0.5](https://github.com/pliablepixels/zmNinja/tree/v1.0.5) (2016-01-23) [Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.0.3...v1.0.5) @@ -298,4 +308,4 @@ -\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* +\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file diff --git a/config.xml b/config.xml index 3abb61b1..e0a8de40 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + zmNinja High performance ZoneMinder client diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index 1cfbb9a9..da5a6d68 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -86,14 +86,14 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc //window.stop(); // force it here - connkey changes - FIXME: investigate why - ZMDataModel.zmLog ("Nullifying the streams..."); + ZMDataModel.zmLog ("footerCollapse: Nullifying the streams..."); for (i=0; i< $scope.MontageMonitors.length; i++) { var element = document.getElementById("img-"+i); if (element) { - ZMDataModel.zmDebug("Nullifying " + element.src); + ZMDataModel.zmDebug("footerCollapse: Nullifying " + element.src); element.src=""; } @@ -1382,14 +1382,14 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc /*ZMDataModel.zmLog ("Forcing a window.stop() here"); window.stop();*/ - ZMDataModel.zmLog ("Nullifying the streams..."); + ZMDataModel.zmLog ("BeforeLeave: Nullifying the streams..."); for (i=0; i< $scope.MontageMonitors.length; i++) { var element = document.getElementById("img-"+i); if (element) { - ZMDataModel.zmDebug("Nullifying " + element.src); + ZMDataModel.zmDebug("BeforeLeave: Nullifying " + element.src); element.src=""; } diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html index e51d7d77..89b5bc81 100644 --- a/www/templates/montage-history.html +++ b/www/templates/montage-history.html @@ -25,16 +25,13 @@ -
+
From: {{datetimeValueFrom.value | date: "yyyy-MMM-dd hh:mma"}}
- +
- To: {{datetimeValueTo.value | date: "yyyy-MMM-dd hh:mma"}} -
- -
- @ {{sliderVal.rate}}x
(max of 6 monitors - chrome limit)
+ To: {{datetimeValueTo.value | date: "yyyy-MMM-dd hh:mma"}} @ {{sliderVal.rate}}x +
(max of 6 monitors - chrome limit)
@@ -158,8 +155,8 @@ Hide monitors without events - - + +