Commit Graph

1015 Commits

Author SHA1 Message Date
Isaac Connor 5aef5e2312 populate monitorData for MonitorStream use 2020-09-02 14:45:10 -04:00
Isaac Connor 8d2ced0fbb use MonitorStream to handle the video streaming. update buttons. Add onload event to streaming image so that we redraw the points where they should be. Handle padding in locating points. 2020-09-02 14:44:11 -04:00
Isaac Connor 4f90f37f0e add back request queue 2020-09-02 14:42:47 -04:00
Isaac Connor 5544057a8d Merge branch 'master' into improve_zone_editing 2020-08-31 18:47:24 -04:00
Isaac Connor 0995708b5b Use ajax request instead of webui to delete events. The reason is that the web ui will spit out the events view after performing the action. Without a filter it will try to list every event. 2020-08-31 10:37:03 -04:00
Isaac Connor fa18887f5c zones can now list multiple monitors so populate a listof monitors with json data 2020-08-31 10:13:30 -04:00
Isaac Connor f00f9ead79 Move monitor class into js/MonitorStream for use elsewhere 2020-08-31 10:12:47 -04:00
Isaac Connor 3e09840995 Merge branch 'master' into improve_zone_editing 2020-08-28 17:43:07 -04:00
Andrew Bauer 990b5bd9dc monitor view - convert links to buttons 2020-08-28 15:22:57 -05:00
Andrew Bauer d69b3e7f43 make cancel go back to console 2020-08-28 10:56:09 -05:00
Isaac Connor 04b3f5d294 Merge branch 'master' into improve_zone_editing 2020-08-28 09:43:48 -04:00
Andrew Bauer 2b6090d8c6 console.js - change all createPopup to window.location.assign 2020-08-28 07:58:42 -05:00
Andrew Bauer 1e78307735 add navigation buttons to monitor view 2020-08-27 16:30:49 -05:00
Isaac Connor dc15663030 Fix scales after applying layout 2020-08-27 10:55:14 -04:00
Isaac Connor 4c1446d856 Fixes to scale selection and remove code that altered width&height in zms url. zms doesn't honour them. Calculate new scale and alter that parameter. 2020-08-27 10:33:08 -04:00
Andrew Bauer 8d202aeef0 eslint 2020-08-26 15:36:38 -05:00
Isaac Connor ab68bef39a Merge branch 'master' into filter_pre_post 2020-08-26 15:28:48 -04:00
Isaac Connor 0ced21dda7 Persist video volume in a cookie so that subsequent events remember the volume level.
Fixes #3013
2020-08-26 15:15:57 -04:00
Isaac Connor 24d1ba3a00 fix eslint 2020-08-26 13:41:40 -04:00
Andrew Bauer ac7867eab3 make function view a modal 2020-08-26 11:39:48 -05:00
Isaac Connor e3a48c2db4 Handle the case where the layout has invalid json 2020-08-25 12:07:45 -04:00
Isaac Connor 6fbe7457ff Add missing globals 2020-08-25 11:47:49 -04:00
Isaac Connor 626e892b33 add global 2020-08-25 11:43:55 -04:00
Andrew Bauer 0879ecf9a5 update timeline header 2020-08-24 14:33:01 -05:00
Andrew Bauer 8c32511c83 whitespace 2020-08-24 12:05:31 -05:00
Andrew Bauer e5e2c3b347 fix stats off by 1 frame, don't alert on score 0 2020-08-24 10:57:54 -05:00
Andrew Bauer c6e3107a50 make donate view a modal 2020-08-24 09:31:21 -05:00
Isaac Connor 0f27243007 Merge branch 'master' into filter_pre_post 2020-08-24 09:23:24 -04:00
Andrew Bauer 8ea806e264 eslint 2020-08-23 18:40:58 -05:00
Andrew Bauer 699b20b961 whitespace 2020-08-23 17:54:57 -05:00
Andrew Bauer 65181c84ee update frame top toolbar 2020-08-23 17:53:47 -05:00
Andrew Bauer 86f0d41d8e autoinit changeScale in frame view 2020-08-23 13:17:03 -05:00
Andrew Bauer 4b144dea74 whitespace 2020-08-23 13:02:35 -05:00
Andrew Bauer f06bfe7cbb use bootstrap-table on stats view 2020-08-23 12:23:58 -05:00
Andrew Bauer 69ba9e6d0e eslint 2020-08-23 12:14:09 -05:00
Isaac Connor 2a7ea52330 Merge branch 'release-1.34' 2020-08-23 11:51:54 -04:00
Andrew Bauer de1d1c2ac6 change close link to back link 2020-08-22 14:43:53 -05:00
Andrew Bauer 61f89e3306 rough in frames detail view 2020-08-22 12:45:19 -05:00
Andrew Bauer 73a01855f8 rough in thumbnail animation 2020-08-21 20:44:20 -05:00
Isaac Connor ac0976324f Fix case of filterQuery. Fixes #3017 2020-08-21 11:22:47 -04:00
Andrew Bauer 9357017a39 add export fx to tables 2020-08-21 07:11:57 -05:00
Andrew Bauer de4d144cd4 fix scale dropdown in frame view 2020-08-20 10:16:28 -05:00
Andrew Bauer 247ace7fa2 process clicks per cell in frames 2020-08-20 09:13:11 -05:00
Andrew Bauer c9de30d427 click any row to load frame 2020-08-19 17:54:39 -05:00
Andrew Bauer b2a632a3f8 reinit thumbnail ani on click events 2020-08-19 16:16:27 -05:00
Andrew Bauer 8f70ae192d enable thumbnail zoom on frames view 2020-08-19 15:42:35 -05:00
Andrew Bauer a903a885b6 whitepsace 2020-08-19 14:07:00 -05:00
Isaac Connor c2d6b8f493 revert code that passed the div hightlightOn/Off. Better to pass index. Fixes js errors. 2020-08-19 14:39:15 -04:00
Isaac Connor d0c21995cd Fixes to function converting from pixels to percent. Adjust to 100 if > 100. 2020-08-19 14:14:32 -04:00
Isaac Connor efec1e7d4f remove debug 2020-08-19 14:13:48 -04:00