Commit Graph

2524 Commits (866edc2990c0ab286fb8932500626092fbfe4b77)

Author SHA1 Message Date
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
Isaac Connor 395d087994 If no protocol defined, fall back to the name of the Control 2022-04-03 17:09:09 -04:00
Isaac Connor 81b752d16f improve debug logging when loading Control in Monitor 2022-04-03 17:08:52 -04:00
Isaac Connor f5fd8cb111 Implement Control() function to implement the Protocol Specific Control object 2022-04-03 17:08:18 -04:00
Isaac Connor 6a3fff0aa9 Add backtrace when no primary key 2022-04-03 17:03:15 -04:00
Isaac Connor 80d622b085 Must set MonitorId in Control 2022-03-31 19:37:11 -04:00
Isaac Connor 325d1429a7 Fix logged value 2022-03-31 19:36:29 -04:00
Isaac Connor d640468dd4 reduce debug logging 2022-03-29 19:00:34 -04:00
Isaac Connor 223afe271e rough in Url, UrlToZMS PathToZMS PathToIndex, UrlToIndex UrlToApi PathToApi in SERver object 2022-03-29 18:59:17 -04:00
Isaac Connor 71689a58a1 Implement reboot and ping methods for Trendnet PTZ Control 2022-03-29 18:57:26 -04:00
Isaac Connor b522f8ffce Use the reported move with x=0 y=0 for autostop in addition to old stop movement code 2022-03-29 18:56:59 -04:00
Isaac Connor 77566967d3 Make ZoneMinder::Control ingerit from Object. Make loadMonitor use MonitorId 2022-03-29 18:56:14 -04:00
Isaac Connor 0b2e5b1450 Set new defaults for various settings 2022-03-29 18:54:06 -04:00
Isaac Connor 388142b4e1 More new defaults. The navbar refreshes every 60 secs so make full page refresh be 240sec. Ajax timeout needs to be 10 seconds. Large event listings can take longer than 3 2022-03-29 18:52:48 -04:00
Isaac Connor e395cf75e1 Add mp4 as an option for generated video and make it the default instead of avi 2022-03-29 18:52:27 -04:00
Isaac Connor 5f019ec550 Remove weird cutnpaste User modules stuff from top of Filter.pm 2022-03-23 14:58:46 -04:00
Isaac Connor 024f0c15a4 Add NOT IN case. Also, fix bad SQL when value evals to false. Test for empty string instead. Fixes #3425 2022-03-23 14:58:33 -04:00
Isaac Connor 4a51253aa9 Fix auth not getting realm from auth headers due to them being an array now. Get auth and ip from Path if not set in ControlAddress. 2021-12-14 10:26:17 -05:00
Isaac Connor afc21cd14d If we are starting a process that is waiting to term, mark it to get started by the reaper. Fixes case where zmdc thought the process was still running and so didn't start it. We never noticed because zmwatch would eventually notice. The result is instant restart. 2021-11-29 13:54:11 -05:00
Isaac Connor 765886ae72 Handle bug where a value of '' will prevent special case handling. Allow '' to mean NULL when specifying Storage Area 2021-11-29 13:52:05 -05:00
Isaac Connor 84b8e43034 Only start a transaction if we are not already in a transaction 2021-10-28 15:28:55 -04:00
Isaac Connor 15a7c22b94 layout->layer 2021-10-28 15:26:12 -04:00
ColorfullyZhang d7abdb1505 Set character set as utf8 when connect to mysql to avoid mistakes when there are Chinese characters in storage path. 2021-10-28 15:18:55 -04:00
Isaac Connor ee30c0f05e add a comment about rollbacks 2021-10-28 12:03:58 -04:00
Isaac Connor a6795cd026 Just return the error 2021-10-28 11:59:36 -04:00
Isaac Connor 6e68a35861 Remove dead code, remove locking from CopyTo, put locking into MoveTo. 2021-10-28 11:59:23 -04:00
Isaac Connor dd758aacac Fix Event count subsitutions in emails because they are no longer in Monitor_Status. They are in Event_Summaries. So create a new object for them and use it. 2021-10-27 12:21:30 -04:00
Isaac Connor 522f8dd5ba Do no commit on error as it releases locks. Add better storage loading error handling 2021-10-25 09:44:27 -04:00
Isaac Connor a258567c16 You cannot commit on error because it releases the locks. 2021-10-25 09:44:27 -04:00
Isaac Connor b5bb5e67ff Change commands used to set and goto presets. Fixes #3371 2021-10-19 13:16:21 -04:00
Isaac Connor 7905f11be6 remove useless commit. 2021-09-25 14:27:26 -04:00
Isaac Connor 5475b44852 Fix html emails when using ZM_NEW_MAIL_MODULES. Improve debugging and reduce Info logging 2021-09-10 18:01:04 -04:00
Isaac Connor ad1db2c960 Only suspend/resume motion detection if the monitor is doing motion detection 2021-09-08 13:59:34 -04:00
criadoperez 4d09e5f93f Fixed broken wiki links 2021-09-08 13:59:07 -04:00
Isaac Connor 09d4f0f9c2 Add missing fields. defaults need to be quoted because they are evalled 2021-09-04 10:44:12 -04:00