Isaac Connor
|
10d70022fe
|
Handle when controls is not defined, like in WebSite monitors
|
2023-08-09 19:01:55 -04:00 |
Isaac Connor
|
7aa229658b
|
Slight cleanup of changeScale, converting it to float instead of string.
|
2023-08-09 19:01:30 -04:00 |
Isaac Connor
|
889c809e0b
|
Add RTSP2WebEnabled to defaults
|
2023-08-09 18:55:36 -04:00 |
Isaac Connor
|
7750eef533
|
Handle non-existing elements when monitor type is Website or Local.
|
2023-08-09 16:00:08 -04:00 |
Isaac Connor
|
07ff3da212
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-08-09 10:25:40 -04:00 |
Isaac Connor
|
2576c5dfc5
|
Reset CaptureBandwidth to 0 on startup and after failed connection
|
2023-08-09 10:25:31 -04:00 |
baudneo
|
95655c9043
|
Allow RTSPtoWeb streams for zone editing (#3750)
* Allow RTSPtoWeb streams for zone editing
* Fix quoting
|
2023-08-08 22:03:13 -05:00 |
Isaac Connor
|
97bb130cd1
|
Limit effect of styling on label elements
|
2023-08-08 19:18:25 -04:00 |
Isaac Connor
|
6381601ba2
|
Fix type for DLink
|
2023-08-08 18:35:07 -04:00 |
Isaac Connor
|
00bd2259a3
|
Midly improve dlink support. Fix for probing an undefined array
|
2023-08-08 18:34:44 -04:00 |
Isaac Connor
|
0afa383c38
|
Info to Debug for login.
|
2023-08-08 14:24:36 -04:00 |
Isaac Connor
|
769f6ce372
|
Only set channel from the default (1) if ControlDevice is populated
|
2023-08-08 13:28:18 -04:00 |
Isaac Connor
|
1e200abf16
|
Remove support for browsers not supporting TextDecoder to fix eslint
|
2023-08-08 13:01:42 -04:00 |
Isaac Connor
|
b97c189941
|
Include algorithm. Trying to fix build on centos7
|
2023-08-08 12:58:49 -04:00 |
Isaac Connor
|
fd391a4b68
|
Merge whoosinn:ZoneMinder
|
2023-08-08 10:11:08 -04:00 |
Isaac Connor
|
11f84fcb4e
|
Fix user->Controls to user->Control. Fixes broken js on monitor view
|
2023-08-08 10:10:49 -04:00 |
Isaac Connor
|
042edd25e5
|
Add classes to tr so they can be styled
|
2023-08-08 09:54:47 -04:00 |
Isaac Connor
|
25f175e98f
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-08-02 18:08:49 -04:00 |
Isaac Connor
|
2f552bdcce
|
User monitor->canView instead of user->unviewableMonitorIds for performance
|
2023-08-02 18:08:32 -04:00 |
Isaac Connor
|
8f9a4dc825
|
Use User object to get Monitor_Permission and Group_Permissions hoping it will be cached there.
|
2023-08-02 18:07:35 -04:00 |
Isaac Connor
|
5233c402d3
|
Use User object to get Monitor_Permission and Group_Permissions hoping it will be cached there.
|
2023-08-02 18:07:28 -04:00 |
Isaac Connor
|
a4c14eb890
|
Don't crash when not able to connect to monitor
|
2023-08-02 15:11:13 -04:00 |
Isaac Connor
|
c510745317
|
Allow specifying width and height so that we can scale to alower res
|
2023-08-02 13:56:06 -04:00 |
Isaac Connor
|
f39b3f0583
|
Reduce debug levels. Pass along Width and Height when instantiating Image from AVFrame so that it can scale to a lower res.
|
2023-08-02 13:56:06 -04:00 |
Isaac Connor
|
4f08ad59cc
|
Remove redundant debugging of video frames including treating one as audio
|
2023-08-02 13:56:06 -04:00 |
Isaac Connor
|
672ba114f4
|
Fix reversed defaults for RTSP2Web options
|
2023-08-02 13:48:15 -04:00 |
Isaac Connor
|
e86610c38c
|
Bump version for RTSP2Web DB updates
|
2023-08-02 13:41:57 -04:00 |
Isaac Connor
|
206be0ea96
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-08-02 13:36:33 -04:00 |
Isaac Connor
|
b48702c96c
|
Fix lack of ZM on Warning
|
2023-08-02 13:36:26 -04:00 |
Isaac Connor
|
1628c4fa6b
|
Handle term->val not being defined, and fix the code to strip quotes from the value.
|
2023-08-02 13:28:44 -04:00 |
Isaac Connor
|
f1b3bc08c1
|
Use opendir instead of glob when copying files. For performance reasons.
|
2023-08-02 13:27:45 -04:00 |
Isaac Connor
|
54000bc204
|
Reduce redundant debugging
|
2023-08-02 13:05:57 -04:00 |
Jonathan Bennett
|
80c145dca4
|
Add support for HTTPS connections to RTSP2Web
|
2023-07-31 00:16:51 -05:00 |
Jonathan Bennett
|
af42398070
|
Fix ESLint issues in RTSP2Web work
|
2023-07-30 16:54:22 -05:00 |
Jonathan Bennett
|
d7e419726b
|
Update .eslintignore -- add hls.js
|
2023-07-30 15:55:07 -05:00 |
Jonathan Bennett
|
5c9588c012
|
Adds RTSP2Web support for live view
|
2023-07-29 23:46:31 -05:00 |
Isaac Connor
|
9295c390ca
|
re-parse Options into opts so that they are available to open_codec
|
2023-07-28 17:39:08 -04:00 |
Isaac Connor
|
d56beead81
|
Remove duplicated and old styles from dark montage that are in base. Removes width 99% from montage content which is no longer needed
|
2023-07-28 14:03:20 -04:00 |
Isaac Connor
|
20bbd9f3a6
|
If controls are on but not permitted the controls will not be defined
|
2023-07-28 12:56:51 -04:00 |
Isaac Connor
|
bd71b35403
|
Handle RateControl being undef
|
2023-07-27 11:47:02 -04:00 |
Isaac Connor
|
3301d3042b
|
Only show map if the event has lat&long
|
2023-07-27 10:30:37 -04:00 |
Isaac Connor
|
7a35b337d2
|
add another Hikvision
|
2023-07-25 20:02:52 -04:00 |
Isaac Connor
|
a570bac807
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-07-25 18:14:37 -04:00 |
Isaac Connor
|
5ab303526c
|
Add some more HIkvision
|
2023-07-25 18:14:25 -04:00 |
Isaac Connor
|
4b20109b69
|
Use the same open semantics regardless of blocking or non so that we always have an fd to lock. Fixes logging of unable to lock jpeg in streaming with buffering
|
2023-07-25 16:35:28 -04:00 |
Isaac Connor
|
03155da5b6
|
Use the full integer value instead of the first char of mi. Fixes failure to get status on janus viewing pages
|
2023-07-25 15:18:35 -04:00 |
Isaac Connor
|
b3fb68b293
|
Fix test for undef
|
2023-07-25 13:24:57 -04:00 |
Isaac Connor
|
c54a20ba70
|
Fix spacing, tag debug with ONVIF
|
2023-07-25 13:24:37 -04:00 |
Isaac Connor
|
30c8052e60
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-07-25 12:32:40 -04:00 |
Isaac Connor
|
bd3aac1cf6
|
Fixup curl() and Axis probing
|
2023-07-25 12:32:35 -04:00 |