Isaac Connor
|
db80135997
|
Merge pull request #4075 from IgorA100/patch-147
Fix: PTZ control error on Watch page
|
2024-06-11 17:15:27 -04:00 |
|
IgorA100
|
fe9cc6d2a7
|
Don't change skin.js now, it will cause problems in other places
Additional research is required in a quiet environment.
|
2024-06-12 00:14:44 +03:00 |
|
IgorA100
|
a4443bb0a7
|
Update watch.js
|
2024-06-11 23:17:01 +03:00 |
|
IgorA100
|
073bbfc316
|
dataOnClick is called with a delay, because DOM change occurs (watch.js)
|
2024-06-11 23:06:59 +03:00 |
|
IgorA100
|
02a66983a5
|
Merge branch 'master' into patch-147
|
2024-06-11 22:58:32 +03:00 |
|
IgorA100
|
6308ceaf0c
|
Update watch.js
|
2024-06-11 22:48:02 +03:00 |
|
IgorA100
|
e874fd9c1f
|
Chore: code optimization (watch.js)
|
2024-06-11 22:33:20 +03:00 |
|
IgorA100
|
5e3bfbb392
|
Call dataOnClick() when switching to new next camera (watch.js)
Necessary because we change the DOM
|
2024-06-11 21:54:01 +03:00 |
|
IgorA100
|
add8eb4be3
|
Temporarily added dataOnClick() when initializing the page (watch.js)
|
2024-06-11 21:18:47 +03:00 |
|
Isaac Connor
|
6bf2c2653f
|
Merge pull request #4074 from IgorA100/patch-146
currentMonitor variable is now global for the Watch page
|
2024-06-11 14:03:02 -04:00 |
|
Isaac Connor
|
e85078ca2d
|
Handle when ptzToggle does not exist because OPT_CONTROL is off
|
2024-06-11 14:00:01 -04:00 |
|
Isaac Connor
|
8fe2da13fb
|
Fix use of validFloat which doesn't exist
|
2024-06-11 13:59:46 -04:00 |
|
IgorA100
|
f40cf5866e
|
Fix: addEventListener used after page load (skin.js)
This will be more correct!
This solves the problem https://forums.zoneminder.com/viewtopic.php?p=134573#p134573
I hope no other problems arise in connection with the code transfer.
|
2024-06-11 20:31:36 +03:00 |
|
IgorA100
|
abc72ff7dc
|
Fix: Include the file "includes/control_functions.php" only once (watch.php)
|
2024-06-11 19:50:32 +03:00 |
|
IgorA100
|
25b6fa8488
|
Fix: Limit scope for "handleClick" (watch.js)
|
2024-06-11 19:21:20 +03:00 |
|
IgorA100
|
68cbfe0160
|
currentMonitor variable is now global for the Watch page (watch.js)
|
2024-06-11 11:43:58 +03:00 |
|
Isaac Connor
|
f89017bd73
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2024-06-10 19:11:09 -04:00 |
|
Isaac Connor
|
f90150cf11
|
When dts==last_dts, don't log it as an error. It is too common. Just add duration and move on.
|
2024-06-10 19:11:03 -04:00 |
|
Isaac Connor
|
3ba996d13e
|
Merge pull request #4073 from IgorA100/patch-145
Fix: Unified style for Buttons=disabled
|
2024-06-10 14:14:16 -04:00 |
|
IgorA100
|
ddb82112ee
|
Fix: Unified style for Buttons=disabled (light theme skin.css)
|
2024-06-10 11:52:14 +03:00 |
|
IgorA100
|
2c583a386e
|
Fix: Unified style for Buttons=disabled (dark theme skin.css)
|
2024-06-10 11:45:44 +03:00 |
|
Isaac Connor
|
2734827d21
|
validHtmlStr isn't strong enought o prevent injection. Use validFloat on maxfps.
|
2024-06-09 10:26:52 -04:00 |
|
Isaac Connor
|
e5367621cf
|
Use disabled instead of hiding/unhiding the ptz toggle. Fix passing monitorStream instead of currentMonitor to applyMonitorControllable
|
2024-06-09 10:26:18 -04:00 |
|
Isaac Connor
|
538cfacac9
|
Merge pull request #4062 from IgorA100/patch-135
When viewing in a cycle, move to the next stream without reloading Watch page
|
2024-06-07 15:54:13 -04:00 |
|
IgorA100
|
da8882b67f
|
Chore: Code optimization (watch.js)
|
2024-06-07 22:08:25 +03:00 |
|
IgorA100
|
cbf3812a30
|
After pressing Play, do not reset the time countdown if pause was enabled before (watch.js)
|
2024-06-07 21:56:02 +03:00 |
|
IgorA100
|
05e9363251
|
Pressing any DVR control button will stop cycle. (watch.js)
|
2024-06-07 21:46:39 +03:00 |
|
Isaac Connor
|
44823b2c65
|
Start playback at the beginning of the time segment, not the middle
|
2024-06-07 12:42:51 -04:00 |
|
Isaac Connor
|
959d58ce43
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2024-06-07 12:11:00 -04:00 |
|
Isaac Connor
|
6e5f53fd27
|
Use last duration instead of 1 when adjusting dts when non-monotonic. Some googling indicates this might be a better approach. What I am seeing with a tapo C520WS agrees.
|
2024-06-07 12:10:51 -04:00 |
|
Isaac Connor
|
d29a60a6b3
|
Merge pull request #4065 from IgorA100/patch-138
Fix: in function "scaleToFit" do not take padding into account if the width is enough (skin.js)
|
2024-06-07 11:57:41 -04:00 |
|
Isaac Connor
|
f4d69d3ebb
|
Merge pull request #4071 from IgorA100/patch-143
Added position definition and background color for ".monitorStatus" (CSS)
|
2024-06-07 11:56:55 -04:00 |
|
Isaac Connor
|
991489a391
|
Use const instead of var for some variables
|
2024-06-06 18:11:22 -04:00 |
|
Isaac Connor
|
22f3910953
|
Use statusRefreshTimeout instead of delay on status requests. If new auth info is found in statusresponse, use it.
|
2024-06-06 18:10:53 -04:00 |
|
Isaac Connor
|
51ad77c6b9
|
Always add auth_relay info to status requests
|
2024-06-06 18:10:23 -04:00 |
|
Isaac Connor
|
ad6a8c376b
|
Add new auth_hash to any status request. Fixed auth timeout when using rtsp2web or janus
|
2024-06-06 17:51:05 -04:00 |
|
IgorA100
|
95c4b01791
|
Added background color definition for ".monitorStatus" Dark theme (skin.css)
|
2024-06-06 18:34:32 +03:00 |
|
IgorA100
|
b927c5d0b2
|
Added position definition and background color for ".monitorStatus" (skin.css)
|
2024-06-06 18:31:39 +03:00 |
|
IgorA100
|
08fd4c0a82
|
Code Cleanup (skin.js)
|
2024-06-06 18:10:07 +03:00 |
|
Isaac Connor
|
24caeec470
|
Merge pull request #4067 from IgorA100/patch-140
Fix: Avoid error if object was not initialized & do nothing if you click on the image without Ctrl or Shift (Panzoom.js)
|
2024-06-06 09:54:13 -04:00 |
|
IgorA100
|
c3d4328adb
|
Fix: Avoid error if object was not initialized & more (panzoom.js)
- Do nothing if you click on the image without Ctrl or Shift
|
2024-06-05 21:12:14 +03:00 |
|
IgorA100
|
39e9697873
|
Do not change the "stopBtn" button when analyzing "monitorStream.status.delayed" (watch.js)
Otherwise, the "stopBtn" button will not be active when viewing.
I still don’t understand why this was necessary?
|
2024-06-05 20:55:35 +03:00 |
|
IgorA100
|
68145fb358
|
Generating a new URL for the "All events" button (watch.php)
|
2024-06-05 20:44:10 +03:00 |
|
IgorA100
|
41403d5a9c
|
Generating a new URL for the "All events" button (watch.js.php)
|
2024-06-05 20:42:35 +03:00 |
|
IgorA100
|
9bc1c10f63
|
Generating a new URL for the "All events" button (watch.js)
|
2024-06-05 20:41:27 +03:00 |
|
IgorA100
|
d2e97d2324
|
Updated address bar URL when switching to next monitor (watch.js)
|
2024-06-05 18:40:19 +03:00 |
|
IgorA100
|
770b3c4054
|
Fix: The "filterQuery" variable needs to be changed when moving to the next monitor. (watch.js)
|
2024-06-05 17:52:15 +03:00 |
|
IgorA100
|
68c7f16d63
|
Lost line "var element = document.getElementById(element_id);" (watch.js)
|
2024-06-05 17:09:56 +03:00 |
|
IgorA100
|
14604520bc
|
Merge branch 'ZoneMinder:master' into patch-135
|
2024-06-05 17:07:51 +03:00 |
|
Isaac Connor
|
deca02c3e9
|
Merge pull request #4066 from IgorA100/patch-139
After the monitor name, display its ID (Monitor.php)
|
2024-06-05 09:08:33 -04:00 |
|