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
|
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
|
2b3f5058da
|
Merge branch 'master' into ai_server
|
2025-04-13 16:41:33 -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 |
|
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
|
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
|
5c01109f03
|
List monitor id in warning message about not being assigned a server.
|
2024-11-04 09:17:20 -05: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
|
eb117732a8
|
Rough in shm info and functions for triggering
|
2024-10-01 12:18:05 -04:00 |
|
Isaac Connor
|
328ce9fc0c
|
Make no Status record found a debug instead of warning
|
2024-09-17 11:17:50 -04:00 |
|
Isaac Connor
|
b64461d518
|
Merge branch 'master' into only_stream_visible
|
2024-09-03 14:51:36 -04:00 |
|
Isaac Connor
|
b66e04024f
|
Test for Path being empty to avoid warnings about passing null being deprecated
|
2024-09-03 09:39:03 -04:00 |
|
Isaac Connor
|
802a0854b5
|
Add getAnalysingStrings and getRecordingStrings and fix getStatusStrings, removing Tape
|
2024-08-18 12:18:44 -04:00 |
|
Isaac Connor
|
a3c73b414f
|
Add WallCLockTimestamps to Monitor model
|
2024-07-06 08:51:37 -04:00 |
|
IgorA100
|
14604520bc
|
Merge branch 'ZoneMinder:master' into patch-135
|
2024-06-05 17:07:51 +03:00 |
|
IgorA100
|
53d057d7aa
|
After the monitor name, display its ID (Monitor.php)
|
2024-06-05 15:21:09 +03:00 |
|
IgorA100
|
ba5cb4adcd
|
Added $this->streamSrc = $streamSrc (Monitor.php)
Required to switch without reloading the page between monitors on the Watch page
|
2024-06-04 15:22:59 +03:00 |
|
IgorA100
|
eb1a38c74c
|
Changed attr "title" for "#monitor" (Monitor.php)
Made in two lines and added capital letters.
|
2024-06-02 00:07:37 +03:00 |
|
Isaac Connor
|
7543e513fa
|
Replace useless title on image stream with a useful one describing zoom controls.
|
2024-05-28 10:10:30 -04:00 |
|
Isaac Connor
|
ae5b73bf90
|
Resolve conflicts
|
2024-05-23 14:30:44 -04:00 |
|
Isaac Connor
|
b3c90c3216
|
Merge branch 'master' into only_stream_visible
|
2024-05-23 14:18:47 -04:00 |
|
Isaac Connor
|
02ccb5f12b
|
Remove unused zms url parameters
|
2024-05-23 13:31:30 -04:00 |
|
IgorA100
|
41a92e11ad
|
Fix: block "Ratio Control" is created only for Montage page (Monitor.php)
Otherwise there will be an error in the browser console that the "changeRatio" function was not found
|
2024-05-21 19:34:06 +03:00 |
|
IgorA100
|
e995166dab
|
Added <select> for Ratio control & more (Monitor.php)
- Added <select> for Ratio control
- Reduced the size of the "Open watch page", "Edit monitor" buttons
- Added a button "Open full screen"
|
2024-05-14 13:14:43 +03:00 |
|
IgorA100
|
4e7d774667
|
Added support for GridStack & PanZoom on Montage page (Monitor.php)
|
2024-05-07 19:31:25 +03:00 |
|
Isaac Connor
|
97af155102
|
Remove extra }. Fixes #3911
|
2024-03-27 17:36:45 -04:00 |
|
Isaac Connor
|
9b1ea23792
|
When deleting a monitor, stop running zmc and zmcontrol processes
|
2024-03-27 13:03:54 -04:00 |
|
Isaac Connor
|
76e2be6543
|
Set defaults for ONVIF_EVENTS_PATH and ONVIF_Alarm_Text
|
2024-03-22 09:12:07 -04:00 |
|
Isaac Connor
|
1ae7c9c4b1
|
Add UI for setting StartupDelay
|
2024-03-19 14:59:04 -04:00 |
Server
|
58d8cf0adf
|
Makes the "Events" part of the ONVIF URL configurable
as required per some ONVIF version 21.06 cameras
by default sets the Events Path equals to "/Events"
to maintain functionality
|
2024-02-24 11:05:08 -06:00 |
|
Isaac Connor
|
a738f1bc2e
|
Remove unused EventStartMode. Fixes #3839
|
2024-02-23 08:56:26 -05:00 |
|
Isaac Connor
|
eeb8856157
|
Ad EventStartMode and EventCLoseMode to monitor
|
2024-02-22 10:46:36 -05:00 |
|
Server
|
0ff48f631e
|
Implements an option to disable soap_wsa code that doesn't work
with some chinese cameras, more common to Latam zone
|
2024-02-12 19:22:01 -06:00 |
|
Isaac Connor
|
88db0e9854
|
Handle when ZM_RTSP2WEB_PATH hasn't been filled, but RTSP2Web has been turned on for a monitor.
|
2023-12-07 13:17:08 -05:00 |