Commit Graph

2030 Commits

Author SHA1 Message Date
Isaac Connor
44e4d93445 Merge branch 'master' into storageareas 2019-06-24 11:35:36 -04:00
Isaac Connor
ad1df8f80a log the response if command fails, and add missing uthentication sections 2019-06-21 11:40:46 -04:00
Isaac Connor
36995de96f Alter option help for EVENT_CLOSE_MODE to reflect that alarm will end the continuous event and start a new one 2019-06-20 15:11:49 -04:00
Isaac Connor
db7362dbcb Merge branch 'master' into storageareas 2019-06-20 14:18:47 -04:00
Isaac Connor
3bae7a5432 spaces and parenthesis 2019-06-20 13:28:12 -04:00
Isaac Connor
b068428bbc zmcontrol complains about unfinished statement handles. This is because we aren't finishing them in functions in Database.pm 2019-06-20 13:27:42 -04:00
Isaac Connor
9a33e55efc Bump log level to warning if we are restarting any daemons. Daemons should NOT need to be restarted in a healthy system. 2019-06-13 11:53:26 -04:00
Isaac Connor
1928d1153f spacing and quotes 2019-06-11 13:32:15 -04:00
Isaac Connor
2e624522c7 fixes #2294 (#2637) 2019-06-10 09:43:56 -04:00
Isaac Connor
983da41c7a Reduce log level for filter execution from Info to Debug 2019-06-03 09:46:28 -04:00
Isaac Connor
3be0b774bd better error logging 2019-05-23 16:26:21 -04:00
Isaac Connor
4466ef13fd Merge branch 'pliablepixels-crypt-replacement3' into storageareas 2019-05-23 15:21:58 -04:00
Isaac Connor
2bf022d69c Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement3 2019-05-23 14:26:05 -04:00
Isaac Connor
bdbbab0d3e Handle no results from get_ProbeMatch() 2019-05-21 17:15:08 -04:00
Isaac Connor
93aeceecfc Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement 2019-05-17 10:18:15 -04:00
Isaac Connor
3888d140a8 Merge branch 'master' into storageareas 2019-05-17 10:16:29 -04:00
Pliable Pixels
915e9f05a9 merged fifo changes 2019-05-16 16:14:06 -04:00
Mitch Capper
eb005e8b9c FIFO support for zoneminder zone debugging (#2594)
Adds fifo options for diagnostic images for much lower impact diagnostics mode.  Diagnostic images are only written when there is a client listening for them (otherwise they are skipped).  Also added a json stream for the detection data so you can see in real time the pixels or blobs detected for the motion.  This allows for easy real time stream of both delta and reference images (as video streams) along with the detection numbers.
2019-05-16 15:37:03 -04:00
Pliable Pixels
0e72080c4a Migrate from libdigest to crypt-eks-blowfish due to notice 2019-05-16 09:37:11 -04:00
Pliable Pixels
e9f843f297 bulk overlay hash mysql encoded passwords 2019-05-13 14:29:24 -04:00
Pliable Pixels
87e407aa90 forgot to checkin update file 2019-05-13 10:31:09 -04:00
Jonathan Meredith
74d9f4f1aa Spelling and grammar fixes in help (#2603)
* Edit Help array to make it match others below. This should not affect the results

* Misc. grammer and spelling fixes along with removing some duplicated words.  This should not affect compilation.

* More grammer and spelling errors

* Replace Javascript with ZoneMinder because it did not make sense there.

* More spelling and grammar edits
2019-05-13 07:58:18 -04:00
Isaac Connor
74095963cc Merge branch 'master' into storageareas 2019-05-12 19:39:09 -04:00
Pliable Pixels
881d531fe9 make old API auth optional, on by default 2019-05-12 18:19:19 -04:00
Pliable Pixels
c1891e35b9 moved API enable back to system 2019-05-12 12:15:08 -04:00
Pliable Pixels
e6b7af4583 initial baby step for api tab 2019-05-10 15:11:35 -04:00
Isaac Connor
d9f7e93df3 Fix typo gegress to degrees. Fixes #2601 2019-05-10 14:27:51 -04:00
Isaac Connor
1498027f12 Add option to attach the objdetect image in emails 2019-05-08 22:45:04 -04:00
Isaac Connor
f0e5a435cf spacing and quotes, but the main change is using aud_print instead of Info 2019-05-06 10:04:53 -04:00
Isaac Connor
25614bb75e Merge branch 'master' into storageareas 2019-05-01 08:57:20 -04:00
Rémi Da Costa
16697565bf Netcat ONVIF: adding ONVIF authentication 2019-04-30 07:48:47 +02:00
cnighswonger
dfa997a989 Add camera relative iris control methods
This set of methods invoke realtive iris size in the direction indicated by
    the <Large/Small> portion of their name. They accept no arguments.

    NOTE:

    This only just does work. The Dahua API specifies "multiples" as the input.
    We pass in a 1 for that as it does not seem to matter what number (0-8) is
    provided, the camera iris behaves the same.
2019-04-29 16:05:44 -04:00
redaco
76dd411341 Netcat ONVIF: Added support for "profile token" (#2589) 2019-04-29 15:56:55 -04:00
Isaac Connor
9421c0208d Add instructions for enabling the web user to run shutdown 2019-04-12 14:48:47 -04:00
Isaac Connor
0dd4a23770 Add Config for showing a system shutdown/restart option 2019-04-12 09:36:30 -04:00
Isaac Connor
3abf263e7a fixup half-merged changes to filter to view in montagereview 2019-04-08 16:57:41 -04:00
Isaac Connor
aa83239069 rework zmcontrol.pl. If command is given and server is not up, use zmdc.pl to start it. Give up after 10 seconds. 2019-04-05 15:18:03 -04:00
Isaac Connor
e1873b1693 debug response content 2019-04-05 15:17:13 -04:00
Isaac Connor
aaef151815 ZM_VERSION is a constant not a scalar variable 2019-04-05 13:18:06 -04:00
Andrew Bauer
2bb15c4f90 daemonize zmcontrol (#2563) 2019-04-01 17:26:24 -04:00
Isaac Connor
d579faa291 attr in modern ZM should be StartWeekday. Continue to support legacy filters 2019-03-28 15:13:53 -04:00
Isaac Connor
9a70dff143 to single quotes, include monitor Id when logging the closing of an event 2019-03-28 09:43:17 -04:00
Isaac Connor
7b878a4c64 Sync up quotes and space differences frmo zma_to_thread 2019-03-19 17:15:32 -04:00
Isaac Connor
3f9564c10a Merge branch 'master' into storageareas 2019-03-19 10:37:35 -04:00
Isaac Connor
18f1881ffd spacing 2019-03-18 17:13:19 -04:00
Chris
ad5f6a8729 Camera reboot function (#2554)
* Adding a button for camera reboot function

This series of commits will add a camera reboot function to the
control interface if supported by the camera configuration.

* Adding reboot function option to contorl configuration

This patch adds a reboot option to the camera control configuration
view.

* Adding Reboot field to Controls table

This patch adds a Reboot field to the Controls table to support
a camera reboot control option.

* Correcting button value to match reset

* Updating language files

I'm not sure of the proper procedure to trigger updating of
non-english language files so I'm updating them all with English
hoping that that will draw attention to the changes and others
will translate accordingly.

* Add missing forward slash
2019-03-18 14:49:05 -04:00
Isaac Connor
63982a6282 Disable PRIVACY enable 2019-03-18 14:42:05 -04:00
Isaac Connor
520c41da23 Merge ../ZoneMinder.connortechnology.bad into storageareas 2019-03-18 14:40:03 -04:00
Isaac Connor
e486b035f0 Revert "Implement a date filter to zmaudit so that it only looks in directories by date."
This reverts commit d86b1ea49c.
2019-03-18 13:50:00 -04:00
Isaac Connor
d86b1ea49c Implement a date filter to zmaudit so that it only looks in directories by date. 2019-03-18 13:48:55 -04:00