Commit Graph

16470 Commits

Author SHA1 Message Date
Isaac Connor 1c2dd92d31 Add LabelSize to get label_size from monitor 2020-10-05 16:12:33 -04:00
Isaac Connor 93ecb87caa Clear the textframe before Annotating it. 2020-10-05 16:12:09 -04:00
Isaac Connor c1c407ea39 debug new offset as well when SEEKING 2020-10-05 15:55:42 -04:00
Andrew Bauer f93450f9ea remove plugin support for viewing downloads 2020-10-05 14:44:45 -05:00
Andrew Bauer 321de3c604 only update changed elements in video view 2020-10-05 13:59:44 -05:00
Isaac Connor c43011ba18 don't send keepalive when we have sent a textFrame 2020-10-05 13:33:57 -04:00
Isaac Connor 71085d9724 Clear the textframe before Annotating it. 2020-10-05 13:16:22 -04:00
Isaac Connor 5dd83d41fa Add LabelSize to get label_size from monitor 2020-10-05 13:15:58 -04:00
Isaac Connor 059d7d388f Make centerCoord take a font size parameter to fix centering when using large font. 2020-10-05 13:15:39 -04:00
Isaac Connor 6c24cd0c70 When playing backwards, say time to previous event instead of next. Instead of defaulting to -2x when hitting the rewind button, start with -1x. 2020-10-05 13:14:44 -04:00
Isaac Connor 6c2853365f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-05 12:11:46 -04:00
Isaac Connor 419a03db25 Add debugging for min_section_length keeping us in ALERT 2020-10-05 12:11:39 -04:00
Isaac Connor c5459020c9 implement value check & correct on replay_rate for VARPLAY 2020-10-05 12:11:11 -04:00
Andrew Bauer 862f0ca732 add xmlfooter to video view, replace mootools 2020-10-05 09:37:00 -05:00
Isaac Connor 2faedc6248 Sort sessions by access time so that we list active users first 2020-10-05 10:34:52 -04:00
Isaac Connor 1cf181372f Only load users for logged in sessions 2020-10-05 10:30:57 -04:00
Isaac Connor fa641a0345 Convert progress to a double instead of int. 2020-10-05 10:30:38 -04:00
Isaac Connor 7a7a3413d3 Always do event change detection whether we are paused or not. Because we might be single-stepping. Change progress to a double as that it what it should be. 2020-10-05 10:29:42 -04:00
Isaac Connor 6d1e5330e3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-05 09:30:49 -04:00
Isaac Connor 93021f5806 Update getNearEvents to handle when event doesn't exist 2020-10-05 09:30:33 -04:00
Isaac Connor 283f224a95 Add pre-alarm frames when alarm_frame_count > 1 and prealarmcount=0 2020-10-05 09:19:48 -04:00
Isaac Connor 3570c6e828 Better debug logging of event and frame inserts 2020-10-05 09:11:16 -04:00
Andrew Bauer 2852d14ca6 use data-on-change-this instead of inline js 2020-10-04 08:04:11 -05:00
Andrew Bauer 2e6efbb349 replace inlince onchange event in control view 2020-10-03 21:44:24 -05:00
Andrew Bauer d9b8a7ceb2 remove unused view 2020-10-03 21:35:38 -05:00
Andrew Bauer adb715c42c fix typo 2020-10-03 21:32:07 -05:00
Andrew Bauer a0ad52bac9 replace another inline onchange event 2020-10-03 21:30:48 -05:00
Andrew Bauer b4d2fa5e75 replace inline onchange event 2020-10-03 21:14:24 -05:00
Andrew Bauer 65b6dad48c eslint 2020-10-03 17:38:56 -05:00
Andrew Bauer 8d19cee811 unpopup the addnewuser button 2020-10-03 17:12:44 -05:00
Andrew Bauer aee5430bc8 only load preset and settings modals when needed 2020-10-03 17:00:20 -05:00
Andrew Bauer 1643fb686b convert settings popup to modal 2020-10-03 16:51:25 -05:00
Isaac Connor 07d0353373 Fix zms only sending 1 frame due to != instead of == 2020-10-03 11:57:22 -04:00
Andrew Bauer 1ef1b48c71 remove warnings used for testing 2020-10-03 07:08:04 -05:00
Andrew Bauer 391ce88f05 eslint 2020-10-02 21:11:54 -05:00
Andrew Bauer a97e526298 fix save button in controlpreset modal 2020-10-02 16:10:32 -05:00
Andrew Bauer 802e439cb5 convert controlpreset view to a modal 2020-10-02 15:46:28 -05:00
Isaac Connor 311ba4ef69 use bootstrap styles on logged in user table. Include ip address 2020-10-02 16:04:56 -04:00
Isaac Connor 7261a7b1dd Merge branch 'sessions_in_db' 2020-10-02 15:57:11 -04:00
Isaac Connor a58e5e96d7 bump version 2020-10-02 15:57:05 -04:00
Isaac Connor e9d120f032 remove debug 2020-10-02 15:56:56 -04:00
Isaac Connor bc5002515e remove debug 2020-10-02 15:56:50 -04:00
Isaac Connor d97f8af215 Finish showing logged in users 2020-10-02 15:56:39 -04:00
Isaac Connor 820d28beb9 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-02 15:22:50 -04:00
Isaac Connor fb0fae7b20 buster only has libjpeg62-turbo-dev 2020-10-02 15:22:43 -04:00
Isaac Connor 23f2c1468f rough in a table of the logged in users 2020-10-02 15:21:58 -04:00
Isaac Connor 5d20dde85c Implement a Session class that takes over session functions and stores in the database 2020-10-02 14:50:22 -04:00
Isaac Connor 3e668b43cf add Sessions table 2020-10-02 14:49:59 -04:00
Isaac Connor 2e14d18a13 add Sessions table 2020-10-02 14:49:44 -04:00
Andrew Bauer 7b5090ceab move newlog view to log view 2020-10-02 13:26:35 -05:00