Commit Graph

22632 Commits (ac86c31d01e56d746e2884e31eca54d5fc2a9877)

Author SHA1 Message Date
Alejandro Criado-Pérez ac86c31d01
cmakecacheimport parameters 2023-08-19 12:41:07 +02:00
Alejandro Criado-Pérez 2e21c747d4
cmake corrections 2023-08-19 12:39:32 +02:00
Isaac Connor aaff61f72f
Merge pull request #3751 from criadoperez/fix/criadoperez3
Typos on multiple files
2023-08-13 10:10:31 -04:00
Alejandro Criado-Pérez 543683aa4c
Corrections on cpp and h files 2023-08-13 01:27:19 +02:00
Alejandro Criado-Pérez a5d83e61b4
Corrections on rst files 2023-08-13 01:20:29 +02:00
Isaac Connor d21d53eeb9 Remove reorder_queue_size when re-parsing opts to avoid warnings 2023-08-12 14:50:30 -04:00
Isaac Connor 7122514a69 Add CURLOPT_SSL_VERIFYHOST an PEER so that SSL works.. not sure why SSL doesn't work. Add more debug and fix logic inversion on status result. 2023-08-11 17:48:34 -04:00
Isaac Connor c5eec8fa12 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-08-10 11:03:30 -04:00
Isaac Connor 8672e6d64e Fix missing dropdown-item class on warning or danger storage areas. Increase warning to 95% instead of 90% 2023-08-10 11:03:22 -04:00
Isaac Connor 9d5a1ec9d5 If scale is invalid, reset to auto so we don't constantly log the error. 2023-08-10 10:58:19 -04:00
Isaac Connor b2993c3ec0 Use some const instead of var in changeScale 2023-08-09 19:29:19 -04:00
Isaac Connor b8982dce53 When hiding/unhiding the monitor filter bar, when done call changeScale to readjust the size of teh video 2023-08-09 19:28:59 -04:00
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