Isaac Connor
|
286a5a72a3
|
Merge branch 'master' into zma_to_thread
|
2020-12-23 09:47:31 -05:00 |
|
Isaac Connor
|
fb2793d337
|
use nullptr instead of 0 when init'ing event
|
2020-12-23 09:11:33 -05:00 |
Andrew Bauer
|
c497b94378
|
use tlzoom class to avoid conflict with thumbnail zoom
|
2020-12-23 07:57:44 -06:00 |
|
Andrew Bauer
|
a9b92905ca
|
eslint
|
2020-12-22 19:07:12 -06:00 |
|
Isaac Connor
|
a1917d83d0
|
Merge branch 'master' into zma_to_thread
|
2020-12-22 19:52:09 -05:00 |
|
Andrew Bauer
|
cc5a732103
|
continue work on timeline.js
|
2020-12-22 16:06:21 -06:00 |
|
Isaac Connor
|
6be9b294ef
|
Hidden and hidden are two very different classes
|
2020-12-22 17:00:07 -05:00 |
|
Isaac Connor
|
d6486d1a7e
|
use nullptr instead of 0 when init'ing event
|
2020-12-22 15:44:07 -05:00 |
|
Andrew Bauer
|
8a26252914
|
update object detected link in events
|
2020-12-22 12:42:27 -06:00 |
|
Andrew Bauer
|
9af383db92
|
set the width style for the objdetect modal
|
2020-12-22 12:30:44 -06:00 |
|
Andrew Bauer
|
2ea4b39d93
|
don't use quotes around the event id
|
2020-12-22 11:46:31 -06:00 |
|
Andrew Bauer
|
ee45916526
|
move objdetect image to a modal
|
2020-12-22 10:08:31 -06:00 |
|
Isaac Connor
|
a231125fb3
|
Replace Download with a direct link to the mp4 like it used to be. Add back a Frames link
|
2020-12-22 10:23:44 -05:00 |
|
Isaac Connor
|
400e0de609
|
When updating Monitor_Status, reset FPS on Prime
|
2020-12-22 10:22:52 -05:00 |
|
Isaac Connor
|
4bea286cfe
|
Use new get_event_start_packet_it function to start the new event with the right packet.
|
2020-12-22 10:22:28 -05:00 |
|
Isaac Connor
|
91057b9546
|
Clean up video_packet_count stuff. use packet_counts instead. Use more efficient logic for managing the # of video packets on the queue. Rewrite clearQueue to not use reverse iterators. Implement get_starting_packet to return an iterator to the packet that SHOULD start an event. So it takes into account pre_event_count and keyframe rules.
|
2020-12-22 10:20:44 -05:00 |
|
Isaac Connor
|
d89cbebbdf
|
AddPacket should just take a packet. score and alarm_image are members of the packet
|
2020-12-22 10:18:15 -05:00 |
|
Andrew Bauer
|
cbe04674c5
|
remove non-existent id preview
|
2020-12-21 15:59:05 -06:00 |
|
Andrew Bauer
|
d080109f4b
|
eslint
|
2020-12-21 15:20:38 -06:00 |
|
Andrew Bauer
|
663748d9a7
|
partial replace mootools
|
2020-12-21 13:07:14 -06:00 |
|
Andrew Bauer
|
1f3fd93296
|
use setTimeout instead of mootools pass
|
2020-12-20 15:21:38 -06:00 |
|
Andrew Bauer
|
92361210ce
|
eslint
|
2020-12-20 15:07:16 -06:00 |
|
Andrew Bauer
|
1d6c4664dc
|
replace mootools in export
|
2020-12-20 10:54:18 -06:00 |
|
Andrew Bauer
|
0b569e7e37
|
replace mootools in control.js
|
2020-12-20 08:29:39 -06:00 |
|
Andrew Bauer
|
66ae2c0461
|
replace mootools request JSON
|
2020-12-20 07:59:17 -06:00 |
|
Andrew Bauer
|
2d5353a716
|
spelling
|
2020-12-19 15:10:17 -06:00 |
|
Andrew Bauer
|
b352ed3269
|
Update multiserver.rst
|
2020-12-19 12:17:38 -06:00 |
|
Andrew Bauer
|
24d558b31a
|
spelling
|
2020-12-19 12:14:56 -06:00 |
|
Andrew Bauer
|
95d72a0794
|
Update multiserver.rst
|
2020-12-19 12:12:06 -06:00 |
|
Andrew Bauer
|
57b0a96dcf
|
Update multiserver.rst
|
2020-12-19 12:06:13 -06:00 |
|
Andrew Bauer
|
abba77e54a
|
Update redhat.rst
|
2020-12-19 11:45:22 -06:00 |
|
Andrew Bauer
|
2e2205885f
|
Update redhat.rst
|
2020-12-19 11:43:50 -06:00 |
|
Andrew Bauer
|
f68078cb1e
|
Update redhat.rst
|
2020-12-19 11:36:31 -06:00 |
|
Andrew Bauer
|
67a959e636
|
Update redhat.rst
|
2020-12-19 11:26:31 -06:00 |
|
Andrew Bauer
|
0b3098f777
|
Update redhat.rst
|
2020-12-19 11:25:42 -06:00 |
|
Andrew Bauer
|
60653bd3a1
|
Update redhat.rst
|
2020-12-19 11:14:33 -06:00 |
|
Andrew Bauer
|
12c2a0d4e3
|
Update redhat.rst
|
2020-12-19 11:11:34 -06:00 |
|
Andrew Bauer
|
2095bb57e5
|
Update redhat.rst
|
2020-12-19 11:09:22 -06:00 |
|
Andrew Bauer
|
e1ef0f4bcc
|
Update redhat.rst
|
2020-12-19 11:02:15 -06:00 |
|
Andrew Bauer
|
f0b1eac823
|
Update redhat.rst
|
2020-12-19 10:59:14 -06:00 |
|
Andrew Bauer
|
cc2eda3519
|
Update redhat.rst
|
2020-12-19 10:57:44 -06:00 |
|
Andrew Bauer
|
d5bb2022ed
|
Update redhat.rst
|
2020-12-19 10:55:37 -06:00 |
|
Andrew Bauer
|
0a2195d9fd
|
Update redhat.rst
|
2020-12-19 10:54:53 -06:00 |
|
Andrew Bauer
|
b76b84f51f
|
Update redhat.rst
|
2020-12-19 10:52:20 -06:00 |
|
Andrew Bauer
|
952da2217d
|
Update redhat.rst
|
2020-12-19 10:49:21 -06:00 |
|
Andrew Bauer
|
f9d25d6dca
|
Update redhat.rst
|
2020-12-19 10:47:53 -06:00 |
|
Andrew Bauer
|
d7596d448e
|
Update redhat.rst
|
2020-12-19 10:44:34 -06:00 |
|
Andrew Bauer
|
96ade2f9d0
|
update rpm nginx readme
|
2020-12-19 10:09:12 -06:00 |
|
Andrew Bauer
|
80afbbd9ce
|
fixup rpmspecfile cert generation
|
2020-12-19 08:11:20 -06:00 |
|
Isaac Connor
|
2936d64b91
|
Always take ownership of dirs in /var/cache/zoneminder. The previous behaviour would have only done it on a new install. Fixes #3096
|
2020-12-18 10:54:08 -05:00 |