ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,102 Commits
32 Branches
93 Tags
158 MiB
Commit Graph

2558 Commits (release-1.36)

Author SHA1 Message Date
Isaac Connor c2fccb16b1 Add support for no sort field. No longer default to StartDateTime 2024-10-22 10:26:45 -04:00
Charlie Root 8a6b597d34 Only require Date::Manip if using strtotime 2024-10-18 10:57:09 -04:00
Isaac Connor 0f0f571c7a Make NULL be case-insensitive 2024-10-18 10:55:26 -04:00
Isaac Connor 29ea7c7074 Always attempt upgrade so that we re-apply the latest update.sql 2024-08-19 14:48:07 -04:00
Isaac Connor 39c53de33f Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2024-07-16 10:20:32 -04:00
Isaac Connor 04b58ab51e Put swap file File::find into an eval because it can die. 2024-07-16 10:19:51 -04:00
Isaac Connor a52d4675cd Always re-apply the latest update. Mainly because sometimes Isaac forgets to add the zm_update file when bumping versions, also in release branches, we increment version before release. zm_update scripts are always supposed to be re-runnable, so this is ok, if a little skeezy 2024-07-09 11:28:00 -04:00
Isaac Connor 194b55a21c move image_count to shared mem. Use it in monitorstream to detect when last_write_time % buffer_count hasn't changed, but there is in fact a new image. 2024-06-17 18:40:46 -04:00
Isaac Connor 0b641aabc4 Delete monitor status that has not been updated in a minute 2024-05-22 09:14:55 -04:00
Isaac Connor 6793d50385 Delete Monitor_Status records that havn't been updated in over a minute 2024-05-22 09:14:55 -04:00
Isaac Connor 6a68b8baea Add quotes around dbUser to prevent command injection 2024-01-02 14:08:55 -05:00
Isaac Connor cd303111e5 Add quotes around dbUser and dbPass to prevent command injection 2024-01-02 14:08:08 -05:00
Isaac Connor 35cbef280c Use https proxy instead of http since we now access an https url 2023-09-23 12:30:23 -04:00
Isaac Connor 6a5abeca83 Handle RateControl being undef 2023-07-27 11:48:11 -04:00
Isaac Connor d63877643a 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-29 10:30:27 -04:00
Isaac Connor 6585db7463 Adding :80 to address is not worthy of an Error log 2023-02-13 14:55:34 -05:00
Isaac Connor 6d5e8f3e09 Add a sleeping flag so that when we get sigterm, we can just exit instead of returning to the sleep 2023-02-13 14:52:43 -05:00
Isaac Connor 7a7b5c99c3 Include command line in debug output when generating images 2023-02-13 14:48:56 -05:00
Isaac Connor c9066f7423 Remove test for Enabled on monitor. Motion detection being disabled has nothing to do with manual triggering. Fixes #3657 2023-02-06 14:52:38 -05:00
Isaac Connor 5833812514 Add 2>&1 to command to delete event dir so that we get error messages logged. 2023-01-03 19:12:27 -05:00
Isaac Connor e805a22844 Move code from Event to Storage to implement delete_path() 2023-01-03 19:12:23 -05:00
Isaac Connor 0eeb9bff10 Improve info when moving event to show source and Dest paths 2022-11-29 12:59:08 -05:00
Isaac Connor 1a0c08c32c Fix crash in zmfilter DiskSpace Update when Event doesn't exist 2022-11-15 13:39:41 -05:00
Isaac Connor cb2480ddf6 Fix _ instead of __git_main in file::Find::find, clean up use of __git_main 2022-11-02 10:09:13 -04:00
Isaac Connor 75f2fc1b65 Don't clear Diskspace a second time 2022-11-02 10:09:01 -04:00
Isaac Connor 635030db70 Switch to utf8mb4 to support 4 byte unicode which is available since mysql 5.5 2022-10-21 17:14:06 -04:00
megasaturnv 475869cf36 Modified description for ZM_CASE_INSENSITIVE_USERNAMES 2022-10-11 10:51:58 -04:00
megasaturnv 97a731f8b7 Renamed ZM_AUTH_CASE_INSENSITIVE_USERNAMES to ZM_CASE_INSENSITIVE_USERNAMES as name was too long ZoneMinder/zoneminder#3516 2022-10-11 10:51:58 -04:00
megasaturnv c9c692bac4 Added option ZM_AUTH_CASE_INSENSITIVE_USERNAMES to match mixed case usernames to lower case usernames in database ZoneMinder/zoneminder#3516 2022-10-11 10:51:58 -04:00
Isaac Connor 9e3900bce2 Fix Monitor => monitor 2022-10-07 15:06:01 -04:00
Isaac Connor 7f2789c3fd Add ZM_LOG_INJECT config parameter to disable unprivileged log injection through api. 2022-10-07 11:09:02 -04:00
Isaac Connor c578495779 Fix missing STATE_UNKNOWN 2022-10-06 09:24:06 -04:00
Isaac Connor 614140764b Include monitor Id in logs, for consistency as well as utility 2022-09-29 16:18:44 -04:00
Isaac Connor 76d11f2b84 commit to free up locks when there is an error doing MoveTo (like does not exist on disk). Also remove commit from CopyTo which does no transactions/locking. 2022-09-19 09:27:24 -04:00
Jonathan Bennett cc71e6fc15 Update ZM_MIN_RTSP_PORT description 2022-08-10 10:56:54 -04:00
Isaac Connor d6adb7e206 Revert "Sync up with c++ shm alignment to fix same size of 32bit" 
This reverts commit e0fb0dcfb8.
 2022-08-05 20:53:56 -04:00
Isaac Connor 6f0a664a7c Merge pull request #3557 from teridon/axiszoomfix 
Make proportional zoom and movement work for AxisV2 API
 2022-08-05 09:08:47 -04:00
Isaac Connor e0fb0dcfb8 Sync up with c++ shm alignment to fix same size of 32bit 2022-08-02 14:39:11 -04:00
Isaac Connor a8ff247c06 Add ZM_TIME_FORMAT_PATTERN 2022-06-23 14:21:22 -04:00
Isaac Connor 7c6735ddac Add ZM_LOCALE_DEFAULT, ZM_DATE_FORMAT_PATTERN and ZM_DATETIME_FORMAT_PATTERN config entries 2022-06-23 14:13:43 -04:00
Isaac Connor f477f50d56 Add Private to Config 2022-06-05 11:59:20 -04:00
Isaac Connor fcb3855668 Don't freshing config when doing update. That is it's own command 2022-05-24 13:34:31 -04:00
Isaac Connor 46790ff6a0 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-24 13:11:15 -04:00
Isaac Connor ace736a003 cleanup code and update System column in Config table on zmupdate.pl -f 2022-05-24 13:11:15 -04:00
Isaac Connor 56bc1106a9 Config entries are not constants, duh 2022-05-19 17:18:55 -04:00
tftadmin Appleton 93b1382537 Only keep ZM_COOKIE_LIFETIME entries in Sessions. 2022-05-18 17:37:23 -05:00
Isaac Connor d93c9a30a5 WARNING should be a DEBUG when restarting a process 2022-04-26 10:08:54 -04:00
Isaac Connor b957968476 last analyse time being zero is very common on startup. Not an error. 2022-04-11 11:00:38 -04:00
Isaac Connor 47c8e69722 Merge @alabamatoys' work to add focus controls 2022-04-06 09:03:58 -04:00
Isaac Connor 5eda92492b Move the protocol loading into the Monitor Object. 2022-04-03 17:11:04 -04:00