Commit Graph

2779 Commits (581a6aa6b80e726e8e3a9685e4d3562b3a492b5d)

Author SHA1 Message Date
Isaac Connor 7596cdcde3 Change grep to match at beginning of line. The grep can show in the process list and so give us a broken result. Add debugging when we don't get a value. 2023-10-23 17:05:15 -04:00
Isaac Connor eb6baf4365 Importance is an enum, default value should be Normal 2023-10-23 12:51:29 -04:00
Isaac Connor eb291b76d1 Better log message when we have a weird value for Importance 2023-10-23 12:49:12 -04:00
Isaac Connor 651fe2596f Remove debug, add ETAGS subsitution. Fix not doing substitutions on the head of a summary email 2023-10-04 17:08:13 -04:00
Isaac Connor 582245cdaf Rework new and find to properly handle multi-column primary keys 2023-10-04 17:07:50 -04:00
Isaac Connor 69e6c56ac3 Add Objects for Tag, Event_Tag and add functions to Event to load them. 2023-10-04 17:07:19 -04:00
Isaac Connor 3836e7d2a7 The value will be the Tag ID so compare against T.Id not T.Name 2023-10-04 15:57:54 -04:00
Isaac Connor fc2198d375 Update Path after changing Storage Area 2023-10-04 10:07:07 -04:00
Isaac Connor 86e1959378 Use new ZM_PATH_UNAME instead of uname on PATH 2023-09-28 12:59:39 -04:00
Isaac Connor 87d29f10c6 Use new ZM_PATH_UNAME instead of uname on PATH 2023-09-28 12:59:28 -04:00
Isaac Connor 243edcc82f Use new ZM_PATH_RM instead of hard coding path to rm 2023-09-28 12:59:08 -04:00
Isaac Connor 2a7b8a1dbb Use https proxy instead of http since we now access an https url 2023-09-23 12:28:18 -04:00
Isaac Connor e739b04a97 Add more debugging and event deleting when renumbering 2023-09-22 16:28:35 -04:00
Isaac Connor 92d3e00db1 Add GROUP BY E.Id to fix mysql complaining about teh aggregate function 2023-09-20 13:35:51 -04:00
Isaac Connor 25dfbf27f6 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-09-18 17:05:56 -04:00
Isaac Connor eea18b1663 Implement event renumbering in zmeventtool 2023-09-18 17:05:32 -04:00
Isaac Connor 82a7dca63b SELECTING auto_increment value doesn't work. Must use mysql_insertid 2023-09-18 17:05:10 -04:00
Isaac Connor b22ef6f328 Use a subselect instead of join because newer mysql doesn't like the aggregate functions without telling it how to group the other columns 2023-09-18 09:59:46 -04:00
Isaac Connor f8c89a0405
Merge branch 'master' into tags 2023-09-14 16:42:06 -04:00
Isaac Connor bf34db7da2 Log a warning when failed to send an email 2023-09-09 12:04:57 -04:00
Simpler1 18d74ed7ac (feat): Tags
fix(tag): Create tags on mobile

chore(tags): Change TagName to Name

chore(tags): eslint

chore(tags): dbFetchAll to dbQuery for removetag

chore(events): eslint (attempt 2)

feat(tags): Better handling of keyboard

fix(tags): Enter key for creating new tag

fix(tags): Don't allow space as a tag name

feat(tags): Delete tag if last assignment removed

fix(tags): Increase height of dropdown

in progress

fix(Tags): Use T.Id on the events page dropdown

fix(Tags): Remove $availableTags from events.php

chore(sql): Formatting sql statements

feat(Tags): Working OR on filters and events pages

fix(filter): Populate availableTags

chore(Tags): code formatting

fix(tag): Add tag on create tag

Fix(tags): Remove tag from available if last

feat(tags): Add zm_update.sql

fix(chosen): Undo css width

fix(chosen): tags dropdown width

fix(tags): dropdown over timeline

fix(tags): Full width input

fix(events): Refresh table on page show

chore(filter): Clean up availableTags

chore(event): Clean up available & selected Tags

fix(event): Update available tags on remove

fix(event): Remove hack for selected tags

feat(tags): Blur input after adding tag

