332 Commits

Author	SHA1	Message	Date
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
Isaac Connor	ffc111f1e7	Need to a () so that ModelId is called as a function and so it doesn't complain about lack of property	2023-12-06 09:37:45 -05:00
Isaac Connor	03858ba1a2	Code style, using ->Id() instead of checking for property existence.	2023-12-04 14:06:49 -05:00
adhamiamirhossein	27977acdd4	fix: php 8.3 deprecated get_class method call without argument	2023-11-22 10:48:04 +03:30
Isaac Connor	5486fc6327	Include username in url when using auth_hash so that the authenting sql can be more efficient	2023-11-08 10:55:39 -05:00
Isaac Connor	3cd6b78b85	OutputCodec cannot be null	2023-10-17 12:33:27 -04:00
Charlie Root	e11b700fbd	Add Id as a protected member, only lookup monitor status if Id has a value	2023-09-13 11:18:50 -07:00
Isaac Connor	5233c402d3	Use User object to get Monitor_Permission and Group_Permissions hoping it will be cached there.	2023-08-02 18:07:28 -04:00
Isaac Connor	672ba114f4	Fix reversed defaults for RTSP2Web options	2023-08-02 13:48:15 -04:00
Jonathan Bennett	5c9588c012	Adds RTSP2Web support for live view	2023-07-29 23:46:31 -05:00
Isaac Connor	febf424259	Fix returning link_to	2023-05-30 20:47:05 -04:00
Isaac Connor	30495578c2	Add link_to function	2023-05-30 20:47:05 -04:00
Isaac Connor	485af42a0b	Fix more typos	2023-05-16 14:18:26 -04:00
Isaac Connor	030d6b9696	Fix undefined mid	2023-05-16 14:14:34 -04:00
Isaac Connor	3daee34d4d	Fix typo	2023-05-16 14:11:53 -04:00
Isaac Connor	6eb166c938	Handle matches2 not being defined	2023-05-16 11:53:48 -04:00
Isaac Connor	a8365d40b4	Fix array uses of user object. Include data-id in monitor div.	2023-05-10 11:03:10 -04:00
Isaac Connor	969baa3891	Convert user from an array to a User object	2023-04-23 12:57:29 -04:00
Isaac Connor	35cc9fa4cb	Apparently Default for Deleted needs to be zero, not false	2023-04-22 14:04:18 -04:00
Isaac Connor	665628720f	Improved setting of Manufacturer and Model, add Status to monitor view status, new defaults for Label, EncoderParamters, don't save analysis jpegs by default and only analyze on 2fps and set a reasonable MaxImageBuffer	2023-04-22 13:58:33 -04:00
Isaac Connor	73548dda73	Add Deleted member	2023-04-19 18:56:29 -04:00
Isaac Connor	16b74fc474	Add title of monitor id and name like we had in 1.36	2023-03-23 20:03:40 -04:00
Isaac Connor	72652cfb64	Add Decoder options to monitor view	2023-02-26 16:04:32 -05:00
Isaac Connor	82a28b78d8	Use function style of member access to prevent errors on unsaved monitor	2023-02-23 13:22:50 -05:00