Isaac Connor
|
7471994afa
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2024-05-12 07:36:39 -04:00 |
|
Isaac Connor
|
3a8f0220a3
|
Fix eslint
|
2024-05-12 07:36:32 -04:00 |
Isaac Connor
|
db5a66b08b
|
Merge pull request #3988 from IgorA100/patch-81
Fix: CSS file loading order (functions.php)
|
2024-05-12 07:29:51 -04:00 |
|
Isaac Connor
|
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
|
8a429959b3
|
Merge pull request #3986 from IgorA100/patch-79
Feat: Used PanZoom on Watch page
|
2024-05-12 07:17:59 -04:00 |
IgorA100
|
9095c9d3af
|
Added translation "ConfirmUnarchiveEvents" (ru_ru.php)
|
2024-05-12 00:51:15 +03:00 |
|
Isaac Connor
|
a64115fe21
|
Add popup with confirm and chunked unarchiving.
|
2024-05-10 13:03:08 -04:00 |
|
Isaac Connor
|
1bc2510318
|
WHen deleting event, send sigquit to zms because if running under fpm, it won't get sigpipe.
|
2024-05-09 18:36:18 -04:00 |
|
IgorA100
|
5075c4c434
|
Chore: remove space (watch.js)
|
2024-05-09 23:07:56 +03:00 |
|
IgorA100
|
98abab4c24
|
Eslint & add function "streamStart()" watch.js
Because code was hard to read, so I moved part of the code from “initPage()” to the “streamStart()” function
|
2024-05-09 22:31:21 +03:00 |
|
IgorA100
|
75a7aa11ac
|
Chore: eslint (watch.js)
|
2024-05-09 21:53:50 +03:00 |
|
IgorA100
|
76eee7b880
|
Fix: eslint (montage.js)
|
2024-05-09 21:05:13 +03:00 |
|
IgorA100
|
bce04eea95
|
Fix: eslint (montage.js)
|
2024-05-09 20:56:37 +03:00 |
|
IgorA100
|
d72303de48
|
Fix: eslint (MonitorStream.js)
|
2024-05-09 20:51:46 +03:00 |
|
IgorA100
|
65a241fd6c
|
Changed "setScale" function call to support PanZoom on Montage & Watch page (montage.js)
|
2024-05-09 20:43:02 +03:00 |
|
IgorA100
|
418a18d59d
|
Changed the "setScale" function to support PanZoom on Montage & Watch page (MonitorStream.js)
\views\js\montage.js is affected
|
2024-05-09 20:14:16 +03:00 |
|
IgorA100
|
707d77944e
|
Added support PanZoom for Watch page (functions.php)
|
2024-05-09 20:07:38 +03:00 |
|
IgorA100
|
501e12e006
|
Removed <select> for #widthControl, #heightControl, #scaleControl (watch.php)
No longer used.
|
2024-05-09 20:02:18 +03:00 |
|
IgorA100
|
83c7112259
|
Added support for PanZoom (watch.js)
|
2024-05-09 19:55:56 +03:00 |
|
IgorA100
|
fdaec98b39
|
Added styles for PanZoom (watch.css)
|
2024-05-09 19:35:55 +03:00 |
|
IgorA100
|
3b373bd8e0
|
Merge branch 'ZoneMinder:master' into patch-79
|
2024-05-09 19:32:46 +03:00 |
|
IgorA100
|
2a2d200cf3
|
Fix: CSS file loading order (functions.php)
Load third-party files first
|
2024-05-09 00:36:40 +03:00 |
|
Isaac Connor
|
4b596b70f3
|
Fix eslint
|
2024-05-08 16:22:36 -04:00 |
|
Isaac Connor
|
5081fba0cf
|
Merge pull request #3987 from IgorA100/patch-80
Fix: Monitor status color bars in Inside position for light theme (skin.css)
|
2024-05-08 14:29:32 -04:00 |
|
Isaac Connor
|
2a06e0faf2
|
Make view does not exist an error instead of fatal
|
2024-05-08 14:28:40 -04:00 |
|
IgorA100
|
c93a103882
|
Chore: Add space (skin.css)
|
2024-05-08 21:27:02 +03:00 |
|
IgorA100
|
20932331b3
|
Fix: Monitor status color bars in Inside position for light theme (skin.css)
|
2024-05-08 21:25:03 +03: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
|
e5b51904ad
|
ID & class change from "Monitor" to "monitor" (watch.php)
|
2024-05-08 14:23:25 +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 |