Commit Graph

23930 Commits

Author SHA1 Message Date
IgorA100
4e7d774667 Added support for GridStack & PanZoom on Montage page (Monitor.php) 2024-05-07 19:31:25 +03:00
IgorA100
c0e60faca7 Added support for GridStack & PanZoom on Montage page (functions.php) 2024-05-07 19:01:29 +03:00
IgorA100
30e5bc1356 Add files via upload 2024-05-07 18:53:52 +03:00
IgorA100
48facd3e64 Update jquery.panzoom.js 2024-05-07 18:53:28 +03:00
IgorA100
5324b11636 Create jquery.panzoom.js 2024-05-07 18:53:09 +03:00
IgorA100
8c1efdaeb7 Add files via upload 2024-05-07 18:51:15 +03:00
IgorA100
d68f83e085 Add files via upload 2024-05-07 18:49:30 +03:00
IgorA100
cbb0ef2983 Update gridstack.scss 2024-05-07 18:48:54 +03:00
IgorA100
cdabdc1c0c Create gridstack.scss 2024-05-07 18:48:29 +03:00
IgorA100
22b67fcfb7 Update version 2024-05-07 18:46:44 +03:00
IgorA100
9db11311c3 Create version 2024-05-07 18:46:15 +03:00
IgorA100
1ad1b28f31 Delete web/skins/classic/assets 2024-05-07 18:40:44 +03:00
IgorA100
9530905d61 Create assets 2024-05-07 18:38:12 +03:00
IgorA100
f36ea98b41 Removed redundant style montage.css 2024-05-07 18:34:46 +03:00
IgorA100
4c8a263d54 Feat: Change grid layout on Montage page (montage.css)
Added styles for GridStack & other adaptations
2024-05-07 18:28:51 +03:00
IgorA100
62fe8c3d5e Feat: Change grid layout on Montage page (montage.php)
No longer used "widthControl", "heightControl" & "scaleControl"
Added option "monitorStatusPositonControl"
2024-05-07 18:14:55 +03:00
IgorA100
1c01198606 Merge branch 'ZoneMinder:master' into patch-73 2024-05-07 18:04:52 +03:00
Isaac Connor
37c0320971 Merge pull request #3984 from IgorA100/patch-77
Added dimensions .material-icons.md-ХХ in skin.css
2024-05-07 09:52:28 -04:00
IgorA100
03211ff4b7 Added dimensions .material-icons.md-ХХ in skin.css
From "md-18" to "md-40" in 2px increments
2024-05-07 16:04:33 +03:00
Isaac Connor
f1f3b21731 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-05-06 09:46:35 -04:00
Isaac Connor
b7bf02fce0 Add dependencies for ubuntu noble 2024-05-06 09:46:28 -04:00
Isaac Connor
6cd6e0ebb2 Merge pull request #3980 from Simpler1/master
feat(tags): Two buttons to tag and play next/prev
2024-04-30 13:51:59 -04:00
Simpler1
eefb169ba3 feat(tags): Two buttons to tag and play next/prev 2024-04-30 13:17:00 -04:00
Isaac Connor
5047a18d4f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-04-30 08:57:51 -04:00
Isaac Connor
36ab6380cb Include backtrace when complaining about lack of term in FilterTerm 2024-04-30 08:57:09 -04:00
Isaac Connor
4a38036255 Handle failure to open serial port better. Log error and don't crash. 2024-04-30 07:02:56 -04:00
Isaac Connor
f5333d2cfd Fix redirect from controlcap to options=>control 2024-04-30 06:52:40 -04:00
Isaac Connor
6216fdec36 Merge pull request #3977 from IgorA100/patch-75
Fix: css position of enlarged thumbs from event list on live view page
2024-04-27 10:48:32 -04:00
IgorA100
7ff6c20797 Fix: css position of enlarged thumbs from event list on live view page 2024-04-27 17:13:47 +03:00
Isaac Connor
bf14b5f2a7 ENsure that dts increases. Not enough to just == last_dts 2024-04-27 10:07:14 -04:00
Isaac Connor
287a82efe5 Merge pull request #3975 from IgorA100/patch-74
Fix: css style top border of header table on Events page
2024-04-27 09:12:04 -04:00
IgorA100
c30ef9c137 Fix: css style top border of header table on Events page 2024-04-27 14:37:56 +03:00
Isaac Connor
23f5e02273 Also check for Snapshots_Events in case both exist. 2024-04-25 09:46:57 -04:00
IgorA100
4fb4427c5c Fix: style for Montage page for dark theme
Preparing to correctly change height, width & scale of frame
2024-04-17 18:48:05 +03:00
IgorA100
7d6947151c Fix: style for Montage page
Preparing to correctly change height, width & scale of frame
2024-04-17 18:45:08 +03:00
Isaac Connor
b800a914fc Re-enable the delete button when showing the modal. If you delete and event, we disable the button to prevent double click but never re-enable it. 2024-04-17 09:36:49 -04:00
Isaac Connor
a23af287ab Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-04-17 08:54:14 -04:00
Isaac Connor
e7f1414c2c Fix spacing on delete button because it's a btn-danger instead of btn-normal 2024-04-17 08:54:07 -04:00
Isaac Connor
c688d92a0a Merge pull request #3967 from IgorA100/patch-72
Fix: Text color when hovering over select.chosen for light theme
2024-04-15 10:32:11 -04:00
IgorA100
0b028b443c Fix: Text color when hovering over select.chosen for light theme
Bootstrap uses the "inherit" color, but our text color for "#header" is white.
Overridden color to standard dark bootstrap that is used on page
2024-04-15 17:09:06 +03:00
Isaac Connor
178eacc06b Use Term instead of exit when q is hit so that we clean up the pid file 2024-04-12 14:07:20 -04:00
Isaac Connor
34118fcca2 Merge pull request #3949 from IgorA100/patch-64
Feat: Added the ability to zoom in/out image of each monitor separately on the "Montage" page
2024-04-12 12:57:47 -04:00
Isaac Connor
9ee018f523 Merge pull request #3965 from IgorA100/patch-71
Feat: Single style Options page for Options->Control
2024-04-12 12:51:14 -04:00
IgorA100
0b602ba567 Feat: Single style Options page for Options->Control
Now "include", not "redirect"
2024-04-12 17:14:57 +03:00
IgorA100
be424afaed Changed variable names because... is now loaded along with the main JS
Removed duplicate function "AddNewControl"
ToDo: Revise the code and move it to "options.js"
2024-04-12 17:08:47 +03:00
IgorA100
9c1265fa58 Fix css: Removed margin-bottom for buttons in #contentButtons 2024-04-12 16:56:49 +03:00
IgorA100
ea7eee6a8a Moved style from controlcap.css with change & corrected height block buttons for calculation 2024-04-12 16:53:59 +03:00
IgorA100
9d5f11dab2 Moved web/skins/classic/views/controlcaps.php to _options_controlcaps.php
With change
2024-04-12 16:47:15 +03:00
IgorA100
d668e6df56 Feat: Options->Control in a separate file
Unified Options style for Control tab
2024-04-12 16:44:45 +03:00
Isaac Connor
924aa9a84e Merge pull request #3961 from Simpler1/patch-1
Fix(filter): Set tags operator to = instead of LIKE
2024-04-10 18:22:05 -04:00