Isaac Connor
|
2bc0ec269a
|
Merge branch 'master' into replace_function_concept
|
2022-02-15 17:02:03 -05:00 |
|
Isaac Connor
|
b2e0f805bd
|
Add NOT IN case. Also, fix bad SQL when value evals to false. Test for empty string instead. Fixes #3425
|
2022-02-15 10:29:58 -05:00 |
|
Isaac Connor
|
f66a463574
|
Merge branch 'master' into replace_function_concept
|
2022-02-08 12:07:30 -05:00 |
|
Isaac Connor
|
a7dc9d4e36
|
Implement General::jsonLoad
|
2022-02-08 10:14:00 -05:00 |
|
Isaac Connor
|
ac909d404a
|
Use the reported move with x=0 y=0 for autostop in addition to old stop movement code
|
2022-02-03 18:19:07 -05:00 |
|
Isaac Connor
|
ac39be33f5
|
Don't assume filename of mp4. We store it in the event record for a reason. Fixes #3422
|
2022-02-03 17:24:33 -05:00 |
|
Isaac Connor
|
caebef3103
|
Replace uses of Function
|
2022-02-03 12:38:26 -05:00 |
|
Isaac Connor
|
f40279b745
|
Remove active, add capturing, analysing, recording
|
2022-02-03 12:38:09 -05:00 |
|
Isaac Connor
|
f7099bc6cb
|
Replace another use of Function
|
2022-02-03 12:37:51 -05:00 |
|
Isaac Connor
|
10e39b3b13
|
:wqMerge branch 'master' into replace_function_concept
|
2022-02-02 17:08:01 -05:00 |
|
Isaac Connor
|
a4c91e9a3c
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-02-02 14:36:15 -05:00 |
|
Isaac Connor
|
339f102196
|
Implement reboot and ping methods for Trendnet PTZ Control
|
2022-02-02 14:36:11 -05:00 |
|
Isaac Connor
|
48fc99a0e3
|
Implement reboot and ping methods for Trendnet PTZ Control
|
2022-02-02 14:34:53 -05:00 |
Isaac Connor
|
3feb4fcc51
|
Merge branch 'master' into master
|
2022-02-02 12:28:17 -05:00 |
|
Isaac Connor
|
1c1630e5b4
|
add require Filter and fix missing $
|
2022-02-01 17:23:16 -05:00 |
|
Isaac Connor
|
4d87b49f07
|
Remove weird cutnpaste User modules stuff from top of Filter.pm
|
2022-02-01 17:22:56 -05:00 |
|
Isaac Connor
|
c524298f8e
|
Rough in State module
|
2022-01-27 13:42:46 -05:00 |
|
Isaac Connor
|
86f393565e
|
Remove Function references and swap with appropriate Capturing, Analysing, Recording
|
2022-01-27 13:42:31 -05:00 |
|
Isaac Connor
|
23bfbcd6ce
|
Merge branch 'master' into multistream
|
2022-01-26 10:13:20 -05:00 |
Jonathan Bennett
|
ec9403fb6f
|
Adds Amcrest On-camera Motion Detection
|
2022-01-25 22:38:00 -06:00 |
|
Isaac Connor
|
3cc243b9a8
|
Don't freshing config when doing update. That is it's own command
|
2022-01-24 09:24:16 -05:00 |
|
Jonathan Bennett
|
8125aa633b
|
Merge branch 'ZoneMinder:master' into master
|
2022-01-22 12:20:13 -06:00 |
|
Isaac Connor
|
35efb111ac
|
Add Private to Config
|
2022-01-22 12:30:59 -05:00 |
|
Jonathan Bennett
|
52e48c02b6
|
Add janus_path and janus_secret, allowing for more secure and flexible Janus installs
|
2022-01-21 22:23:41 -06:00 |
|
Isaac Connor
|
27abe85036
|
replace active with analysing, capturing, recording
|
2022-01-13 22:14:44 -05:00 |
|
Isaac Connor
|
3504b13e2a
|
Merge branch 'master' into multistream
|
2022-01-13 12:29:34 -05:00 |
|
Isaac Connor
|
9b8ca69203
|
default interactive to whether we have stdio. So now when running from console it will default to interactive and when running from zmdc.pl will be non-interactive. Do check regardless of ZM_UPDATE_CHECK setting.
|
2022-01-13 12:26:47 -05:00 |
|
Isaac Connor
|
274ffd7da0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-01-13 12:02:14 -05:00 |
|
Isaac Connor
|
3cc1b74b4e
|
Merge branch 'master' into multistream
|
2022-01-13 10:21:58 -05:00 |
|
Isaac Connor
|
162e12bf92
|
default interactive to whether we have stdio. So now when running from console it will default to interactive and when running from zmdc.pl will be non-interactive. Do check regardless of ZM_UPDATE_CHECK setting.
|
2022-01-13 10:21:32 -05:00 |
|
Isaac Connor
|
58bd09d83d
|
Fix debug output from zmDbDo
|
2022-01-13 09:56:04 -05:00 |
|
Isaac Connor
|
3ec6c7e32f
|
Fix behaviour of update check to support interactive mode. Use zmDbDo functions to simplify code. When interactive print out lastVersion, latestVersion and currentVersion
|
2022-01-13 09:55:26 -05:00 |
|
Isaac Connor
|
3dad3a5200
|
update description to reflect that zmupdate.pl now does all the things it will someday do. Meantion how -c works better. When in interactive mode, check once and print out the result instead of daemonising. Fix formatting osf usage
|
2022-01-13 09:55:16 -05:00 |
|
Isaac Connor
|
e4f0c7cd98
|
Fix debug output from zmDbDo
|
2022-01-13 09:54:47 -05:00 |
|
Isaac Connor
|
b178b0af5e
|
Fix behaviour of update check to support interactive mode. Use zmDbDo functions to simplify code. When interactive print out lastVersion, latestVersion and currentVersion
|
2022-01-13 09:54:36 -05:00 |
|
Isaac Connor
|
cb1cbed8e7
|
update description to reflect that zmupdate.pl now does all the things it will someday do. Meantion how -c works better. When in interactive mode, check once and print out the result instead of daemonising. Fix formatting osf usage
|
2022-01-13 09:37:54 -05:00 |
|
Isaac Connor
|
e4693c251c
|
add backticks around field names because some like Function are reserved
|
2022-01-12 23:08:29 -05:00 |
|
Isaac Connor
|
8d06175024
|
Rework to use ZoneMinder::Monitor class. Simplify loadMonitors and get rid of loadMonitor. Add in ServerId change handling.
|
2022-01-12 23:07:48 -05:00 |
|
Isaac Connor
|
9243b1d081
|
Add debugging to zmDbDo
|
2022-01-11 12:43:42 -05:00 |
|
Isaac Connor
|
152efd0987
|
make aud_print add a newline if printing. Tidy up Event Summary updating, using zmDbDo.
|
2022-01-11 12:39:52 -05:00 |
|
Isaac Connor
|
1891537e91
|
Remove redundant logLevel from docs
|
2022-01-11 12:38:57 -05:00 |
|
Isaac Connor
|
3dcfd3e26e
|
reduce debug logging
|
2022-01-11 12:02:33 -05:00 |
|
Isaac Connor
|
fd3a70172d
|
Merge branch 'master' into multistream
|
2022-01-10 17:51:50 -05:00 |
|
Jonathan Bennett
|
1333d8c751
|
Adds ONVIF Motion Detection Support
|
2022-01-06 16:45:15 -06:00 |
|
Isaac Connor
|
99900e8c1d
|
Merge branch 'master' into multistream
|
2022-01-05 18:04:10 -05:00 |
|
Isaac Connor
|
aefed4e174
|
Merge branch 'master' into multistream
|
2022-01-05 18:03:44 -05:00 |
|
Isaac Connor
|
bc67493f91
|
Alter log level of restart events based on Importance setting
|
2022-01-05 16:49:20 -05:00 |
|
Isaac Connor
|
bfac696fb7
|
return logger from loginit so that we can use it
|
2022-01-05 16:49:00 -05:00 |
|
Isaac Connor
|
cce24ea427
|
Add RTSPServer and Importance fields
|
2022-01-05 16:48:46 -05:00 |
|
Isaac Connor
|
6bd04de5f6
|
Merge branch 'master' into multistream
|
2021-12-31 17:53:36 -05:00 |