fc46991eea
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-05-15 11:46:36 -04:00
582f594b0f
Merge branch 'IgorA100-patch-6'
2024-05-15 11:46:26 -04:00
7bfd94b9d2
Merge branch 'patch-6' of github.com:IgorA100/zoneminder into IgorA100-patch-6
2024-05-15 11:45:49 -04:00
ad18cef36c
Merge pull request #4001 from IgorA100/patch-90
...
Fix: Change Scale when scrolling mouse wheel (watch.js)
2024-05-15 11:36:21 -04:00
7ee7829725
Fix: Change Scale when scrolling mouse wheel (watch.js)
...
And set the Scale update period to no more than 1 time every 0.5 seconds. Otherwise, scrolling the mouse wheel quickly or pressing Zoom In/Out quickly will cause the browser to do unnecessary work.
2024-05-15 18:25:18 +03:00
f85639c2f3
Merge pull request #3992 from IgorA100/patch-84
...
Feat: Managing Ratio on Montage page
2024-05-15 09:21:56 -04:00
87e618fd0a
Merge pull request #3996 from IgorA100/patch-87
...
Moved the "Fullscreen" button to another block (watch.php)
2024-05-15 09:21:39 -04:00
e39c222309
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-05-15 09:05:22 -04:00
a9b6215a50
Fix eslint
2024-05-15 09:05:18 -04:00
e0814a3c14
Merge pull request #3995 from IgorA100/patch-86
...
Added "Scale" setting (watch.js)
2024-05-15 09:04:20 -04:00
8c7997eacd
Merge pull request #3998 from IgorA100/patch-88
...
Fix: "Scale" calculation algorithm (skin.js)
2024-05-15 08:59:16 -04:00
7a130033e6
Fix: Change "Scale" on page load (montage.js)
2024-05-15 15:31:54 +03:00
ee2908078c
Use parseInt to ensure an integer comparison on preventframes and maximagebuffercount
2024-05-15 08:22:33 -04:00
3270c7dbd9
Fix: "Scale" calculation algorithm (skin.js)
2024-05-15 15:05:43 +03:00
22df605a72
Moved the "Fullscreen" button to another block (watch.php)
...
Moved from block `id="dvrControls"` to block `id="extButton"`
Now the button does not disappear if there is no block `dvrControls`
2024-05-15 00:39:35 +03:00
589efd0a2a
Chore: eslint (watch.js)
2024-05-14 23:46:07 +03:00
d923057dfe
Added option Scale=Actual (config.php)
2024-05-14 23:39:33 +03:00
4fdbc28ba3
Added option Scale=Actual (watch.js)
...
Actual = 100% of original size
2024-05-14 23:37:29 +03:00
ebe84d4520
Changed the values in $scales (config.php)
2024-05-14 21:02:33 +03:00
3285419942
Added "Scale" setting (watch.php)
2024-05-14 21:00:17 +03:00
8b235fc4e5
Added "Scale" setting (watch.js)
...
Two settings options:
- Auto
- Fit to width
2024-05-14 20:54:21 +03:00
0ca70a32bd
Merge pull request #3994 from IgorA100/patch-85
...
Added translation for "BadPreEventCountMaxImageBufferCount" (ru_ru.php)
2024-05-14 12:28:49 -04:00
9b65204e75
Merge pull request #3991 from IgorA100/patch-83
...
Enabled support for old ZoomPan algorithm, Added ZoomPan (In & Out) options & other (watch.js)
2024-05-14 12:28:36 -04:00
af0aa91774
Added translation for "BadPreEventCountMaxImageBufferCount" (ru_ru.php)
2024-05-14 17:31:28 +03:00
a34a89cabe
Fix: Controlling the presence of a button with ID="zoomOutBtn" (watch.js)
2024-05-14 17:11:30 +03:00
007f0e29b4
When editing buffer settings, ensure that MaxImageBuffers > PreEventCount.
2024-05-14 10:03:20 -04:00
8ac9eaac9e
Added check box "Use old ZoomPan" (watch.php)
2024-05-14 16:59:11 +03:00
d7f0d2944b
Fix: button fullscreen (montage.js)
...
When in full screen mode, I changed the icon and when you click it, you will exit full screen mode.
2024-05-14 15:33:19 +03:00
ebe3c86b7a
Fix: Ratio for <video> montage.js
...
- It is required to set the height for the parent tag too
2024-05-14 14:29:38 +03:00
bbb1b04be2
Chore: eslint (montage.js)
2024-05-14 13:34:10 +03:00
372eb52b54
Added style <select> for Ratio control (montage.css)
...
- Changed the positioning width of the buttons that appear at the top of the monitor image when hovering the cursor
- Added a style for the "Open full screen" button
2024-05-14 13:30:39 +03:00
00b86cb64d
Added <select> for Ratio control (montage.php)
...
- Added "Monitor status position = Show on hover"
2024-05-14 13:18:55 +03:00
e995166dab
Added <select> for Ratio control & more (Monitor.php)
...
- Added <select> for Ratio control
- Reduced the size of the "Open watch page", "Edit monitor" buttons
- Added a button "Open full screen"
2024-05-14 13:14:43 +03:00
e2817a3d3c
Chore: eslint (montage.js)
2024-05-14 13:06:24 +03:00
412df78b6a
Feat: Managing Ratio on Mintage page (montage.js)
...
- Added a list of possible Ratios (auto, real, 1:1, 5:4, 4:3, etc.) for selection.
- Added the ability to specify Ratio both for all displayed monitors and for a specific monitor.
* Option "auto" - the average Ratio is calculated for all displayed monitors, then the closest value is selected from the preset list and applied to all monitors.
* Option "real" - real Ratio for each monitor without recalculation.
- Added "Monitor status position = Show on hover"
- Added a button to open (appears when you hover over the monitor image) of any monitor in full screen mode
2024-05-14 12:53:54 +03:00
68ed1e909f
Chore: eslint (watch.js)
2024-05-14 00:44:18 +03:00
90ccf36551
Feat: Controlling Zoom with the mouse and clicking anywhere in the image (watch.js)
...
- "Shift" button + mouse wheel - Zoom In / Zoom Out
- "Shift" button + mouse click anywhere in the image = applies Zoom Out to the clicked location.
- "Ctrl" button + mouse click anywhere in the image = reset Zoom to 1.
- Depending on the available actions, the appearance of the mouse cursor changes.
2024-05-14 00:38:15 +03:00
f8e7975af6
Chore: eslint (watch.js)
2024-05-13 17:47:43 +03:00
5d187501d7
Fix: border IMG for alarm & alert status (skin.css)
2024-05-13 15:22:34 +03:00
af5cb8acec
Fix: border IMG for alarm & alert status (watch.css)
...
Add: Support for the old ZoomPan algorithm
Fix: border IMG for alarm & alert status
2024-05-13 15:18:50 +03:00
05ed049434
Enabled support for old ZoomPan algorithm, Added ZoomPan (In & Out) options watch.js
...
- Added variables: "panZoomMaxScale", "panZoomStep"
- The "setScale" function is no longer used
- Changed the "changeScale" Function (Fix: problem with image scaling when changing browser width)
- Enabled support for the old ZoomPan algorithm (Added a checkbox for switching)
- Added reset zoom option (Ctrl+click on the Zoom Out button)
- Added an option to double the Zoom In step (Ctrl+click on the Zoom In button)
2024-05-13 15:09:01 +03:00
d8112db6a1
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-05-12 12:08:02 -04:00
0048a6bc99
Use quick_exit instead of exit to fix hanging processes when event start/top commands have an error.
2024-05-12 12:07:55 -04:00
7dc85ecfaa
Revert "Add zm_panic signal as a stronger version of zm_terminate. Basicaly tells things to not try so hard to clean up nicely. Don't do locking basically. Needed for fork/exec failure case."
...
This reverts commit 15df0487e0
2024-05-12 10:26:19 -04:00
03e3d2245d
Remove the event summaries update as we havn't killed that trigger yet
2024-05-12 09:04:37 -04:00
402393f2ce
Set DiskSpace on event end
2024-05-12 08:57:50 -04:00
7471994afa
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-05-12 07:36:39 -04:00
3a8f0220a3
Fix eslint
2024-05-12 07:36:32 -04:00
db5a66b08b
Merge pull request #3988 from IgorA100/patch-81
...
Fix: CSS file loading order (functions.php)
2024-05-12 07:29:51 -04:00
cd3e89d175
Merge pull request #3990 from IgorA100/patch-82
...
Added translation "ConfirmUnarchiveEvents" (ru_ru.php)
2024-05-12 07:23:20 -04:00
Isaac Connor
Isaac Connor
IgorA100
Aaron Kling