Commit Graph

25930 Commits (master)

Author SHA1 Message Date
Isaac Connor b0d0021b71 Remove dead code 2025-07-18 18:23:12 -04:00
Isaac Connor 49168b23cc Allow forcing Go2RTC mode 2025-07-18 18:22:39 -04:00
Isaac Connor 4fb00af91a Allow forcing stream mode 2025-07-18 18:21:42 -04:00
Isaac Connor ec780897e2 Remove globals that are duplicated in monitorData. Fix AGAIN the monIDx increase code. 2025-07-18 15:45:32 -04:00
Isaac Connor 5becffc0b3 Use a better way to increment monIdx fixing error accessing monitorData 2025-07-18 15:33:48 -04:00
IgorA100 03f000d218
Замена tab @ functions.php 2025-07-18 00:41:40 +03:00
Isaac Connor 06636d58fb Show volume controls for rtsp2web to 2025-07-17 15:35:54 -04:00
Isaac Connor 24130e7c4c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-07-17 15:33:21 -04:00
Isaac Connor aa1b19ddc7 Fix default for GO2RTC_PATH 2025-07-17 15:33:16 -04:00
Isaac Connor 059ce24f04
Merge pull request #4358 from IgorA100/patch-661564
Changed style for <input>(skin.css)
2025-07-17 12:14:32 -07:00
IgorA100 7bbf6dc303
Avoid conflict with Bootstrap's ".form-check-inline" (skin.css) 2025-07-17 20:13:03 +03:00
Isaac Connor 006576ba94 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-07-16 17:18:53 -04:00
Isaac Connor 750ad7d3c2 Remove unused nextMid 2025-07-16 16:01:57 -04:00
Isaac Connor b7b347da03 Clean up some code: Don't pass target to cycleStop, it has no business with that. Load monitorName from monitorData instead of parsing the target's text node. Rename intervalId to cycleIntervalId. 2025-07-16 16:01:43 -04:00
Isaac Connor bbdb15e1e4 In kill, just clear src. It calls stop already, which will change the url to a single image. Handle the case when the src doesn't have a mode= in it's query params. 2025-07-16 16:00:34 -04:00
Isaac Connor 6b928dd27f Include video-stream in styles for img, video etc so that auto-scaling works 2025-07-16 14:53:44 -04:00
Isaac Connor 398f4649fa
Merge pull request #4359 from IgorA100/UseVariablesToSpecifyColor
Use variables to specify color (CSS)
2025-07-16 11:48:29 -07:00
Isaac Connor a6d31aafcd
Merge pull request #4362 from IgorA100/patch-911303
Fix: To search for the column 'Thumbnail' use the attribute 'data-field' instead of the internal text (Watch page)
2025-07-16 11:47:05 -07:00
Isaac Connor d501be6ff0 Only show volumeControls for go2RTC 2025-07-16 14:46:29 -04:00
Isaac Connor 4011a7c41c Add auto to players and add id to volumeControls 2025-07-16 14:45:55 -04:00
Isaac Connor e54b44bd71 Finally kill saving username/password form data 2025-07-16 13:49:48 -04:00
IgorA100 e5822fed57
Fix: To search for the column 'Thumbnail' use the attribute 'data-field' instead of the internal text (watch.js)
Similarly #4361
2025-07-16 00:59:03 +03:00
Isaac Connor fc230a5f09 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-07-15 16:17:45 -04:00
Isaac Connor 97877335db Add MaxScoreFrameId to the events table and automatically update it during event creation so we don't have to look it up later. Finding the frame with the max score is actually a very heavy query, so lets not do it. 2025-07-15 16:17:36 -04:00
Isaac Connor 9abd091a20
Merge pull request #4361 from IgorA100/patch-234657
Fix: To search for the column 'Thumbnail' use the attribute 'data-field' instead of the internal text (Events page)
2025-07-15 12:12:11 -07:00
IgorA100 69f92c19af
To search for the column 'Thumbnail' use the attribute 'data-field' instead of the internal text (events.js)
The internal text will be equal to "Thumbnail" only if the English language is used without translation. In the case of translation, the internal text will be different !!!
2025-07-15 22:08:26 +03:00
IgorA100 df278223d0 Replace explicit color specification #485460 with variable --backgroundMediumDark 2025-07-15 15:06:42 +03:00
IgorA100 4247484bf7
Merge branch 'master' into UseVariablesToSpecifyColor 2025-07-15 12:50:45 +03:00
IgorA100 eab89cb746 Remove extra space 2025-07-15 12:32:14 +03:00
IgorA100 d15dd1f3f6 ... 2025-07-15 12:14:48 +03:00
IgorA100 e3cc5bdc88 Use variables to specify color 2025-07-15 12:09:21 +03:00
IgorA100 7d0844f9a6
Added a comment to the code (functions.php) 2025-07-15 10:48:13 +03:00
IgorA100 23e287062c Замены:
HighBW => Highband
LowBW => Lowband
MediumBW => Medband
2025-07-15 10:39:39 +03:00
Isaac Connor be1cc5fbb1 Add error reporting when saving a control 2025-07-14 17:35:14 -07:00
IgorA100 37f4e4a4bb
Update skin.css 2025-07-15 01:27:52 +03:00
IgorA100 0517d83b05
Update en_gb.php 2025-07-15 00:44:56 +03:00
IgorA100 e0ebf8373e
Translation and replacement of words should be carried out at the time of submenu assembly (functions.php) 2025-07-15 00:38:24 +03:00
IgorA100 c77b5d551d
Update options.php 2025-07-15 00:33:42 +03:00
IgorA100 11f1e82a3f
Perform translation only after all necessary word replacements (functions.php) 2025-07-15 00:11:57 +03:00
IgorA100 52e243ecc5
Update ru_ru.php 2025-07-15 00:03:57 +03:00
IgorA100 a77b0cbf3a
Update en_gb.php 2025-07-14 23:28:41 +03:00
IgorA100 2f277c67c6
Need to rename 'Version' => 'Versions' (functions.php)
Because transferring 'Version' => 'Versions' into translation would be completely incorrect!
2025-07-14 23:11:54 +03:00
IgorA100 b94eb74ae5
Added missing menu item 'servers' (functions.php) 2025-07-14 22:51:07 +03:00
Isaac Connor 9cf68eb83d Fix typo. Fixes #3457 2025-07-14 12:03:12 -07:00
Isaac Connor ea7f868ed5 UPgrade nonce generation. Fixes #3412 2025-07-14 12:02:03 -07:00
Isaac Connor ad16b5db51
Merge pull request #4355 from Marine-Mike/fix_fps_oom
Fix an uncontrolled FPS scenario leading to OOM.
2025-07-14 11:49:29 -07:00
Isaac Connor e455aab55c
Merge pull request #4356 from Marine-Mike/fix_jpeg_zmc_reset
Fix unnecessary zmc exit caused by occasional frame errors.
2025-07-14 11:46:02 -07:00
IgorA100 3238a966db
Z-index = 10 for table thead (skin.css) 2025-07-14 21:43:48 +03:00
IgorA100 d6b73e9e7a
Update skin.css 2025-07-14 21:15:33 +03:00
IgorA100 6352f6419d
Moved Skins renaming to Display to the correct location (functions.php) 2025-07-14 18:55:14 +03:00