Commit Graph

2292 Commits

Author SHA1 Message Date
hax0kartik b212b0e450 Allow modifying font file location 2020-11-28 20:18:17 +05:30
Isaac Connor a47b72af49 Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds. 2020-11-16 11:31:36 -05:00
Isaac Connor a0dcdd135a DefaultRate and DefaultScale are Monitor properties, so just load them in a Monitor object so we don't have to JOIN the Monitors table 2020-11-13 17:04:22 -05:00
Isaac Connor f1b8266e26 Only join storage and Monitors if necessary 2020-11-13 17:03:51 -05:00
Isaac Connor da99426535 if monitor is not found call loadMonitors to make sure it isn't new 2020-11-13 10:40:55 -05:00
Isaac Connor 7b764d04d3 Fix use of next when it should be return. Improve some logging of errors. 2020-11-11 17:40:31 -05:00
Isaac Connor 076d649189 Include Record Monitors in zmtrigger 2020-11-11 16:12:30 -05:00
Isaac Connor 0aef0adf48 Fix more Monitors.Id => Monitor_Status.MonitorId 2020-11-11 11:32:54 -05:00
Isaac Connor 330023f65b Move Events totals to Monitor_Status instead of Monitors 2020-11-11 09:30:39 -05:00
Isaac Connor 159b383276 Move event stat totals to Monitor_Status. Implement a class for them called Monitor_Status 2020-11-06 13:27:47 -05:00
Isaac Connor adbd3486bf Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:49:39 -05:00
Isaac Connor 5fadd366e7 Always setup Logging SIG handlers. Implement SIGUSR1 and SIGUSR2 handling to match c++ side behaviour. Fixes #3057 2020-10-30 11:50:03 -04:00
Isaac Connor 65df84ef7e Make ZoneMinder::Event::delete aware of transactions 2020-10-30 11:49:00 -04:00
Isaac Connor 7a65a64644 add LockRows to Filters 2020-10-26 18:47:40 -04:00
Isaac Connor 90e81c5774 Merge branch 'release-1.34' 2020-10-23 09:34:35 -04:00
Isaac Connor a0f733615c allow empty string as a default value 2020-10-22 11:26:34 -04:00
Isaac Connor 40c57b4b23 Improve logic in set, improve logging 2020-10-22 10:43:53 -04:00
Isaac Connor 6c546f36ae allow dashes and underscores in log file name 2020-10-22 10:43:35 -04:00
Isaac Connor b950962f98 Revert WEB_EVENT_SORT_FIELD change from StartTime to StartDateTime back to StartTime. StartTime is the column name. 2020-10-20 19:21:15 -04:00
Isaac Connor 9c943fb079 Merge branch 'release-1.34' 2020-10-14 16:48:01 -04:00
Isaac Connor ba3b19d89a Clean up DiskSpace option. Doesn't need to be there and shouldn't set HashDiskPercent 2020-10-14 16:45:03 -04:00
Isaac Connor 4f5948cba0 Implement Unarchive action 2020-10-12 10:53:53 -04:00
Isaac Connor 991cf97890 Fix null=>undef 2020-10-06 17:08:47 -04:00
Isaac Connor 9abde9ee06 Merge branch 'release-1.34' 2020-10-06 16:51:12 -04:00
Isaac Connor de6a51ec15 Fix incorrect operator used for NOT IN and add IN operator to match php 2020-10-06 09:38:15 -04:00
Isaac Connor 42debf5392 Rough in a Zone class 2020-10-01 16:50:50 -04:00
Isaac Connor 3091759162 Add missing fields and impleent a control function 2020-10-01 16:50:39 -04:00
Isaac Connor f2e4d1dd5c Handle PostSQL Conditions when generating SQL 2020-09-29 15:02:46 -04:00
Isaac Connor 0a4a144bbc Merge branch 'location' 2020-09-28 09:33:28 -04:00
Isaac Connor c14e141295 Merge branch 'release-1.34' 2020-09-25 11:01:25 -04:00
Isaac Connor 3db8490d9c Escape another case of Function for mysql8 2020-09-25 10:59:31 -04:00
Joseph Yasi 52ca2abf69 Quote some more MySQL8 Reserved keywords
See:
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295/comments/1
https://github.com/ZoneMinder/zoneminder/issues/2659
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295
2020-09-25 09:37:21 -04:00
Isaac Connor e9d8279d8a Add geolocation config options 2020-09-24 20:20:01 -04:00
Isaac Connor 94fdddc1e8 Synchronize on space instead of = in zmcontrol.pl command line 2020-09-21 11:56:56 -04:00
Isaac Connor 5b2f397a54 Update EVENT_SORT_ORDER options 2020-09-14 15:13:04 -04:00
Isaac Connor e5776b79fa Introduce %EVF% Event video filename subst 2020-09-14 14:04:18 -04:00
Isaac Connor 0f04f9607a Fixup Exists as opposed to ExistsInFileSsystem 2020-08-27 19:56:41 -04:00
Isaac Connor 43b4177a5b fix crash due to incomplete code 2020-08-27 08:14:45 -04:00
Isaac Connor 0f27243007 Merge branch 'master' into filter_pre_post 2020-08-24 09:23:24 -04:00
Isaac Connor 0873b8a0ec Remove long-deprecated config entries 2020-08-22 18:49:20 -04:00
Isaac Connor 9f9b771d3f remove dead code 2020-08-22 10:58:16 -04:00
Isaac Connor b589c3abd9 glob sorts since perl 5.6.0 2020-08-21 10:45:32 -04:00
Isaac Connor 46aaddeac5 Sort loading of conf.d config files. Also ignore db Config table entries that have already been defined in conf.d files so that they take precedence. 2020-08-20 20:44:28 -04:00
Isaac Connor b8433373b5 Rough in Pre and Post SQL Conditions in execute. Rough in ExistsInFileSystem support. Needs more work. 2020-08-15 17:49:11 -04:00
Isaac Connor 49316244a8 Merge branch 'master' into filter_pre_post 2020-08-13 13:46:35 -04:00
Isaac Connor ac9432edf4 Older cameras don't have that file. It's ok for it to return a 404. 2020-08-11 15:17:27 -04:00
dmo c102c35c42
Don't prefix manpage with zoneminder- 2020-08-05 23:56:30 +02:00
Andrew Bauer 3ba8ad579e fix pod2man out-of-source builds 2020-08-04 21:18:37 -05:00
Andrew Bauer 92cc03dbe8 fix pod2man out-of-source builds 2020-08-04 21:07:49 -05:00
Andrew Bauer 8d9410d510
spelling 2020-08-03 15:38:02 -05:00