Commit Graph

2146 Commits (more_gps)

Author SHA1 Message Date
Isaac Connor c922629729 Merge branch 'more_gps' of github.com:ZoneMinder/zoneminder into more_gps 2023-07-19 16:30:24 -04:00
Isaac Connor 51867a42f6 Merge stuff from fleet 2023-07-19 16:28:18 -04:00
Isaac Connor 75322142a4 Remove deprecated MonitorsIds. Replace it's use with looking for edit permission per monitor 2023-07-19 12:39:32 -04:00
Isaac Connor cb7d954a87 Fix warning when creating new user 2023-07-17 17:29:16 -04:00
Isaac Connor f46ef094dc Merge envserv:sandbox/ZoneMinder 2023-07-17 15:37:12 -04:00
IPC 65d37e7a36 Rough in a Grandstream detector 2023-07-17 14:36:28 -05:00
Isaac Connor 64057eec95 ROugh in Foscam and DLink detections 2023-07-15 10:29:54 -04:00
Isaac Connor e13a42aa46 Fix not saving Manufacturer and Model. Have to unset the text input if the ddm is populated 2023-07-12 14:30:49 -04:00
Isaac Connor 3714b38caa Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-06-27 11:47:03 -04:00
Isaac Connor 961f05b228 Don't show deleted monitors in group dropdowns 2023-06-27 10:45:13 -04:00
Isaac Connor bc1214e8e5 Don't use empty because it tests for false, and 0 is false. Just check for empty string. Fixes #3732 2023-06-27 10:44:25 -04:00
Isaac Connor 93dc57401f Remove duplicated ExistsInFileSystem label 2023-06-26 10:34:19 -04:00
Isaac Connor ccdbb8edf6 Improve Avigilon detection 2023-06-22 13:31:01 -04:00
Isaac Connor 87fbc96609 Fix where error_log write to to include path 2023-06-09 19:37:47 -04:00
Isaac Connor 19128eee18 Do not allow directory names in ZM_LOG_DEBUG_FILE. Only log to ZM_LOG_DIR 2023-06-09 17:27:54 -04:00
Isaac Connor 81b9ac5efd Ignore inherit on monitor permission. We were returning true instead 2023-06-07 16:00:27 -04:00
Isaac Connor 3dbd68886a Reload user using zm\User object methods 2023-06-07 15:59:46 -04:00
Isaac Connor c02cbd86f8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-05-31 09:16:32 -04:00
Isaac Connor 8bd3e5a3b1 Can't use ZM\Logger functions in config as it loads before logger.php. 2023-05-31 09:09:17 -04:00
Isaac Connor b0e29c9be7 Fix downloading of Ffmpeg type monitors 2023-05-30 20:47:05 -04:00
Isaac Connor eab4d95e81 Always return an array from process_configfile instead of false on failure 2023-05-30 20:47:05 -04:00
Isaac Connor bc4d625ca4 Add systemd_isactive 2023-05-30 20:47:05 -04:00
Isaac Connor febf424259 Fix returning link_to 2023-05-30 20:47:05 -04:00
Isaac Connor 6204dfdecc Fix start/stop/restart dnsmasq 2023-05-30 20:47:05 -04:00
Isaac Connor 30495578c2 Add link_to function 2023-05-30 20:47:05 -04:00
Isaac Connor 66ef087a4d ServerId and FilterServerId must have a value to be valid 2023-05-26 16:38:58 -04:00
Isaac Connor 51a1d511fb Fix incorect merging of terms in sort. Fixes #3715. Also always show text op in simple_widget 2023-05-26 16:36:40 -04:00
Isaac Connor e14fc279e4 Handle empty set in IN/NOT IN better 2023-05-26 16:35:45 -04:00
Isaac Connor 4959d83751 Switch from utf8 to utf8mb4 so that collate works 2023-05-25 17:31:30 -04:00
Isaac Connor 704b3b2a80 Handle missing cnj on terms 2023-05-24 18:30:33 -04:00
Isaac Connor d4a4bd6c8e Add remove_invalid_terms 2023-05-23 16:53:52 -04:00
Isaac Connor 20b7624da0 Handle op not being specified 2023-05-23 15:51:35 -04:00
Isaac Connor fa844e60cb Don't remove cnj on first term in Query. We might reorder them later. 2023-05-19 12:44:08 -04:00
Isaac Connor fbe954473a Add support for placeholders, cookies, case insensitive search and Group as an attr. 2023-05-17 14:36:38 -04:00
Isaac Connor 91541aa6b7 Add support for placeholders, cookies, DateTime fitler, Notes, Group. Add sort_terms function. 2023-05-17 14:36:09 -04:00
Isaac Connor 485af42a0b Fix more typos 2023-05-16 14:18:26 -04:00
Isaac Connor 030d6b9696 Fix undefined mid 2023-05-16 14:14:34 -04:00
Isaac Connor 3daee34d4d Fix typo 2023-05-16 14:11:53 -04:00
Isaac Connor c8c4b560af Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-05-16 14:11:21 -04:00
Isaac Connor 6eb166c938 Handle matches2 not being defined 2023-05-16 11:53:48 -04:00
Isaac Connor 22bd680e40 FIx :: 2023-05-16 10:23:39 -04:00
Isaac Connor fc90d7bc2b Remove debug 2023-05-15 16:08:51 -04:00
Isaac Connor d189d820a8 Don't log errors from port_open, don't close the unopened fp 2023-05-15 10:47:54 -04:00
Isaac Connor 586fd5edb7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-05-15 10:05:13 -04:00
Isaac Connor 37e711d684 Add port_open function, improve Ubiquiti probing, check for open port on 554 before saying it's a camera 2023-05-15 10:03:34 -04:00
Isaac Connor 6046398981 Add event Name to the event detail modal 2023-05-12 15:15:55 -04:00
Isaac Connor 3009c4902d Use User object find instead of raw sql 2023-05-12 15:11:40 -04:00
Isaac Connor ef424a39b6 Improve Amcrest detection with snapshot image. Fix using auth from monitor overriding other cameras 2023-05-12 13:15:55 -04:00
Isaac Connor d522ef677a Add Avigilon, loading of arp-scan oui database and showing of all devices instead of just recognized cameras. Remove the : from mac addresses to match OUI dbs 2023-05-12 12:59:53 -04:00
Isaac Connor 51755b4f4e Fix updating having Id in it 2023-05-12 12:56:36 -04:00