mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-30 19:52:31 -04:00
Code Issues Packages Projects Releases Wiki Activity
23,949 Commits 80 Branches 104 Tags
05bdfdbe9afd0871091b03a56eece3caaacc22b2
Commit Graph

10525 Commits

Author SHA1 Message Date
Isaac Connor
2a06e0faf2 Make view does not exist an error instead of fatal 2024-05-08 14:28:40 -04:00
Isaac Connor
e599d1f032 Fix eslint 2024-05-08 13:46:53 -04:00
Isaac Connor
e282487ee4 Merge pull request #3969 from IgorA100/patch-73 
Global change grid layout on Montage page
 2024-05-08 12:54:36 -04:00
IgorA100
15e040ae07 Fix: Not used $j('#scale').val() (montage.js) 
Always use "0"
 2024-05-08 18:58:16 +03:00
IgorA100
adaa0eac0d Fix: panZoom disable <1 (montage.js) 2024-05-08 13:10:00 +03:00
IgorA100
1cf1d85e37 Fix: Lost " } else {" (montage.js) 2024-05-08 09:54:44 +03:00
IgorA100
0237b6a47a Chore: clean code & fix hide button monitor edit in edit mode (montage.js) 2024-05-08 00:59:05 +03:00
IgorA100
da725013a0 overflow: hidden auto; skin.css 2024-05-08 00:44:36 +03:00
IgorA100
8a156eb24c Added support for GridStack & PanZoom on Montage page (montage.js) 2024-05-08 00:18:18 +03:00
IgorA100
0700485129 Removed unnecessary style for "body.sticky #content" montage.css. 2024-05-07 23:37:33 +03:00
IgorA100
1e4f2f507e Fix: overflow for ".content" skin.css 
Required for fullscreen mode
I hope nothing is broken...
 2024-05-07 23:25:59 +03:00
IgorA100
a809a92d1f Chore: eslint MonitorStream.js 2024-05-07 20:50:34 +03:00
IgorA100
6d4e6fd401 Added the ability to disable image resizing when changing Scale (MonitorStream.js) 
Required when using GridStack & PanZoom on Montage page
 2024-05-07 20:23:00 +03:00
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
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
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
f5333d2cfd Fix redirect from controlcap to options=>control 2024-04-30 06:52:40 -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
IgorA100
c30ef9c137 Fix: css style top border of header table on Events page 2024-04-27 14:37:56 +03: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
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
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
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