ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,207 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

2264 Commits

Author SHA1 Message Date
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
Andrew Bauer 9d88f8ee73 implement zm about menu 2020-08-03 15:22:46 -05:00
Andrew Bauer b6c0274b2c implement collapsed navbar 2020-07-31 16:03:37 -05:00
Isaac Connor 34b079fa9e Start roughing in pre and post conditions 2020-07-30 12:13:09 -04:00
Isaac Connor 5bea68c93d add comment and improve logging of figuring out event starttime from youngest file 2020-07-28 10:35:28 -04:00
Isaac Connor 89007227b6 Add reboot method to SkyIPCam7xx control script 2020-07-23 11:54:19 -04:00
Isaac Connor 926c3b8d34 Isaac added these explicit zmc~_heartbeat and zma_heartbeat entries. 2020-07-13 14:53:03 -04:00
Joseph Yasi cc93d553d8 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-07-10 23:11:59 +02:00
Isaac Connor cd707571e7 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-07-08 17:22:32 -04:00
Isaac Connor a469fdef9a include the non-existent path in the warning 2020-07-08 17:21:59 -04:00
Isaac Connor e5afc1a2db Cleanup code that sets digest credentials. Fixes #2972 2020-07-08 17:20:52 -04:00
Isaac Connor 209cbe1000 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-07 09:23:46 -04:00
Isaac Connor b0f87eabc2 comment out hexdump stuff to remove the dependency 2020-07-07 09:23:32 -04:00
Andrew Bauer dcab218a2e remove global config item CREATE_ANALYSIS_IMAGES 2020-07-06 12:22:41 -05:00
Isaac Connor 2db65d3821 Merge branch 'release-1.34' 2020-07-04 09:09:24 -04:00
Isaac Connor db5370024a implement moveMap and moveRel. Please note that many cameras do not implement these functions and may even report that they do implement them and then silently do nothing when you use them. So YMMV 2020-07-04 09:02:01 -04:00
Isaac Connor ab98deafd7 Add Log cleaning to zm_stats.pl 2020-07-02 16:02:49 -04:00
Isaac Connor c022cae7ef Sleep 10 secs if db connection fails to reduce log spamming and load 2020-06-30 18:59:27 -04:00
Isaac Connor aff7e27dee remove debug in zmtrack.pl.in 2020-06-30 18:58:46 -04:00
Brandon Myers ce4e04cd0b
Fix typo in AUTH_TYPE help text 2020-06-27 00:23:05 -05:00
Isaac Connor 73ec5f10a5 sendCmd failures should not be fatal 2020-06-26 16:52:34 -04:00
Isaac Connor d1e7d396f7 zmcontrol needs to be able to take floats instead of integers for it's parameters 2020-06-26 16:49:55 -04:00
Isaac Connor e618966e08 spacing, improve error message when can't connect. 2020-06-23 10:23:17 -04:00
Isaac Connor d984c33b92 Replace old message abou ensuring that ZM is stopped with our new one, which only pauses if ZMIS running. 2020-06-09 13:36:33 -04:00
Isaac Connor a2a28d389e Finish exporting and fixing new systemStatus packageControl and daemonControl functions 2020-06-09 13:35:52 -04:00
Isaac Connor 5e0f1a03c5 Detect if system is running and prompt to stop it before doing the update. 2020-06-09 13:19:19 -04:00
Isaac Connor d4488ac4e1 spacing 2020-06-09 12:18:29 -04:00
Isaac Connor 58ae7bb342 die early if db connection fails 2020-06-07 11:57:20 -04:00
Isaac Connor d59697b9b5 fix event->self 2020-06-07 11:57:08 -04:00