Commit Graph

24232 Commits (9e8d1f66fb4b73324107e674c50e278f08f1c14b)

Author SHA1 Message Date
IgorA100 3879fa7e9c
Chore: Fix eslint (montage.js) 2024-05-22 19:23:55 +03:00
IgorA100 f96b7b00b9
Fix: placement of monitors when initializing Layout №2 (montage.js)
This code is clean.
Should fix the situation with incorrect placement of monitors on preset layouts, but should be checked.
2024-05-22 19:06:27 +03:00
Isaac Connor 371b4a9761 Free up raw images once we are done with them in event. 2024-05-22 09:15:57 -04:00
Isaac Connor 937cc80b65 Free analysis image regardless of recording mode 2024-05-22 09:15:57 -04:00
Isaac Connor ea407198b6 Debug log startup time checks 2024-05-22 09:15:57 -04:00
Isaac Connor eedb0b97cf Delete Monitor_Status records that havn't been updated in over a minute. 2024-05-22 09:15:57 -04:00
Isaac Connor 51f91fb151
Merge pull request #4026 from IgorA100/patch-109
Fix: Disabled "objGridStack.compact('list', true)" due to problems in GridStack (montage.js)
2024-05-22 09:10:11 -04:00
Isaac Connor d5368181a2
Merge pull request #4022 from IgorA100/patch-106
Fix: Select layout on Montage page
2024-05-22 09:09:34 -04:00
Isaac Connor 8a013c00c5
Merge pull request #4025 from IgorA100/patch-108
When save cookies via PHP >= 7.3.0, add handling of the "path" value in the options (session.php)
2024-05-22 08:58:26 -04:00
Isaac Connor 24ebbd5896
Merge pull request #4027 from IgorA100/patch-110
Fix: Border when motion detection is triggered on Montage page
2024-05-22 08:52:05 -04:00
IgorA100 f17a3a3b55
Fix: Border when motion detection is triggered on Montage page (montage.css) 2024-05-22 14:10:09 +03:00
IgorA100 d6cff830c1
Let's leave the option "objGridStack.compact('list', true)" only for preset layout. Without this option, there may be problems with sorting monitors. (montage.js) 2024-05-22 12:43:25 +03:00
IgorA100 92fbd17d67
Disabled "objGridStack.compact('list', true)" due to problems in GridStack (montage.js) 2024-05-22 11:42:05 +03:00
IgorA100 bd93a8e329
When setting cookies via PHP, add handling of the "path" value in the options (session.php)
Otherwise, cookies set via PHP will not be able to be changed in JS.
Because JS saves cookies with path="/"
Closed: #4024
2024-05-22 10:32:10 +03:00
Isaac Connor 509a9cc6c7
Merge pull request #4023 from IgorA100/patch-107
Fix: When saving Layout, change "mode = VIEWING" only after successful name checks on Montage page
2024-05-21 16:53:13 -04:00
IgorA100 b87b3de292
Fix: When saving Layout, change "mode = VIEWING" only after successful name checks (montage.js) 2024-05-21 23:21:35 +03:00
IgorA100 ada2f2dc0f
Fix: Layout "Auto" is considered as "Freeform" (montage.js) 2024-05-21 23:12:33 +03:00
IgorA100 f6281d82d0
Removed meaningless condition (montage.php) 2024-05-21 22:58:25 +03:00
IgorA100 fbcedae7f5
Fix: Select layout on Montage page (montage.php)
If there is no cookie, set Layout="Auto"
2024-05-21 22:50:11 +03:00
Isaac Connor 642d50fb8a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-05-21 14:54:08 -04:00
Isaac Connor 943b607b37 Add 8 and 15 fps options 2024-05-21 14:54:02 -04:00
Isaac Connor e6f9dbae2e move image_count to shared mem. Use it in monitorstream to detect when last_write_time % buffer_count hasn't changed, but there is in fact a new image. 2024-05-21 14:53:52 -04:00
Isaac Connor f8ba3c73cf
Merge pull request #4021 from IgorA100/patch-105
Fix: Recalculate "Scale" after zooming by mouse click (montage.js)
2024-05-21 13:36:05 -04:00
IgorA100 ec7e27d187
Fix: Recalculate "Scale" after zooming by mouse click (montage.js) 2024-05-21 20:21:12 +03:00
Isaac Connor 95ccb986ab
Merge pull request #4019 from IgorA100/patch-103
Feat: "Freeform" preset Layout changed to "Auto" on Montage page
2024-05-21 12:40:51 -04:00
Isaac Connor 584fa02477
Merge pull request #4020 from IgorA100/patch-104
Fix: block "Ratio Control" is created only for Montage page (Monitor.php)
2024-05-21 12:38:12 -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
Isaac Connor 7718abc1e4
Merge pull request #4018 from IgorA100/patch-102
Chore: Moving a function "stringToNumber" from montage.js, watch.js & frames.js to skin.js
2024-05-21 12:29:39 -04:00
IgorA100 ccd76e71f9
Chore: eslint (montage.js) 2024-05-21 19:09:41 +03:00
IgorA100 3d2b7daeeb
Changed grid formation for Layout "Auto" (formerly Freeform) (montage.js) 2024-05-21 19:01:04 +03:00
IgorA100 89eb202c4b
Replaced the variable "$FreeFormLayoutId" with "$AutoLayoutName" (montage.js.php) 2024-05-21 18:57:06 +03:00
IgorA100 fe7486ab4f
"Freeform" preset Layout changed to "Auto" (montage.php) 2024-05-21 18:49:55 +03:00
IgorA100 b12d0acab6
Moving "stringToNumber" function to skin.js (event.js) 2024-05-21 17:23:32 +03:00
IgorA100 053f57b788
Moving "stringToNumber" function to skin.js (watch.js) 2024-05-21 17:21:28 +03:00
IgorA100 bcd9225a26
Moving "stringToNumber" function to skin.js (montage.js) 2024-05-21 17:20:22 +03:00
IgorA100 021ec4b273
Added function stringToNumber (skin.js)
Moving a function from montage.js, watch.js & frames.js to skin.js
2024-05-21 17:15:41 +03:00
Isaac Connor 652c111fba Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-05-21 09:41:34 -04:00
Isaac Connor d4c0203aac Set default value for rows per page using WEB_EVENTS_PER_PAGE. Fixes #3728 2024-05-21 09:40:47 -04:00
Isaac Connor 7a8f9a603d Remove debug 2024-05-21 09:39:53 -04:00
Isaac Connor e373d57814
Merge pull request #4016 from IgorA100/patch-101
Fix: Clear the "changedMonitors" array when "mode == EDITING" and errors in getting "layout" (montage.js)
2024-05-21 09:25:59 -04:00
Isaac Connor 9cc8ec7048 Santisize zmMontageLayout when passing to constructor 2024-05-21 09:22:55 -04:00
Isaac Connor 9dd58855d1 Santisize zmMontageLayout when passing to constructor 2024-05-21 09:21:54 -04:00
Isaac Connor 32ae42ecf2 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-05-21 09:20:28 -04:00
Isaac Connor a17f4f6b13
Merge pull request #4014 from IgorA100/patch-99
Feat: Delete Layout on Montage page
2024-05-21 09:20:18 -04:00
Isaac Connor 93058ae04b
Merge pull request #4012 from IgorA100/patch-97
Fix: Select Layouts on Montage page
2024-05-21 09:15:27 -04:00
Isaac Connor eb49f1e191 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-05-21 09:11:44 -04:00
IgorA100 e879ea701d
Fix: Clear the "changedMonitors" array when "mode == EDITING" and errors in getting "layout" (montage.js) 2024-05-21 13:40:54 +03:00
IgorA100 b5d96f2bef
Added processing of the action when the "delete" button is pressed Layout (montage.js) 2024-05-21 13:33:07 +03:00
IgorA100 1a1c49f7e3
Added button for delete Layout (montage.php) 2024-05-21 13:16:02 +03:00
IgorA100 704e724f9b
Additional check "$layout_id" (montage.php) 2024-05-21 12:51:59 +03:00