26538 Commits

Author SHA1 Message Date
Charlie Root
df66081a04 Use %jd instead of %ld for time_t 2025-11-19 10:11:25 -08:00
Charlie Root
6c4374230a Add a break to quiet clang 2025-11-19 10:11:01 -08:00
Charlie Root
09e7641561 Merge branch 'master' into openbsd 2025-11-18 12:09:27 -08:00
Charlie Root
77c03d1f83 Merge branch 'master' of http://github.com/ZoneMinder/zoneminder 2025-11-18 12:02:54 -08:00
Charlie Root
82b0809921 Merge branch 'master' of http://github.com/ZoneMinder/zoneminder 2025-11-18 12:02:35 -08:00
Isaac Connor
46343903c0 Fixup starting with muted=trute on montage 2025-11-13 21:53:39 -05:00
Isaac Connor
384d6d5463 Merge firefly:sandbox/ZoneMinder 2025-11-13 19:34:08 -05:00
Isaac Connor
3cbdeaf142 Don't nee dcreate-packages anymore 2025-11-13 19:34:04 -05:00
Isaac Connor
09983c9545 FIx typo getAudioStraem => getAudioStream. Add this.muted 2025-11-13 19:33:09 -05:00
Isaac Connor
25297e440c Put locking around updating server records 2025-11-13 15:45:51 -05:00
Isaac Connor
0687b72a6c Use stop instead of kill on AreYouStillWatching 2025-11-13 14:34:50 -05:00
Isaac Connor
06b34dd1c4 Put a scale lower limit of 10. 2025-11-13 13:59:47 -05:00
Isaac Connor
ac0c42f660 Use stop instead of kill when we switch away from the tab 2025-11-13 13:59:15 -05:00
Isaac Connor
247452e0b1 Update ip of apt-cache 2025-11-13 13:20:55 -05:00
Isaac Connor
09f997fa8b Fix eslint 2025-11-13 12:36:14 -05:00
Isaac Connor
3779eae2f4 Build packages on every master commit 2025-11-13 12:23:24 -05:00
Isaac Connor
7482d80f32 Improve detail in error message Fail to get ONVIF messages 2025-11-13 12:21:41 -05:00
Isaac Connor
8e97d579ff We want to stop, not kill the stream while away. We want status updates to continue and if an alarm happens, sounds can be played. 2025-11-12 16:07:34 -05:00
Isaac Connor
788e65886f Add genConnKey and when reloading a failed stream, generate a new connKey. Even tho the stream failed, zms may still be running , locked on the old connKey. Any new attempt to stream with the old will hang. 2025-11-12 16:06:49 -05:00
Isaac Connor
12515ddcff Bump RtspServer to master 2025-11-12 09:29:54 -05:00
Isaac Connor
7adb2f5b73 Allow 0 instead of false to end events 2025-11-12 09:09:44 -05:00
Isaac Connor
f28146e3ac Improve auto mode for RTSP2Web. Default to webrtc. Fix streaminfo mode display. 2025-11-11 18:48:34 -05:00
Isaac Connor
0a7277a7e0 Merge firefly:sandbox/ZoneMinder 2025-11-11 18:13:22 -05:00
Isaac Connor
277c14308b Remove unused toGrid function 2025-11-11 18:13:17 -05:00
Isaac Connor
2ffbdbe9e3 Add a test to prevent height=0px 2025-11-11 18:12:45 -05:00
Isaac Connor
984beccd99 Add call to controlMute to turn off audio at startup 2025-11-11 18:11:31 -05:00
Isaac Connor
aad533d800 Improve debug 2025-11-11 18:06:42 -05:00
Isaac Connor
aaffd5822a Move assigning ua up because it gets used in guess_crednetials 2025-11-11 15:54:49 -05:00
Isaac Connor
bf13d1e7ff Always call canPlayCodec just for the fun of it 2025-11-11 14:25:10 -05:00
Isaac Connor
a4854cd50d Improve canPlayCodec. Codecs have different names than we are used to 2025-11-11 14:24:43 -05:00
Isaac Connor
723f546b28 Actually return nothing when we hit EOF 2025-11-11 14:10:34 -05:00
Isaac Connor
920d38b4cd include filesystem since we use std::filesystem::exists 2025-11-11 13:13:53 -05:00
Isaac Connor
5e9fed057f Spelling: curentMonitor => currentMonitor 2025-11-11 13:10:54 -05:00
Isaac Connor
47d8c3ed54 Fix dark background on monitorStatus bar 2025-11-10 14:26:02 -05:00
Isaac Connor
83acd15d11 Handle null in layout->Positions 2025-11-10 13:48:45 -05:00
Isaac Connor
3957a212f8 Dont error when using auth_relay=none and there is no username in session 2025-11-10 13:47:50 -05:00
Isaac Connor
f2e5a78b13 Turn off building Cxx static libs? 2025-11-10 13:47:24 -05:00
Isaac Connor
fad15cc92c Use stop instead of kill so as to leave the image up 2025-11-10 12:10:20 -05:00
Isaac Connor
1ddf0771eb If activePlayer is already set to zms, try just sending a PLAY command. This fixes paused streams not restarting 2025-11-10 12:09:50 -05:00
Isaac Connor
65e26c071a Remove tempArea and newZone stuff. Let's have just 1 variable and 1 area input 2025-11-10 11:57:43 -05:00
Isaac Connor
3b9f0b82c4 If no area, don't limit inputs to 0 2025-11-10 11:45:26 -05:00
Isaac Connor
98ecc30905 Remove debug RE ZM_WEB_SOUND_ON_ALARM 2025-11-10 11:40:46 -05:00
Isaac Connor
7329fa5833 Add a test for id > n_items to handle and incomplete db config 2025-11-08 09:22:28 -05:00
Isaac Connor
9c9a2dcb0b Update to use Control:: methods instead of our own duplicates 2025-11-07 16:24:00 -05:00
Isaac Connor
dcc2779882 Don't add extra / in get/post/put. Automatically populate BaseUrl and ua->credentials. Fall back to getting credentials from monitor->User and ->Pass 2025-11-07 16:23:51 -05:00
Isaac Connor
9da6a2e424 Year is 2 digit in deep mode 2025-11-06 21:26:08 -05:00
Isaac Connor
10901eb08f Remove extra line, use // to collapse lines 2025-11-06 21:25:40 -05:00
Isaac Connor
0234a43ff0 easoydocker is deprecated 2025-11-06 18:40:13 -05:00
Isaac Connor
f826f606bc Need a blank line to make toctree valid. 2025-11-06 18:40:13 -05:00
Isaac Connor
3e548b9040 Add restarting php-fpm 2025-11-06 16:48:58 -05:00