diff options
| -rw-r--r-- | CHANGELOG.md | 23 | ||||
| -rw-r--r-- | www/js/NVR.js | 5 |
2 files changed, 27 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b592e5fc..0c8c5c05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,28 @@ # Change Log +## [v1.3.082](https://github.com/pliablepixels/zmNinja/tree/v1.3.082) (2019-11-08) +[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.3.079...v1.3.082) + +**Implemented enhancements:** + +- Allow timelines to scroll vertically within its window [\#859](https://github.com/pliablepixels/zmNinja/issues/859) +- Implement an API caching layer for performance [\#857](https://github.com/pliablepixels/zmNinja/issues/857) + +**Fixed bugs:** + +- Fix timeline doubletapping on mobile \(iOS\) [\#863](https://github.com/pliablepixels/zmNinja/issues/863) + +**Closed issues:** + +- Enhancement: Zoom for Events List [\#855](https://github.com/pliablepixels/zmNinja/issues/855) + +**Merged pull requests:** + +- \#857 api caching layer [\#862](https://github.com/pliablepixels/zmNinja/pull/862) ([florie1706](https://github.com/florie1706)) +- add option to pause streams for simul, turn it off for default [\#861](https://github.com/pliablepixels/zmNinja/pull/861) ([maymaymay](https://github.com/maymaymay)) +- \#857 api caching layer [\#860](https://github.com/pliablepixels/zmNinja/pull/860) ([maymaymay](https://github.com/maymaymay)) +- Faster montage loads & Timeline fixes [\#858](https://github.com/pliablepixels/zmNinja/pull/858) ([pliablepixels](https://github.com/pliablepixels)) + ## [v1.3.079](https://github.com/pliablepixels/zmNinja/tree/v1.3.079) (2019-10-16) [Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.3.078...v1.3.079) diff --git a/www/js/NVR.js b/www/js/NVR.js index a103b69a..7632ba29 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -1034,6 +1034,7 @@ angular.module('zmApp.controllers') loginData = angular.copy(newLogin); + // console.log ('****** SET LOGIN:'+JSON.stringify(loginData)); $rootScope.LoginData = loginData; serverGroupList[loginData.serverName] = angular.copy(loginData); @@ -3429,7 +3430,9 @@ angular.module('zmApp.controllers') //console.log("ZMData getEvents called with ID=" + monitorId + "and Page=" + pageId); if (!loadingStr) { - loadingStr = $translate.instant('kLoadingEvents') + "..."; + loadingStr="<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0; color:#fff;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i> " + $translate.instant('kLoadingEvents') + "...</button>"; + + //loadingStr = $translate.instant('kLoadingEvents') + "..."; } //if (loadingStr) loa |