Isaac Connor
|
991cf97890
|
Fix null=>undef
|
2020-10-06 17:08:47 -04:00 |
|
Isaac Connor
|
ae7ed5a342
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-06 16:51:24 -04:00 |
|
Isaac Connor
|
9abde9ee06
|
Merge branch 'release-1.34'
|
2020-10-06 16:51:12 -04:00 |
|
Isaac Connor
|
044ce61ddb
|
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-06 16:47:51 -04:00 |
|
Isaac Connor
|
d7429014b6
|
Convert progress to a double instead of int.
|
2020-10-06 16:36:56 -04:00 |
|
Isaac Connor
|
061c889394
|
Implement SEEK to offset using two 32bit integers to represent the double value
|
2020-10-06 16:35:46 -04:00 |
|
Isaac Connor
|
0e89d28c26
|
Send SEEK as two integers representing a float
|
2020-10-06 16:34:06 -04:00 |
|
Isaac Connor
|
de6a51ec15
|
Fix incorrect operator used for NOT IN and add IN operator to match php
|
2020-10-06 09:38:15 -04:00 |
Isaac Connor
|
90764ed62f
|
Merge pull request #3054 from PVi1/master
FIXED operand error for NOT IN SQL statement
|
2020-10-06 09:30:04 -04:00 |
Peter Vilhan
|
69d393fc47
|
FIXED operand error for NOT IN SQL statement
Switched operand from !~ to ~[] for NOT IN SQL statement.
Web version was fine but zmfilter.pl suffered from this error.
|
2020-10-06 11:52:39 +02:00 |
Andrew Bauer
|
87fd316e5b
|
makePopupButton removed, use makeButton instead
|
2020-10-05 16:40:14 -05:00 |
|
Andrew Bauer
|
76af02cc76
|
whitespace
|
2020-10-05 16:31:26 -05:00 |
Andrew Bauer
|
01596ec26c
|
whitespace
|
2020-10-05 15:53:46 -05:00 |
|
Andrew Bauer
|
9c7ebf8c9e
|
unpopup video view
|
2020-10-05 15:44:07 -05:00 |
|
Isaac Connor
|
b27eac3cbf
|
Make centerCoord take a font size parameter to fix centering when using large font.
|
2020-10-05 16:12:48 -04:00 |
|
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 |