Isaac Connor
|
e08c11c2be
|
Turn off debug
|
2025-05-14 14:16:25 -04:00 |
|
Isaac Connor
|
2cdfa0695d
|
Alter what getStreamMode returns to include the player and stream type
|
2025-05-12 17:50:10 -04:00 |
|
Isaac Connor
|
f7e114f470
|
ADd Go2RTC fields. Move getStreamModeMonitor into the monitor object
|
2025-05-11 17:24:47 -04:00 |
|
Isaac Connor
|
2b69e84e5a
|
Div port by 5 so that we don't need as many ports in apache
|
2025-05-08 23:16:58 +00:00 |
|
Isaac Connor
|
406bd101cc
|
Only make symlink if name is different than id
|
2025-05-06 20:03:33 +00:00 |
|
Isaac Connor
|
2f5b2018c9
|
Merge branch 'master' into ai_server
|
2025-05-02 19:49:03 -04:00 |
|
Isaac Connor
|
e73cb52359
|
Add type=float for AnalysisFPSLimit
|
2025-04-29 16:02:44 -04:00 |
|
Isaac Connor
|
8e22a9de69
|
Default password for Amcrest is admin, pass Manufacturer to monitor creation
|
2025-04-23 18:47:04 -04:00 |
|
Isaac Connor
|
2b3f5058da
|
Merge branch 'master' into ai_server
|
2025-04-13 16:41:33 -04:00 |
|
Isaac Connor
|
78785861a7
|
Use '' instead of 0 for No Tag value.
|
2025-04-11 11:31:53 -04:00 |
|
Isaac Connor
|
c184e9853d
|
Merge branch 'no_tag_filter' of github.com:Simpler1/ZoneMinder into Simpler1-no_tag_filter
|
2025-04-11 10:48:17 -04:00 |
|
Isaac Connor
|
3e939040dd
|
Merge branch 'ai_server' of github.com:connortechnology/ZoneMinder into ai_server
|
2025-03-29 13:07:07 -07:00 |
IgorA100
|
43ea5000c6
|
Remove extra space (Monitor.php)
|
2025-03-26 12:14:06 +03:00 |
|
IgorA100
|
640047b9dd
|
Removed empty line (Monitor.php)
|
2025-03-26 12:11:23 +03:00 |
|
IgorA100
|
2194c87018
|
Let's do it as it was before. We'll move the control to JS (Monitor.php)
|
2025-03-26 12:09:51 +03:00 |
|
IgorA100
|
1932d53f0a
|
Removed extra space and comma (Monitor.php)
|
2025-03-26 00:48:04 +03:00 |
|
IgorA100
|
9f0822af3d
|
Fix: Stream Quality option should only show if a secondary stream is available (Monitor.php)
|
2025-03-26 00:41:27 +03:00 |
Simpler1
|
aca3655442
|
feat(tags): Filter option for No Tag
|
2025-03-06 12:23:01 -05:00 |
|
Isaac Connor
|
4e0e5a5783
|
Merge branch 'master' into speed_ai
|
2025-03-04 20:37:58 -05:00 |
|
Isaac Connor
|
5cff2f0904
|
FIx name collision on RTSP2WebStream => RTSP2WebStreamOptions
|
2025-03-02 14:37:26 -05:00 |
|
Isaac Connor
|
447d0f62d6
|
Merge branch 'master' into speed_ai
|
2025-02-26 18:50:48 -05:00 |
|
IgorA100
|
8c586c47ce
|
Added support for selecting Secondary stream for RTSP2Web (Monitor.php)
|
2025-02-22 19:49:55 +03:00 |
|
Isaac Connor
|
4badb42905
|
Turn off debug
|
2025-02-11 07:00:46 -08:00 |
|
Isaac Connor
|
56fc73cb3e
|
Merge branch 'speed_ai' into yuv420niquadra
|
2025-02-01 13:16:39 -08:00 |
|
Isaac Connor
|
c29a3d45c2
|
Merge branch 'yuv420' of github.com:ZoneMinder/zoneminder into yuv420niquadra
|
2025-01-31 12:25:56 -08:00 |
|
Isaac Connor
|
bbbead60c8
|
Add objectdetection_model, object_threshold, nms_threshold
|
2025-01-31 10:55:39 -08:00 |
|
Isaac Connor
|
8c0c08694b
|
Remove commas that cause problems on some php. Remove unreachable code.
|
2025-01-24 12:31:35 -05:00 |
|
Isaac Connor
|
cd434af50b
|
Add ObjectDetection
|
2025-01-22 10:25:22 -05:00 |
|
Isaac Connor
|
d0c3041477
|
Add hwaccelname and hwacceldevice
|
2025-01-08 16:55:34 -05:00 |
|
Isaac Connor
|
24ad12fa22
|
Don't include empty fields in filter query string, just to shorten it a bit
|
2024-12-21 14:34:35 -05:00 |
|
Isaac Connor
|
edb0836fe1
|
Fix not being able to undelete a monitor
|
2024-12-09 12:27:42 -05:00 |
|
Isaac Connor
|
9125b8e6f9
|
Add support for sorting by Notes. Warn when the sort_field is unsupported
|
2024-11-27 13:56:35 -05:00 |
|
Isaac Connor
|
16a5f9e0a2
|
Merge dbUpdate and dbInsert from another branch
|
2024-11-18 10:47:07 -05:00 |
|
Isaac Connor
|
f51f1b4200
|
If no group id don't do sql lookup
|
2024-11-06 12:20:48 -05:00 |
|
Isaac Connor
|
a8c658aa50
|
Ensure that Servers is global.
|
2024-11-06 10:38:24 -05:00 |
|
Isaac Connor
|
5c01109f03
|
List monitor id in warning message about not being assigned a server.
|
2024-11-04 09:17:20 -05:00 |
|
Isaac Connor
|
94c2816841
|
Split out the default and initial_default concepts
|
2024-10-26 13:59:59 -04:00 |
|
Isaac Connor
|
1c0e03b813
|
Set the default for AnalysisFPSLimit to null so that we can empty it. Add an initial_default to use when creating a new monitor
|
2024-10-26 13:59:45 -04:00 |
|
Isaac Connor
|
ad582e9033
|
Add Linked as a cause type to search for
|
2024-10-26 13:34:40 -04:00 |
|
Isaac Connor
|
3e1c5573ec
|
Don't warn about no locale set, that is normal
|
2024-10-25 11:02:49 -04:00 |
|
Isaac Connor
|
f02121fcc2
|
Check for validity of locale. Handle fatal crash when setting datetiemformatter when an invalid locale is used. Fixes #4179
|
2024-10-25 10:41:56 -04:00 |
|
Isaac Connor
|
dea3b741c9
|
Require path to be a defined storage area. Use detaintPath to prevent Path Traversal. Fixes GHSA-g355-3rf6-f38v
|
2024-10-21 17:40:01 -04:00 |
|
Isaac Connor
|
daffe0294b
|
Add ONVIF as a Notes filter
|
2024-10-02 16:16:53 -04:00 |
|
Isaac Connor
|
9555455c5d
|
Add defines for ANALYSING_NONE and ANALYSING_ALWAYS
|
2024-10-01 17:14:01 -04:00 |
|
Isaac Connor
|
34e1512916
|
Add TRIGGER defines
|
2024-10-01 12:18:18 -04:00 |
|
Isaac Connor
|
eb117732a8
|
Rough in shm info and functions for triggering
|
2024-10-01 12:18:05 -04:00 |
|
Isaac Connor
|
3b379e99c0
|
Introduce detaintPathAllowAbsolute. Use it to protect against Path Traversal in files view. Fixes GHSA-8fw2-wh82-vv4h
|
2024-09-30 06:42:10 -04:00 |
|
Isaac Connor
|
7aabf146ba
|
Try to do something useful with error messages from SQL, but since storage isn't a real view, it won't be shown.
|
2024-09-30 06:34:15 -04:00 |
|
Isaac Connor
|
07fcb72e3b
|
Use the same filter on Storage Name as we use in Monitor Name.
|
2024-09-30 06:33:09 -04:00 |
|
Isaac Connor
|
d216c4cf47
|
Remove STATE_TAPE
|
2024-09-24 17:26:55 -04:00 |