mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-04-02 13:15:03 -04:00
Code Issues Packages Projects Releases Wiki Activity
21,259 Commits 80 Branches 104 Tags
419a44f8edf2effaefd0638d7b621d576dffe253
Commit Graph

1194 Commits

Author SHA1 Message Date
Isaac Connor
6936a3547c shared data is frequently not valid or zmc not running. These shouldn't be errors as they generated too much noise. We can generate errors higher up. 2022-09-13 17:59:53 -04:00
Jonathan Bennett
c35bbc8c30 Adds the Janus_pin to shared_memory, and a -j to zmu to fetch it 2022-09-07 15:49:47 -05:00
Isaac Connor
8aaa5e52b3 Merge pull request #3582 from megasaturnv/3516-CaseInsensitiveLogin 
Issue #3516 case insensitive login
 2022-09-06 16:39:53 -04:00
Isaac Connor
783fadc2d4 Make GenearteVideo code handle more options for generating video, including transforms like=hue=s=0 2022-09-06 13:44:53 -04:00
megasaturnv
9d8e32b28c Modified description for ZM_CASE_INSENSITIVE_USERNAMES 2022-09-05 15:49:26 +01:00
megasaturnv
6c0f40f570 Renamed ZM_AUTH_CASE_INSENSITIVE_USERNAMES to ZM_CASE_INSENSITIVE_USERNAMES as name was too long ZoneMinder/zoneminder#3516 2022-09-02 12:03:47 +01:00
megasaturnv
63e5b63eec Added option ZM_AUTH_CASE_INSENSITIVE_USERNAMES to match mixed case usernames to lower case usernames in database ZoneMinder/zoneminder#3516 2022-09-02 11:58:02 +01:00
Isaac Connor
29750a56e7 Merge branch 'master' into add_mqtt 2022-08-25 18:37:54 -04:00
Isaac Connor
4c5ec4c01f Add a Control file for Grandstream cameras 2022-08-17 14:59:02 -04:00
Isaac Connor
6762ec5166 Split out realm detection and use it in sendCmdPost. Our initial query on / doesn't fail as the camera doesn't require authorization for /. 2022-08-16 13:19:29 -04:00
Jonathan Bennett
ebd4a30666 Update ZM_MIN_RTSP_PORT description 2022-08-09 15:04:09 -05:00
Isaac Connor
165ccf5820 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-08-09 15:48:06 -04:00
Isaac Connor
6c0e34e84b Fix loading info from ControlAddress. Fix path used when testing auth. 2022-08-09 13:41:14 -04:00
ovargasp
6753a04e91 Latest version of zmAlarmServer 2022-08-05 16:46:11 -06:00
Robert Jacobson
3190051287 Make proportional and continuous movement actually work 2022-08-04 12:40:31 -04:00
Robert Jacobson
77472492e2 Make zoom buttons work for Axis P5655-E 2022-08-03 09:57:57 -04:00
Isaac Connor
b40423d720 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-08-02 20:57:48 -04:00
Isaac Connor
42bb0c41a0 Rename zmc_heartbeat_time to just heartbeat_time 2022-08-02 20:43:49 -04:00
Isaac Connor
d0cbb7b478 Sync up with c++ shm alignment to fix same size of 32bit 2022-07-29 10:27:18 -04:00
Isaac Connor
802ecc293c Roughed in Uniview PTZ module. Currently is a copy of Hikvision. Only reboot is correct. 2022-07-12 13:25:47 -04:00
Isaac Connor
82d20f3d1e Restart has different results than start/stop, so actually handle it separately. Should fix zmdc.pl later. 2022-07-04 11:16:44 -04:00
Isaac Connor
2bfc85c816 Implement sub ImportanceNumber because Importance is a string but we want to do math on it 2022-06-24 14:01:42 -04:00
Isaac Connor
e03d42103b Return true or false for open 2022-06-24 13:57:59 -04:00
Isaac Connor
0d48c92bc8 Calling zmMemInvalidate when detached should be fine, so turn Error into a debug 2022-06-24 13:57:10 -04:00
Isaac Connor
50df24f8da Return undef if we failed in Monitor::connect. Fixes zmtrigger endlessly complaining about a dead monitor after it has been disabled or moved to a different server 2022-06-21 10:46:57 -04:00
Isaac Connor
4a54931292 Add ZM_TIME_FORMAT_PATTERN 2022-06-01 16:19:51 -04:00
Isaac Connor
5108c016cf Add ZM_LOCALE_DEFAULT, ZM_DATE_FORMAT_PATTERN and ZM_DATETIME_FORMAT_PATTERN config entries 2022-06-01 15:44:57 -04:00
Isaac Connor
06a59ff4af Test against a constant because None==1 not zero. Fixes failed suspend motion detection during move 2022-05-30 15:44:35 -04:00
Isaac Connor
4f0502fbe9 If shared_data:valid is invalid, disconnect and reconnect before erroring. 2022-05-30 15:43:54 -04:00
Isaac Connor
8f5850e404 Turn on debugging of DB requests in Monitor 2022-05-30 09:52:07 -04:00
Isaac Connor
f502883ebe Move code from Event to Storage to implement delete_path(). Implement delete_analysis_jpegs() 2022-05-17 12:30:49 -04:00
Isaac Connor
34610069ea Move code from Event to Storage to implement delete_path() 2022-05-17 12:29:46 -04:00
Isaac Connor
b57c835ec6 Make ZM_PATH_FFMPEG a System config entry. Meaning it can only be set in /etc/zm/conf.d. Update help text to mention this. 2022-05-04 13:00:54 -04:00
Isaac Connor
6afd0ccfaf cleanup code and update System column in Config table on zmupdate.pl -f 2022-05-04 12:58:49 -04:00
Isaac Connor
906951e450 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-06 10:37:10 -04:00
Isaac Connor
0e337cd8bf Remove support for Cambozola which no longer works or is needed. 2022-04-06 10:37:02 -04:00
Isaac Connor
1f5d7866f7 Merge @alabamatoys' work to add focus controls 2022-04-06 09:03:27 -04:00
Isaac Connor
9d9b363536 Add backtrace when no primary key 2022-03-31 19:32:34 -04:00
Isaac Connor
8f013b55b2 Add Capturing, Analysing, Recording defaults. Add Decoding 2022-03-28 18:02:44 -04:00
Isaac Connor
55ae6ba4a5 rough in Url, UrlToZMS PathToZMS PathToIndex, UrlToIndex UrlToApi PathToApi in SERver object 2022-03-28 14:30:08 -04:00
Isaac Connor
a64102c890 Must preface config entries with ZM_ because we strip it out later 2022-03-21 16:09:29 -04:00
Isaac Connor
4f29875609 Fix password config type to be password in db 2022-03-21 16:08:13 -04:00
Isaac Connor
67f765bc82 Add password as a config entry type 2022-03-21 16:08:13 -04:00
Isaac Connor
d08cac052c Add MQTT settings to config 2022-03-21 16:08:13 -04:00
Isaac Connor
a748b0ed0a When connecting to a monitor, if it fails, disconnect. This should fix a bug in zmtrigger and others where it would never reconnect. The idea is that we asked for a successful connection, if it failed, we shouldn't be in a failed connected state, we should be disconnected. 2022-03-08 09:06:06 -05:00
Isaac Connor
8fe0cb5e33 tidy up the mem_info hash and turn into a hash instead of a pointer to a hash. Check for validity flah before checking sizes. Improve debug logging. 2022-03-08 09:04:41 -05:00
Isaac Connor
addfdcd330 Remove sets::isin references 2022-02-28 15:41:57 -05:00
Isaac Connor
e33b41745d Merge branch 'master' into replace_function_concept 2022-02-27 14:04:01 -05:00
Isaac Connor
2bd85089f4 Put integers in quotes as well. Proper JSON has all values in quotes. This is important because integers like 0123 are invalid 2022-02-26 18:25:51 -05:00
Isaac Connor
2bc0ec269a Merge branch 'master' into replace_function_concept 2022-02-15 17:02:03 -05:00