ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
25,431 Commits
34 Branches
93 Tags
179 MiB
Commit Graph

25431 Commits (master)

Author SHA1 Message Date
Isaac Connor 657af6a628 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-06-13 09:34:36 -04:00
Isaac Connor a95f37ff83 Fix blank reason for mysql failure 2025-06-13 09:34:24 -04:00
Isaac Connor 7d0be591a0 DOn't crash when we receive an unknown error 2025-06-13 09:33:51 -04:00
Isaac Connor e6d11b5d88 Don't do reload when doing actionEnable/Disable. Log the change. 2025-06-13 09:33:02 -04:00
Isaac Connor ba46bafcbf Add SystemTimePoint StringToSystemTimePoint(const std::string &timestamp) 2025-06-12 09:39:08 -04:00
Isaac Connor bdeb748894 Remove some debug 2025-06-11 15:05:45 -04:00
Isaac Connor 1997dfcc1c Update montagereview from another dev branch. The main gist is that we no longer pre-populate events in the js code included with html. We load by ajax now from the API. This reduces the amount of ram used by php. The rest is basically code and white space cleanups. 2025-06-11 15:03:05 -04:00
Isaac Connor d97b37f83f Don't do pagination in events.This may break users of API but pagination should only happen if asked for 2025-06-11 14:57:54 -04:00
Isaac Connor 9d0f2c25bb Small debug cleanup 2025-06-11 14:51:43 -04:00
Isaac Connor be8840163b Merge branch 'master' of github.com:connortechnology/ZoneMinder 2025-06-09 12:29:14 -04:00
Isaac Connor 5406c6b72e add iproute2 to depends to get 'ip' command in build system 2025-06-05 14:46:31 -04:00
Andrew Bauer 568fe410ae
zoneminder.spec - add empty %check, to keep rpmlint happy 2025-06-04 09:30:30 -05:00
Andrew Bauer 7ae3379275
Update zoneminder.spec - build against pcre2 
The original pcre library is no longer supported in rhel, moving forward. Use pcre2 instead.
 2025-06-04 07:56:58 -05:00
Isaac Connor 9932ed15fd Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-06-02 19:44:47 -04:00
Isaac Connor 38c0f743c1 Use Bytes::Random::Secure instead of deprecated Data-Entropy. Fall back to Data-Entropy. Fixes #4333 2025-06-02 19:44:20 -04:00
Isaac Connor 9a05f528ff Handle EAGAIN from send_frame in encoding. 2025-06-02 09:19:02 -04:00
Isaac Connor a5cdd4c586 Fix invalid SQL when user can view all streams preventing viewing all zones 2025-05-26 10:46:14 -04:00
Isaac Connor e8804f3552
Merge pull request #4331 from IgorA100/patch-610785 
Fix: After the pause ZM_WEB_VIEWING_TIMEOUT ends, start only the monitors that are visible on Montage page
 2025-05-21 09:27:22 -04:00
Isaac Connor 02fa962d08
Merge pull request #4332 from IgorA100/patch-396390 
Added Russian translation of "Gateway" (ru_ru.php)
 2025-05-21 08:09:55 -04:00
IgorA100 480c49aee0
Added Russian translation of "Gateway" (ru_ru.php) 2025-05-21 13:06:39 +03:00
IgorA100 9f3ba7713a
Fix: After the pause ZM_WEB_VIEWING_TIMEOUT ends, start only the monitors that are visible. (montage.js) 2025-05-21 12:57:27 +03:00
faginbagin 63e36c6c63 Fix deprecated AVCodecContext::channel_layout to use ch_layout 
Moving from ubuntu jammy with libavcodec 58.134.100 to ubuntu noble with
libavcodec 60.31.102 broke the ability to capture events using some
cameras whose audio streams did not use the AAC codec. This fixes the
problem by using the newer AvCodecContext::ch_layout.
 2025-05-20 17:36:48 -04:00
Isaac Connor 03ecb8b5ea Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-05-20 13:52:43 -04:00
IPC 59fbdcb825 Add gateway 2025-05-20 12:49:45 -05:00
Isaac Connor ef3f7ec727
Merge pull request #4329 from IgorA100/patch-73924 
Fix: Don't handle on_scroll() if idleTimeoutTriggered trigger is fired on Montage page
 2025-05-20 12:36:35 -04:00
IgorA100 ea192b828e
Fix: Don't handle on_scroll() if idleTimeoutTriggered trigger is fired (montage.js) 
Otherwise, stopped monitors will be started while the modal window is still displayed:

"Are you still watching?
Video paused. Continue watching?"

