efe61f3a83
Remove debug line causing crashes
2024-02-07 16:50:18 -05:00
a64b24687c
Add warnings when event_close_mode is weird. Fix monitor always being in close_mode=idle. Still do state changes even if packet is not video. Do not set state=ALARM when triggered, let the state machine do that.
2024-02-07 15:56:24 -05:00
22a2846218
Can't set alarm when triggering. Must be done by the state machine
2024-02-07 15:56:24 -05:00
593f6f1601
Add some more debugging to track down idle events not closing on alarm
2024-02-07 15:56:24 -05:00
ad232761e1
Spacing, cpplint
2024-02-07 15:56:24 -05:00
4993a55b14
Move declaration of zones down to where it is used
2024-02-07 15:56:24 -05:00
f92115b4fe
Spacing
2024-02-07 15:56:23 -05:00
cc7b8fa9d0
Rename DMS2LL to dms2ll to satisfy eslint
2024-02-07 11:14:19 -05:00
b817094fb8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-07 11:08:24 -05:00
b94b454bf9
Rename EventName to Name and Monitor Name to Monitor to take up less space
2024-02-07 11:08:15 -05:00
bd7bfcbdcd
Rename EventName to Name and Monitor Name to Monitor to take up less space
2024-02-07 11:08:11 -05:00
cc5bb8ecec
rename table=>eventStatTable. Apply width and height to map if it is to be displayed
2024-02-07 11:07:12 -05:00
79164993f9
Remove fixed width and height from map, they will be set in js if map is to be displayed
2024-02-07 11:06:47 -05:00
36b4d9a264
Add display: flex to content so that scroll bars work
2024-02-07 11:06:26 -05:00
fcac8ec2f2
Rename zmMap to ZMMap because eslint thinks constructors should always be capitalized.
2024-02-07 10:58:39 -05:00
5f6df6fad7
Make eventVideo div take up available space so that scaleToFit can do it's job
2024-02-07 10:38:17 -05:00
124bbc0295
pass #eventVIdeo as container to scaleToFit so that it fits within available width
2024-02-07 10:37:53 -05:00
3c91a2bcaf
Add px-3 to the flex container for stats and view to handle scroll bar
2024-02-07 10:37:31 -05:00
e6eff5903f
Add container to params for scaleToFit. The container we want to fit width into might not be #content.
2024-02-07 10:37:08 -05:00
e7bdd83a57
Merge pull request #3818 from ZoneMinder/revert-3817-database-certificate-verification
...
Revert "Introducing a new ZM_DB_SSL_VERIFY_SERVER_CERT configuration option t…"
2024-02-07 09:59:00 -05:00
caccc6def0
Revert "Introducing a new ZM_DB_SSL_VERIFY_SERVER_CERT configuration option t…"
2024-02-07 09:58:49 -05:00
3f0076bf49
Merge pull request #3817 from jmpalacios/database-certificate-verification
...
Introducing a new ZM_DB_SSL_VERIFY_SERVER_CERT configuration option t…
2024-02-07 09:46:30 -05:00
51812416bc
Adding the ZM_DB_SSL_VERIFY_SERVER_CERT setting to the Perl database module.
2024-02-06 22:59:31 -05:00
de7b915291
Increase the time jump to 20 seconds.
2024-02-06 15:59:08 -05:00
595723d551
Introducing a new ZM_DB_SSL_VERIFY_SERVER_CERT configuration option to allow
...
deployments to specify whether they wish to verify their database server's
certificate or not, mapped to PHP's PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT
attribute.
2024-02-06 03:23:36 -05:00
57e9cc2b16
In the case where locale = System... properly set locale for the Date*FOrmatter classes
2024-02-05 19:06:16 -05:00
5a866aee0e
Add id's to selects to appease label for= attributes
2024-02-05 18:42:25 -05:00
4107058000
FIx units on warning about timeout
2024-02-05 18:42:05 -05:00
b4e8148c9e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-05 17:40:26 -05:00
3bbc01858d
Add codec in mp4 prevent recovery. Use oldest file time to set Event StartTime
2024-02-05 17:40:20 -05:00
e159948d62
Handle state==TAPE when CLOSE_EVENT_MODE=IDLE
2024-02-05 17:39:05 -05:00
c9c2898912
Fix some spacing
2024-02-05 16:11:22 -05:00
f9c7380da1
Merge pull request #3812 from EtoTen/master
...
fixed bug in zmfilter.pl.in on line #632 , per https://github.com/Zone …
2024-02-04 12:09:57 -05:00
fa9ddac61d
fixed bug in zmfilter.pl.in on line #632 , per https://github.com/ZoneMinder/zoneminder/issues/3811
2024-02-04 01:43:33 -08:00
43c3937b87
Fix image proxy broken due to imagecreatefromstream=>imagecreatefromstring
2024-02-02 11:50:03 -05:00
48015e6efd
Remove extra / and urlencode password for Amcrest
2024-02-02 11:49:44 -05:00
63e57066c8
Always use a reorder_queue because an out of order packet may not have happened by the time we start recording, but may happen after. Reduce size to 1*keyframe interval as a test
2024-02-02 09:30:41 -05:00
aa67e5f6f3
Add range limits to lat&long and don't do anything if empty
2024-02-01 18:01:26 -05:00
314236dea8
Add inputs and code to display and convert to and from decimal degress and dhms for lat&long. Update marker on map when values change.
2024-02-01 17:58:20 -05:00
4987ea1b21
Define user before using for viewableMonitorIds
2024-02-01 11:39:09 -05:00
d47f78b354
Fix for use strict defining monitor_ids
2024-02-01 11:38:38 -05:00
da2744749d
fix vertical alignment and stretching of images on snapshot
2024-02-01 11:38:24 -05:00
9bb9f733a4
Reference the tab that the bad Path or Port is on
2024-01-31 18:24:22 -05:00
8e035f61ac
Use viewableMonitorsIds instead of canView(Monitors) when deciding to show the Console or Montage Links
2024-01-31 16:09:33 -05:00
05d605fe55
change Map to zmMap to prevent name collision with luxor. Add a haversine function to get distance between two lat&long. Start to rough in grouping locations into 1 pin.
2024-01-30 19:57:18 -05:00
18606e78ad
Remove width on p element on monitors view as it is too short for Recording and doesn't seem to be needed
2024-01-30 14:29:41 -05:00
afb05f40d9
Always wait to determine keyframe interval before we start recording.
2024-01-30 13:46:49 -05:00
5176529073
Only reference decoding_image_count in Ready()
2024-01-30 09:31:42 -05:00
5285c6e716
cpplint spacing changes. The real change is in Analysis we move the Ready check to only affect motion detection. This hopefully fixes the massive memory leak when Decoding=OnDemand
2024-01-30 09:31:28 -05:00
c6ff1e9748
Fix cppcheck complaint
2024-01-29 13:44:02 -05:00
Isaac Connor
Isaac Connor
Juan Manuel Palacios
Nickolai Golubev