doc(tags): Initial tags documentation

fix(tags): Dark theme dropdown

fix(tags): Dark theme for tags on input

fix(tags): Dark theme for highlight in dropdown

fix(tags): Populate filter tags droplist

chore(): Bump zm_update to 1.37.42

chore(tags): Move mobile check to skin.js

chore(tags): Comment debug statements

fix(tags): Enter key to create tag on mobile Chome

chore(tags): Space in 'All Tags' for translation

Temporary commit to handle cookie expiration times

chore(tags): Remove unnecessary Tag(s) from en_gb

chore(): Cleanup unnecessary Error and Debug

chore(): Resolve merge conflicts

chore(): Address merge conflicts with master
2023-08-31 15:50:08 -04:00
Alejandro Criado-Pérez 6fd119157a
Text corrections 2023-08-27 02:00:59 +02: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 e163509d57 auto_reconnect id deprecated. 2023-08-16 09:53:07 -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 769f6ce372 Only set channel from the default (1) if ControlDevice is populated 2023-08-08 13:28:18 -04:00
Isaac Connor 206be0ea96 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-08-02 13:36:33 -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 5c9588c012 Adds RTSP2Web support for live view 2023-07-29 23:46:31 -05:00
Isaac Connor bd71b35403 Handle RateControl being undef 2023-07-27 11:47:02 -04:00
Isaac Connor b3fb68b293 Fix test for undef 2023-07-25 13:24:57 -04:00
Isaac Connor 30c8052e60 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-07-25 12:32:40 -04:00
Isaac Connor 0134f8e447 Change detect_realm to return empty string instead o f undef. Just so that realm is always a string and not undefined. Fix integer comparison on strings and make detect_realm succeed as long as response isn't 401. 2023-07-24 12:42:20 -04:00
sletteland 8c754fb97d
Merge branch 'ZoneMinder:master' into onvif_events 2023-07-24 13:53:07 +02:00
Isaac Connor 40516598fa Fix errant ` 2023-07-12 17:45:33 -04:00
Isaac Connor 3e3d628fa1 Sync up missing fields in Monitor class. Add code for Manufacturer and Model 2023-07-11 17:27:08 -04:00
Isaac Connor efb27298c1 Rough in classes for Manufacturer and Model 2023-07-11 17:26:49 -04:00
Isaac Connor 93031e86d8 Add latitude and longitude to shmem 2023-07-09 12:03:51 -04:00
Alejandro Criado-Pérez 871bf1772f
fix: messages 2023-07-05 01:03:48 +02:00
root e6be9210c5 fixes bug with zmonvif-trigger.pl (Perl) :
zmonvif-trigger.pl is a Perl script that is supposed to monitor and forward
onvif events to ZM . Currently this does not wok as :
SOAP requests need to have a header containing "Action"	"To" and "UIID" fields
as per ONVIF specifications  (tested with Reolink rlc-831A)
This patch fixes that (creates proper SOAP headers ) .
IT now works ( tested with Reolink rlc-831A)
2023-07-02 10:32:28 +02:00
Isaac Connor 2aa5de8d51 Sync up with zm_utils version 2023-06-10 12:19:52 -04:00
Isaac Connor 66d7f88edf Clean up help text for ZM_LOG_DEBUG_FILE to not say that it can include a directory. It should be JUST a filename. 2023-06-09 17:27:54 -04:00
Isaac Connor 6148b805f6 Don't update non-existent Server entry 2023-06-04 09:43:32 -04:00
Isaac Connor 93ddf51cd7 Use ControlDevice for ChannelId. Update realm detection in PutCmd. Mostly debugging to see why a second put fails auth. 2023-06-01 10:00:51 -04:00
Isaac Connor 1f9559922c Don't watch deleted monitors 2023-05-31 12:17:49 -04:00
Isaac Connor 2f827a5178 Fix EPATH substitution 2023-05-30 12:01:14 -04:00
Isaac Connor e51ddc2492 Don't require loading the monitor object for MonitorId 2023-05-29 20:43:49 -04:00
Isaac Connor e8cd673569 Add MID and EID substitutions 2023-05-29 16:23:15 -04:00