Isaac Connor
599361dc8b
bump version to 1.37.61 to signify fixes to vulernabilies
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
Isaac Connor
b51c5df0cb
Sanitise displayinterval,speed and scale parameters. Fixes GHSA-pjjm-3qxp-6hj8
2024-05-30 12:11:45 -04:00
Isaac Connor
4602cd0470
Sanitise filter[Id] when parsing filter. Fixes GHSA-6rrw-66rf-6g5f
2024-05-30 12:10:45 -04:00
Isaac Connor
1fdfcf3cdd
Limit scale to 16x mainly to put an upper bound on the amount of ram we might use.
2024-05-30 12:10:10 -04:00
Isaac Connor
0fa220513d
Merge pull request #4056 from IgorA100/patch-130
...
Added starting/stopping monitor when show/hide Zones page
2024-05-29 17:27:50 -04:00
Isaac Connor
c812d9ea9a
Merge pull request #4057 from IgorA100/patch-131
...
Added starting/stopping monitor when show/hide Zone edit page
2024-05-29 17:27:31 -04:00
Isaac Connor
e9ccaa8b0f
Merge pull request #4055 from IgorA100/patch-129
...
Added starting/stopping monitor when show/hide Watch page
2024-05-29 17:26:17 -04:00
IgorA100
9a1d7e7467
Added starting/stopping monitor when show/hide page (zone.js)
...
I also added the functions panZoomOut(el) and panZoomIn(el) to avoid errors in the browser console.
I don't think it's necessary to fully implement PanZoom on this page. At least for now...
2024-05-29 19:54:28 +03:00
IgorA100
40216116f3
Added starting/stopping monitor when show/hide page (zones.js)
...
I also added the functions panZoomOut(el) and panZoomIn(el) to avoid errors in the browser console.
I don't think it's necessary to fully implement PanZoom on this page. At least for now...
2024-05-29 19:47:31 +03:00
IgorA100
05ef42c521
Removed extra newline (watch.js)
2024-05-29 19:32:24 +03:00
IgorA100
8dddcc3dbe
Removed creating a new monitorStream (watch.js)
...
My holey head....
2024-05-29 19:30:04 +03:00
IgorA100
9e8d1f66fb
Added if (!monitorStream.started) (watch.js)
2024-05-29 19:25:52 +03:00
IgorA100
40bbc082da
Added starting/stopping monitor when show/hide page (watch.js)
2024-05-29 19:15:54 +03:00
Isaac Connor
662fc2baf2
Turn on use strict
2024-05-29 10:26:42 -04:00
Isaac Connor
4a0ea62fa6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-05-29 10:10:54 -04:00
Isaac Connor
878c8a7687
In kill, turn the url from a streaming url into a single so as to actually stop the stream.
2024-05-29 10:10:36 -04:00
Isaac Connor
c1ec7c9348
Merge pull request #4054 from IgorA100/patch-128
...
Start monitors when show page after hidden on Montage page
2024-05-29 10:09:21 -04:00
IgorA100
ca40a794d2
Added this.started = true/false when starting/stopping the monitor (MonitorStream.js)
2024-05-29 17:06:33 +03:00
IgorA100
3ece22446f
Start monitors when show page (montage.js)
2024-05-29 17:02:34 +03:00
Isaac Connor
384d215f8d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-05-29 09:11:16 -04:00
Isaac Connor
78ddde2ac6
Add spaces that are in the string
2024-05-29 09:11:04 -04:00
Isaac Connor
db45047a3f
Merge pull request #4053 from IgorA100/patch-127
...
Stop monitors when closing montage page
2024-05-29 09:04:58 -04:00
Isaac Connor
085791e3a8
Merge pull request #4052 from IgorA100/patch-126
...
Fix: PanZoom when exiting full screen mode montage page
2024-05-29 09:03:13 -04:00
IgorA100
0858d1c53b
Stop monitors when closing page (montage.js)
2024-05-29 14:37:22 +03:00
IgorA100
d2eb5237d3
Fix: PanZoom when exiting full screen mode (montage.js)
2024-05-29 13:43:26 +03:00
Isaac Connor
4717de17c9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-05-28 16:33:57 -04:00
Isaac Connor
4baa2c0554
Remove stills option and add 1/10 and 1/2 rate options
2024-05-28 16:32:06 -04:00
Isaac Connor
1979d6665e
Fix seeking by clicking on timeline when using video.js
2024-05-28 16:31:51 -04:00
Isaac Connor
189572c7bc
Merge pull request #4050 from IgorA100/patch-125
...
Undo changes #4051 ".chosen" (skin.css)
2024-05-28 12:22:49 -04:00
IgorA100
4b3379e83d
Undo changes #4051 ".chosen" (skin.css)
...
.chosen still needs to be hidden at the beginning of loading.
Affects some pages. For example Events page
A more in-depth analysis is required.
2024-05-28 19:20:56 +03:00
Isaac Connor
fd7f825c99
Merge pull request #4015 from IgorA100/patch-100
...
Chore: May not need to hide ".chosen" (skin.css)
2024-05-28 10:16:13 -04:00
Isaac Connor
70c6375782
Add 1/10 and 1/2 frame rates and remove stills option as it can be done with pause. Remove zoom info title as it is now in includes/Monitor.php
2024-05-28 10:11:49 -04:00
Isaac Connor
69d5855653
Add another decimal digit to fps displays
2024-05-28 10:11:02 -04:00
Isaac Connor
7543e513fa
Replace useless title on image stream with a useful one describing zoom controls.
2024-05-28 10:10:30 -04:00
Isaac Connor
3300d46f20
Actually strip newlines from response
2024-05-28 09:03:43 -04:00
IgorA100
930c7f057c
Merge branch 'ZoneMinder:master' into patch-100
2024-05-28 14:46:43 +03:00
Isaac Connor
970af4976a
Merge pull request #4048 from IgorA100/patch-124
...
Chore: Mark "const el" as unused (watch.js)
2024-05-28 07:38:44 -04:00
Isaac Connor
110deed20f
Merge pull request #4047 from IgorA100/patch-123
...
Fix: Scrollbar style applied for "html" (skin.css)
2024-05-28 07:38:10 -04:00
Isaac Connor
600d8ff1b3
Merge pull request #4046 from IgorA100/patch-122
...
Use "setMaxFPS(fps)" instead of "streamCommandstreamCommand({command:CMD_MAXFPS, maxfps: fps})" (montage.js)
2024-05-28 07:37:33 -04:00
IgorA100
d009b14fba
Chore: Mark "const el" as unused (watch.js)
2024-05-28 12:28:13 +03:00
IgorA100
6953dbd780
Fix: Scrollbar style applied for "html" (skin.css)
2024-05-28 11:55:46 +03:00
IgorA100
358a0d23ef
Replaced tabs with spaces (montage.js)
2024-05-28 00:55:55 +03:00
IgorA100
ab25a105da
Use "setMaxFPS(fps)" instead of "streamCommandstreamCommand({command: CMD_MAXFPS, maxfps: fps})" (montage.js)
2024-05-28 00:53:16 +03:00
Isaac Connor
faa3ed3aa7
Merge pull request #4042 from IgorA100/patch-119
...
Chore: Moved PanZoom functions to "web/js/panzoom.js"
2024-05-27 17:08:50 -04:00
Isaac Connor
e1a9a2c93b
Merge pull request #4044 from IgorA100/patch-120
...
Feat: Added Rate control on Montage page
2024-05-27 17:07:50 -04:00
Isaac Connor
65a5745b63
Merge pull request #4045 from IgorA100/patch-121
...
Fix: function "this.setMaxFPS" (MonitorStream.js)
2024-05-27 17:07:17 -04:00
IgorA100
f0b13f0c11
Fix: function "this.setMaxFPS" (MonitorStream.js)
...
The function didn't work!
The parameter "maxfps" was passed to the function, and "currentSpeed" was passed to "streamCommand" instead of "maxfps"
2024-05-27 22:58:41 +03:00
IgorA100
850ac711df
Removed extra semicolon (montage.js)
2024-05-27 22:48:42 +03:00
