mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-04-04 22:14:07 -04:00
Code Issues Packages Projects Releases Wiki Activity
24,656 Commits 80 Branches 104 Tags
e94448db8a445bb928ca3c33db9f61fc2dddfd9d
Commit Graph

1345 Commits

Author SHA1 Message Date
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
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
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
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
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
274ffd7da0 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-01-13 12:02:14 -05:00
Isaac Connor
58bd09d83d Fix debug output from zmDbDo 2022-01-13 09:56:04 -05:00
Isaac Connor
e4f0c7cd98 Fix debug output from zmDbDo 2022-01-13 09:54:47 -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
9243b1d081 Add debugging to zmDbDo 2022-01-11 12:43:42 -05:00
Isaac Connor
1891537e91 Remove redundant logLevel from docs 2022-01-11 12:38:57 -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
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
Isaac Connor
fe0e4627ef Specify ZoneMinder::General for runCommand 2021-12-15 09:11:55 -05:00
Isaac Connor
28d5614da0 Fix missing ; 2021-12-15 09:11:55 -05:00
Isaac Connor
f683557b0e Fix Monitor::Control to handle local cameras 2021-12-15 09:11:55 -05:00
Isaac Connor
4fa804e9a2 Can only SKIP LOCKED if locking rows. Remove FOR SHARE as it isn't supported on < mysql 8 2021-12-14 13:33:00 -05:00
Isaac Connor
fe72fd83f8 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:04:35 -05:00
Isaac Connor
0382a677df Add ExecuteInterval to Filter Object. Allow empty sort_field to have the effort of not sorting. Always add FOR SHARE which adds a read-only lock the returned records. Add SKIP LOCKED functionality so that filters can simply skip locked records. This should reduce contention. Also specify FOR UPDATE of the events table, otherwise we also lock Monitors and Storage. 2021-12-13 14:58:32 -05:00
Isaac Connor
aa320cb28f Fix missing STATE_UNKNOWN 2021-12-10 15:35:53 -05:00
maddios
b47e96d7cf Fix Copy/Move to Default Storage 
When moving from a 2nd storage to Default it fails with "New storage does not have an id.  Moving will not happen" because the default ID is 0.
 2021-11-29 00:20:25 -05:00
Isaac Connor
f9f2615d48 Return if unable to lock the event record. Improve code around CopyTo call. 2021-11-26 15:26:38 -05:00
Isaac Connor
af5436d009 Handle bug where a value of '' will prevent special case handling. Allow '' to mean NULL when specifying Storage Area 2021-11-26 10:31:54 -05:00
Isaac Connor
40e7f607f5 If no protocol defined, fall back to the name of the Control 2021-11-22 11:38:40 -05:00
Isaac Connor
2c798069d3 improve debug logging when loading Control in Monitor 2021-11-18 18:12:07 -05:00
Isaac Connor
df88c5bbef layout->layer 2021-10-28 15:28:03 -04:00
Isaac Connor
4122ae99a5 add a comment about rollbacks 2021-10-28 15:27:45 -04:00
Isaac Connor
644c6e6b41 Just return the error 2021-10-28 11:48:08 -04:00
Isaac Connor
9fe2762bc8 Add mp4 as an option for generated video and make it the default instead of avi 2021-10-28 10:46:50 -04:00
Isaac Connor
6478999ecf 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:03 -04:00