Commit Graph

24296 Commits

Author SHA1 Message Date
Isaac Connor
8a496f5d17 Remove extra comma that now breaks php 2024-06-04 09:39:22 -04:00
Isaac Connor
95feb4d127 FIx missing { 2024-06-03 12:48:14 -04:00
Isaac Connor
a5a015d502 Fix TimerHideShow not being defined. 2024-06-03 09:14:54 -04:00
Isaac Connor
6e9c69300b Handle no rows return from Server_Stats 2024-06-02 16:04:15 -04:00
Isaac Connor
3c389e7f7f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-06-02 12:51:52 -04:00
Isaac Connor
7f9f4280eb Don't run tests since we didn't build them 2024-06-02 12:51:44 -04:00
Isaac Connor
3e12e32d06 Don't run tests since we didn't build them 2024-06-02 12:51:24 -04:00
Isaac Connor
877ce522ef Bullseye doesn't have a recent enough version of catch2 2024-06-02 12:50:02 -04:00
Isaac Connor
e7eba3d33c Merge pull request #4058 from IgorA100/patch-132
Added Scales = Max 480, 640, 800, 1024, 1280, 1600 px & added settings Stream Quality on Watch, Event & Montage page
2024-06-02 12:39:58 -04:00
Isaac Connor
5cfa4465de Merge pull request #4063 from IgorA100/patch-136
Fix: For bind/unbind events use namespaced (PanZoom)
2024-06-02 12:39:10 -04:00
Isaac Connor
08f6458f5f Merge pull request #4064 from IgorA100/patch-137
Changed attr "title" for "#monitor" (Monitor.php)
2024-06-02 12:37:56 -04:00
IgorA100
eb1a38c74c Changed attr "title" for "#monitor" (Monitor.php)
Made in two lines and added capital letters.
2024-06-02 00:07:37 +03:00
IgorA100
4f9657c482 Fix: eslint (panzoom.js) 2024-06-01 23:37:37 +03:00
IgorA100
71a08c94dd Fix: For bind/unbind events use namespaced (panzoom.js)
- When disable, also perform unbind keyup, keydown
- Code optimization.
2024-06-01 23:32:53 +03:00
Isaac Connor
bf18a685da Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-05-31 14:53:50 -04:00
Isaac Connor
414b28d42a Update style of variable embeddeding in string. php complains now 2024-05-31 14:53:45 -04:00
Isaac Connor
3504b06c25 Add TP-Link to MacVendors 2024-05-31 14:53:23 -04:00
Isaac Connor
91668a457d Merge pull request #4061 from IgorA100/patch-134
Fix: Initial video load makes the UI jump around too much on Watch page
2024-05-31 14:50:24 -04:00
IgorA100
45dab6dc48 Update watch.js 2024-05-31 19:25:40 +03:00
IgorA100
4c6059fb23 Hide image when page starts opening (watch.php) 2024-05-31 19:22:00 +03:00
Isaac Connor
caa1106486 Merge pull request #4060 from IgorA100/patch-133
Delay monitors stopping for 15 seconds when hiding Montage, Watch, Zone, Zone edit page
2024-05-31 11:00:05 -04:00
IgorA100
4b5d468af3 Delay monitors stopping for 15 seconds when hiding page (zones.js) 2024-05-31 17:55:42 +03:00
IgorA100
f9a55201cd Delay monitors stopping for 15 seconds when hiding page (zone.js) 2024-05-31 17:53:18 +03:00
IgorA100
1d5f049df2 Delay monitors stopping for 15 seconds when hiding page (watch.js) 2024-05-31 17:42:12 +03:00
IgorA100
2123a565e2 Delay monitors stopping for 15 seconds when hiding page (montage.js) 2024-05-31 17:27:10 +03:00
IgorA100
e5e7cb470f Added $streamQuality processing (montage.php) 2024-05-31 15:36:23 +03:00
IgorA100
35ea667378 Added $streamQuality processing (montage.js) 2024-05-31 15:35:15 +03:00
IgorA100
802ffe12ce Merge branch 'ZoneMinder:master' into patch-132 2024-05-31 15:31:29 +03:00
IgorA100
5565b8cca1 Fix: variable declaration (event.js) 2024-05-31 14:53:55 +03:00
IgorA100
d5a8d931e6 Chore: eslint (watch.js) 2024-05-31 14:07:53 +03:00
IgorA100
c6c916d9ef Chore: eslint event.js 2024-05-31 14:01:07 +03:00
IgorA100
ac85492f1b $streamQuality applied to portrait mode (event.js) 2024-05-31 13:59:14 +03:00
IgorA100
fc127b7c47 $streamQuality applied to portrait mode (watch.js) 2024-05-31 13:55:59 +03:00
IgorA100
1751789fb9 Rename 'Max width 480px' to 'Max 480px' Etc. (config.php)
Because the image can be in either a landscape or a portrait, which means you need to control both the width and height
2024-05-31 13:32:35 +03:00
IgorA100
ee9206eff6 Added $streamQuality processing (event.php) 2024-05-31 01:18:54 +03:00
IgorA100
fb866a1edc Added $streamQuality processing (watch.php) 2024-05-31 01:15:39 +03:00
IgorA100
282f11a894 Chore: eslint (event.js) 2024-05-31 01:11:55 +03:00
IgorA100
d4a963b7cf Chore: eslint (watch.js) 2024-05-31 01:05:35 +03:00
IgorA100
7d86df0c04 Chore: eslint MonitorStream.js 2024-05-31 01:04:03 +03:00
IgorA100
0be93427c8 Added $streamQuality processing (watch.js) 2024-05-31 00:55:34 +03:00
IgorA100
5706bf2ade Added $streamQuality processing (MonitorStream.js) 2024-05-31 00:51:49 +03:00
IgorA100
68e00d7d96 Added $streamQuality processing & other (event.js)
Added Scale display
Added $streamQuality processing
Added new options for selecting maximum width in $scales
Minor fixes related to Scale
Commented out unused code from the old version of Pan Zoom. In the future it should probably be completely removed.
2024-05-31 00:16:28 +03:00
IgorA100
18628dbc44 Added setting stream quality (config.php)
Measured in %
Used to change the Scale up (increase quality) or down (reduce network traffic)
2024-05-30 23:26:10 +03:00
IgorA100
7ab8bce06b Merge branch 'ZoneMinder:master' into patch-132 2024-05-30 23:19:29 +03:00
Isaac Connor
3c8ebc8599 Don't show skin tab if both skin and css are forced 2024-05-30 13:44:47 -04:00
Isaac Connor
663665ccfa Add possible config override of skin and css, forcing their use 2024-05-30 13:44:29 -04:00
Isaac Connor
fed15110fc Allow config specifying favicon 2024-05-30 13:44:09 -04:00
Isaac Connor
599361dc8b bump version to 1.37.61 to signify fixes to vulernabilies 1.37.61 2024-05-30 12:24:22 -04:00
Isaac Connor
94aab42356 Limit scale to 1.1 to prevent requesting images larger than 100% 2024-05-30 12:23:15 -04:00
Isaac Connor
f81d6fb823 Sanitise filter[Id] 2024-05-30 12:12:02 -04:00