but scrolling has occurred and the user has not answered the question.
 2025-05-20 17:47:52 +03:00
Isaac Connor b068dead5f Clear bad layouts and put back all missing divisors of 48 2025-05-13 15:01:13 -04:00
Isaac Connor cdcf57e6dc Add quadra encoders, decoders and add hwaccelname and hwacceldevice 2025-05-13 08:09:20 -04:00
Isaac Connor 0a2e41bedd Add EncoderHWAccel fields 2025-05-13 08:05:04 -04:00
Isaac Connor ed83e73319 Add hwdevice_default to CodecData struct and set QUADRA's to -1. Rework Encoding to handle as many packets as the encoder will return. 2025-05-13 08:03:50 -04:00
Isaac Connor adb9bff244 Add EncoderHWACCelName and Device 2025-05-13 07:49:24 -04:00
Isaac Connor 3ee0057130 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-05-02 19:48:35 -04:00
Isaac Connor cc9bbb0002
Merge pull request #4322 from IgorA100/patch-152539 
Replace old style layouts with new style layouts + added "24 Wide" & "48 Wide" Layouts (montage page)
 2025-05-02 17:14:57 -04:00
IgorA100 cb7d7f4a29
Added a comment to the condition if ($l->Name() == 'Freeform') $l->Name('Auto'); (montage.php) 2025-05-02 23:08:21 +03:00
IgorA100 73a4b1d5f3
Layer name changed from "Freeform" to "Auto" (zm_create.sql.in) 
To avoid confusion, because after integrating GridStack, instead of "Freeform" we use "Auto"
This will allow us to get rid of the condition
if ($l->Name() == 'Freeform') $l->Name('Auto');
in montage.php
BUT! Now this condition cannot be removed, because it will break the logic in already installed ZM!
 2025-05-02 22:58:05 +03:00
IgorA100 01da58fae4
Added "24 Wide" & "48 Wide" Layots (montage.php) 2025-05-02 22:49:19 +03:00
IgorA100 c0c2298bb9
Added 3 Wide, 24 Wide, 48 Wide (zm_create.sql.in) 2025-05-02 22:42:49 +03:00
IgorA100 a4c440daab
Replace old style layouts with new style layouts (zm_create.sql.in) 
New style layouts were implemented in:
99e87a9c1c
https://github.com/ZoneMinder/zoneminder/pull/3969

I haven't tested it, but it should work.
Please check it.

Closed #4315
 2025-05-01 23:48:39 +03:00
Isaac Connor b029975ae4
Merge pull request #4321 from Simpler1/dark_mode 
feat(dark): table and dropdown menus to use a grey outline instead of…
 2025-04-30 11:38:34 -04:00
Simpler1 0bbb6e044e feat(dark): table and dropdown menus to use a grey outline instead of white 2025-04-29 21:44:13 -04:00
Isaac Connor e73cb52359 Add type=float for AnalysisFPSLimit 2025-04-29 16:02:44 -04:00
Isaac Connor b357ce52aa Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-04-22 10:25:04 -04:00
Isaac Connor 504e75d8a1 Remove broken google analytics 2025-04-22 10:24:59 -04:00
Isaac Connor beb1e6e8b3
Merge pull request #4312 from IgorA100/patch-990778 
Fix: Instead of switch "( $max_aspect_ratio )" use a formula for recalculation aspect ratio on Timeline page
 2025-04-21 11:58:56 -04:00
IgorA100 945bd7e9da
Instead of switch "( $max_aspect_ratio )" use a formula for recalculation (timeline.css.php) 
round(100/$max_aspect_ratio, 2)
 2025-04-21 18:11:05 +03:00
Isaac Connor c9a6b6bfca Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-04-17 09:08:49 -04:00
Isaac Connor 9181b2ae5d Put back data-page-size setting and remove the cookie setting. The cookie setting didn't work in testing. data-page-size did work today. I think it didn't work in the past with previous version of bs. 2025-04-17 09:08:44 -04:00
IgorA100 e7be0c1721
Fix: Add portrait orientation 1080x1920, 1520x2688 aspect ratio (timeline.css.php) 2025-04-16 11:59:03 +03:00
Isaac Connor c6177402ec
Merge pull request #4308 from IgorA100/patch-948505 
Fix: Removed loadFontFaceObserver() call as it is no longer used Watch page
 2025-04-14 16:02:10 -04:00
Isaac Connor 3e50d50b1d
Merge pull request #4310 from IgorA100/patch-833920 
Fix: Firefox return to previous page (skin.js)
 2025-04-14 16:01:53 -04:00