Commit Graph

19633 Commits

Author SHA1 Message Date
Isaac Connor 5312d11e78 Don't both running zmu if monitor Function is set to None 2021-12-10 16:08:43 -05:00
Isaac Connor ed360348ef spacing, remove dead code. If Monitor Function becomes None, skip it 2021-12-10 15:36:47 -05:00
Isaac Connor aa320cb28f Fix missing STATE_UNKNOWN 2021-12-10 15:35:53 -05:00
Isaac Connor 5d8db0a320 Merge cycle functionality into watch view. Add period dropdown, countdown timer, toggle the sidebar. Fix auth on statusAjax, and don't use status ajax unless we are in still mode. Apply some min-width to fps so they don't jump around. Only update their content if it has changed (fewer browser renders). 2021-12-10 15:34:35 -05:00
Isaac Connor 7bc46ba7a8 Create the .tar.gz by default if it doesn't exist. Only warn if it already exists. 2021-12-09 15:19:49 -05:00
Isaac Connor a9ef5bf731 Add STATE_UNKNOWN and correct values of other states 2021-12-09 12:36:03 -05:00
Isaac Connor 31a1ef6cb4 Move state definitions into skin.js.php because they are used in several different views. Add STATE_UNKNOWN to match of with c++ side actual values. 2021-12-09 12:35:42 -05:00
Isaac Connor 090c803b98 Wait for closeEvent thread to finish. Fixes unfinished event when zmc told to restart 2021-12-09 12:33:59 -05:00
Isaac Connor 35bca1d89b When launching concurrent zmfilter, use the id instead of Name because Name isn't necessarily unique 2021-12-06 10:32:17 -05:00
Isaac Connor 3b84d7d82a Add --daemon to command line documentation so it ends up in man page. Fixes #3393. Improve the description and move the pod documentation to the bottom after __END__. Improve executeCommand a bit 2021-12-06 10:28:02 -05:00
Isaac Connor 1f78776093 Don't change colour of dot to warning when not Enabled and not doing analysis. Add reason to the dot 2021-12-06 09:48:44 -05:00
Isaac Connor 7b66d751d8 cleanup, spacing, use zone object methods to clean up svg zone layers 2021-12-05 17:49:24 -05:00
Isaac Connor 089c6044f1 Add layers toggle button, cleanup code by using ->canView, rename Monitor to monitor, add svg zones layer 2021-12-05 17:48:49 -05:00
Isaac Connor 76c4560c25 put svg zone styles in one files that can be included where needed 2021-12-05 17:46:25 -05:00
Isaac Connor e6a12d20c6 Add svg syles and rename imageFeed to videoFeed 2021-12-05 17:45:54 -05:00
Isaac Connor 45559123af Add numCoords, Coords, Area, AlarmRGB to Zone object. Also add Points(), AreaCoords, svg_polygon utility functions to it. 2021-12-05 17:45:26 -05:00
Isaac Connor 27e87fc21f Move all the opening of events code into one function called openEvent. 2021-12-03 13:25:50 -05:00
Isaac Connor eef172379c Move all the opening of events code into one function called openEvent. 2021-12-03 13:25:50 -05:00
Isaac Connor 1277e75278 Detect group hierarchy loops and break them. 2021-12-03 13:25:50 -05:00
Isaac Connor 5f9dcabee1
Merge pull request #3394 from petterreinholdtsen/conf-socket-comment
Make config file comment on unix socket option a bit clearer
2021-12-02 09:24:02 -05:00
Petter Reinholdtsen 5647c224d1 Make config file comment on unix socket option a bit clearer
Initially I took the comment for granted, and the 'unix_socket' string
as a magic string to tell zoneminder to use the mysql default socket.  Alas,
this do not work, as the setting really need to point to the path of the socket.
Rewrite the comment to make this more clear, and less confusing for the
future users.
2021-12-02 15:18:04 +01:00
Isaac Connor 37069cb6fc add cmake module to find libFmt 2021-11-29 18:59:44 -05:00
Isaac Connor 2b289abb95 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-11-29 18:50:52 -05:00
Isaac Connor ca42a46bb4
Merge pull request #3392 from maddios/patch-1
Fix Copy/Move to Default Storage
2021-11-29 18:39:18 -05:00
Isaac Connor 1cddac4efd remove remaining signal blocking cruft, add ignoring sigchld so that anything we spawn doesn't become a zombie. 2021-11-29 18:34:19 -05:00
Isaac Connor c927ef4b52 Aim to do db updates every 5 seconds instead of 1 second 2021-11-29 18:34:19 -05:00
Isaac Connor 11a140d48e Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-11-29 16:24:46 -05:00
Isaac Connor 1783eff58a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-11-29 16:21:40 -05:00
Isaac Connor 7b9c86111c Move Cleanup and framebuffer freeing into Close() so that we don't crash on Reload 2021-11-29 16:21:34 -05:00
Isaac Connor 65dacbc317 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2021-11-29 14:15:10 -05:00
Isaac Connor 089563d1ce rework do_debian_package to properly support the CURRENT style of snapshots and make the code a little easier to read 2021-11-29 14:14:56 -05:00
Isaac Connor 82a4cbaec5 Fix task=>action so that deleting works. Pause streaming before delete to prevent errors being logged due to missing files 2021-11-29 13:49:07 -05:00
Isaac Connor 072d181f79 Fix AlarmStartCommand => EventStartCommand 2021-11-29 13:49:07 -05:00
Isaac Connor ea6a84ae66 Fix AlarmEndCommand => EventEndCommand 2021-11-29 13:49:07 -05:00
Isaac Connor 1f19ad7c9d fix by removing code block 2021-11-29 13:49:07 -05:00
Isaac Connor 01f4aee450 Fix underline 2021-11-29 13:49:07 -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 6aaebafd17
Merge pull request #3391 from pkubaj/patch-1
Fix build on FreeBSD/armv7
2021-11-28 20:08:19 -05:00
pkubaj 74a2276671
Fix build on FreeBSD/armv7
1. FreeBSD uses elf_aux_info instead of getauxval.
2. FreeBSD uses HWCAP_NEON macro for Neon.
2021-11-29 00:03:45 +00:00
Isaac Connor ba73321628 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-11-26 19:23:12 -05:00
Isaac Connor 28d8b22377 bump version 1.37.5 2021-11-26 19:22:53 -05:00
Isaac Connor 21218491f7 Add EventStartCommand and EventEndCommand to monitors ui 2021-11-26 19:22:07 -05:00
Isaac Connor b626de50dc Add code to fork and exec EventStartCommand and EventEndCommand 2021-11-26 19:21:51 -05:00
Isaac Connor d51eb63947 Add EventStartCommand and EventEndCommand to monitors table 2021-11-26 19:21:24 -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 7468727b75 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-11-26 13:38:05 -05:00
Isaac Connor a1bf8f7f5b Fix NULL and add special 0 case for Storage area specification in filter 2021-11-26 10:35:15 -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 e8bb095730 include monitor dimensions when logging about zone mismatch 2021-11-24 14:28:31 -05:00
Isaac Connor e061f3b34a typo 2021-11-24 14:28:15 -05:00