Commit Graph

22807 Commits (e720b5f5b162c422d7d1fa775139684bde40441a)

Author SHA1 Message Date
Isaac Connor 9371c2775d Use canEdit and canDelete to allow users without canEditEvents to create filters that don't act on events, only list them. 2023-08-18 16:57:51 -04:00
Isaac Connor 94ea51489b Add canDelete and canEdit functions to Filter 2023-08-18 16:57:08 -04:00
Isaac Connor ea581e521f Add default value for order 2023-08-18 16:56:50 -04:00
Isaac Connor 61d0cec1fa Debug the result of the auth header split, not the same line over and over 2023-08-18 16:56:37 -04:00
Isaac Connor 084fc8b651 Put users table in an options div, which has overflow-y: auto applied to it. Move buttons to top so they don't scroll 2023-08-18 12:12:30 -04:00
Isaac Connor 8748d6a1cc Handle unset _SESSION['remoteAddr'] 2023-08-16 15:23:34 -04:00
Isaac Connor 91b4e299b9 Demote failed login to Warn instead of Error 2023-08-16 10:37:06 -04:00
Isaac Connor e163509d57 auto_reconnect id deprecated. 2023-08-16 09:53:07 -04:00
Isaac Connor bdc8452891 Add a button to toggle ptz controls. Put ptz controls into a right hand sidebar. 2023-08-15 17:58:55 -04:00
Isaac Connor 5b7defb57b Remove warnings about ControlDevice, because that is now channel. Detect duration not being in microseconds and adjust. 2023-08-15 14:02:12 -04:00
Isaac Connor d31f918abc Change the api for frameimage status request to split id into eid and fid instead of having id as an array. 2023-08-15 09:15:24 -04:00
Isaac Connor 9a229a78a5 Fix missing mac key on cameras array 2023-08-14 13:30:24 -04:00
Isaac Connor 9beacfa392 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-08-14 12:57:02 -04:00
Isaac Connor 9034bdffee Add checking of keyframeinterval to Ready() 2023-08-14 12:56:48 -04:00
Isaac Connor c2e00b8789
Merge pull request #3754 from joeknoll/master
Fix usage of unset variable
2023-08-13 21:16:52 -04:00
Joe 87f09d3b7e Fix usage of unset variable
If daemon or args are unset the preg_replace is never called which can
result in count not having a value when referenced in the if statement.
This generates a warning in error.log.
2023-08-13 17:56:55 -07:00
Isaac Connor 07e60d924d
Merge pull request #3752 from criadoperez/fix/eslint
Fixed eslint checks
2023-08-13 13:26:03 -04:00
Isaac Connor a40b3351ba
Merge pull request #3753 from criadoperez/fix/criadoperez4
Onvif typos
2023-08-13 13:24:44 -04:00
Alejandro Criado-Pérez 8e17d9075b
Onvif corrections 2023-08-13 18:57:36 +02:00
Alejandro Criado-Pérez a93b67c9d8
Fixed eslint checks 2023-08-13 16:47:04 +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