mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-30 11:42:22 -04:00
Code Issues Packages Projects Releases Wiki Activity
23,949 Commits 80 Branches 104 Tags
05bdfdbe9afd0871091b03a56eece3caaacc22b2
Commit Graph

102 Commits

Author SHA1 Message Date
IgorA100
a809a92d1f Chore: eslint MonitorStream.js 2024-05-07 20:50:34 +03:00
IgorA100
6d4e6fd401 Added the ability to disable image resizing when changing Scale (MonitorStream.js) 
Required when using GridStack & PanZoom on Montage page
 2024-05-07 20:23:00 +03:00
IgorA100
d9e12a2e68 Fix: IMG width is now 100% instead of "auto" 2024-04-09 13:16:03 +03:00
IgorA100
d7ae0d9d23 Feat: Mouse moving an enlarged video frame during live viewing 
Added mouse movement tracking functions.
 2024-04-01 12:56:14 +03:00
IgorA100
a18167377e Fix: scaleToFit function 
It is required to pass an object in parameters
 2024-03-04 16:52:04 +03:00
Isaac Connor
8ca1436224 If img has a fix width set, clear it when we change scale 2024-01-24 12:54:13 -05:00
Isaac Connor
6ba09c6f0d Finish switch to using Intervals instead of Timeouts 2024-01-24 09:28:12 -05:00
Isaac Connor
bd90711aa6 Use an interval instead of calling Timeout from callback 2024-01-22 14:25:57 -05:00
Isaac Connor
6812f2efe7 Fix eslint 2024-01-16 09:56:28 -05:00
Isaac Connor
ee9e03a7c1 Fix FPS values when getting status from web instead of ZMS. 2024-01-02 16:28:49 -05: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
07d4fb2099 Set default delay, add starting statusCmdTimer when using rtsp2web 2023-11-21 11:35:04 -05:00
Isaac Connor
ea76a03043 Rename startRTSPtoWebRTSPPaly to startRTSPtoWebPlay 2023-10-15 17:55:44 -04:00
Isaac Connor
93f5378f4e Fix undefined reference to startPlay 2023-10-15 17:55:44 -04:00
Isaac Connor
1e200abf16 Remove support for browsers not supporting TextDecoder to fix eslint 2023-08-08 13:01:42 -04:00
Jonathan Bennett
80c145dca4 Add support for HTTPS connections to RTSP2Web 2023-07-31 00:16:51 -05:00
Jonathan Bennett
af42398070 Fix ESLint issues in RTSP2Web work 2023-07-30 16:54:22 -05:00
Jonathan Bennett
5c9588c012 Adds RTSP2Web support for live view 2023-07-29 23:46:31 -05:00
Isaac Connor
e96d2a6acc No longer abort when sending a command... no streaming ajax should take any significant time. 2023-07-11 17:27:52 -04:00
Isaac Connor
14eb38a00b add timeout value to debug, only send scale command if it is > 0 2023-06-08 10:30:01 -04:00
Isaac Connor
4f416edf93 Fix missing auth_relay on alarm xhr 2023-06-05 09:57:12 -04:00
Isaac Connor
31d9342918 Assume reverse proxy setup for janus for http as well 2023-05-31 17:01:45 -04:00
Isaac Connor
9a13312e4e Fix eslint 2023-05-25 14:15:32 -04:00
Isaac Connor
d0fead5b06 Add setMaxFPS and fix streamCommand so that data doesn't pollute other commands data 2023-05-12 14:10:52 -04:00
Isaac Connor
7dd09ea55e When killing stream, stop and abort 2023-05-12 12:50:35 -04:00
Isaac Connor
81fd2dcb08 Don't pollute streamCmdParams 2023-05-12 12:48:31 -04:00
Isaac Connor
c4c3dddbe3 add in setMaxFPS 2023-05-12 12:46:16 -04:00
Isaac Connor
9fbf140fc3 fix eslint 2023-05-11 10:23:12 -04:00
Isaac Connor
8ae4783a33 If monitor is assigned to a server, use that server for janus url. 2023-05-11 10:13:20 -04:00
Isaac Connor
a608b18e8b Limit auto-calculated scale to 25%. Just looks bad less than that. When no bottom Element, adjust height as well. Don't need to change img.src on scale if streaming. Can just tell it to. Fix applying scale and will auto-reapply if needed. 2023-04-27 10:43:06 -04:00
Isaac Connor
1f11493266 Don't need to add auth_hash if we have auth_relay 2023-04-13 10:13:27 -04:00
Isaac Connor
b85b7e462e When testing ZM_ALARM_ON_SOUND, use string comparison as the config value is a string. Also add log if other config options are not set 2023-04-10 13:13:36 -04:00
Simpler1
0a84cd0327 fix(alarmSound): Use Audio.play() for alarm sound 2023-04-07 10:55:09 -04:00
Isaac Connor
7a254b42f5 Fix use of auth_relay when PLAIN 2023-03-21 09:52:50 -04:00
Isaac Connor
74a0790c56 Use const instead of var, code comment fix 2023-02-19 17:29:32 -05:00
Isaac Connor
50f87be9d9 Detach streams when killing the monitor stream to reduce console logging 2022-12-07 14:14:00 -05:00
Isaac Connor
0c0269b2cc Fix eslint 2022-11-01 12:41:27 -04:00
Isaac Connor
2859634aaa Set xhrFields: widthCredentials: true so that we send cookies with our streaming xhr requests so that we pick up new auth hashes 2022-11-01 08:22:53 -04:00
Jonathan Bennett
c35bbc8c30 Adds the Janus_pin to shared_memory, and a -j to zmu to fetch it 2022-09-07 15:49:47 -05:00
Isaac Connor
48377334fe Gracefully handle when FrameRate is empty 2022-08-26 14:12:51 -04:00
Isaac Connor
071147fba7 Remove no longer used code to protect percentage widths 2022-08-15 13:04:50 -04:00
Isaac Connor
de5b8bd893 Handle width=100% and remove code that worked around montage layouts with width=%. 2022-08-15 13:01:49 -04:00
Isaac Connor
4ab58f5f22 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-06-16 09:58:49 -04:00
Isaac Connor
58fedd8c35 Fix streamQuery => streamCmdQuery. Fixes #3507 2022-06-16 09:58:26 -04:00
Isaac Connor
17562671c1 fix eslint 2022-06-15 13:18:11 -04:00
Isaac Connor
a5cbe65d70 watchdog is not available everywhere yet. comment out its use 2022-06-15 13:08:38 -04:00
Isaac Connor
5188346086 Institute a status timer to be used when not streaming from zms. 2022-06-15 12:34:55 -04:00
Isaac Connor
ba2b18f8a9 Fix eslint 2022-06-03 15:00:23 -04:00
Isaac Connor
edfaffb88f Only set onclick if a new function is given 2022-06-02 15:11:59 -04:00
Isaac Connor
c68f9f5fe8 Include connKey is debug line 2022-06-01 08:58:58 -04:00