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

20158 Commits

Author SHA1 Message Date
Isaac Connor 69856f2b8c Delete zm_update-1.37.multistream.sql asit has been merged to 1.37.12 2022-03-04 12:09:41 -05:00
Isaac Connor 1fb42d0b77 Change api of selectLayout. Now takes a value. use MonitorStream.setScale to set image scale. In general fix behaviour when switching between fixed sizes, scales and layouts 2022-03-04 12:08:29 -05:00
Isaac Connor 920f5470a8 Don't set width&height on img. img is always 100% of container. Don't show zoom unless it is != 1.0. Only update buttons if there is a change, to reduce redraws 2022-03-04 12:07:32 -05:00
Isaac Connor 0c31e35b4e Add classes to fields of monitor status so we can style them as needed 2022-03-04 12:06:49 -05:00
Isaac Connor 9b9746113e If we asked for stream, keep streaming even not decoding or other problem. We will wait for the situation to change 2022-03-04 12:06:24 -05:00
Isaac Connor 494da65b9a Replace use of Function with Recording 2022-02-28 15:46:38 -05:00
Isaac Connor 7283f8629a Function dropdown no longer exists 2022-02-28 15:44:15 -05:00
Isaac Connor addfdcd330 Remove sets::isin references 2022-02-28 15:41:57 -05:00
Isaac Connor eee6053293 Only startup a new event if recording==ALWAYS 2022-02-28 13:35:11 -05:00
Isaac Connor 433782bd6e disable yellow dot when analysing turned off. Enabled is gone... need to do a more interesting check 2022-02-28 13:34:51 -05:00
Isaac Connor 980aaa5942 Fix case of recording events when Recording==NONE 2022-02-28 12:10:14 -05:00
Isaac Connor e31b18a1a6 Use a define to disable y-channel use 2022-02-28 12:02:09 -05:00
Isaac Connor a32b77510d Fix logic on error reporting of failure to connect to db 2022-02-28 09:38:54 -05:00
Isaac Connor 7ef9824736 Handle NoDect case 2022-02-28 09:11:48 -05:00
Isaac Connor 1ae8fcae63 add a label for rateControl 2022-02-27 14:31:04 -05:00
Isaac Connor 5b319258c4 fix eslint 2022-02-27 14:26:05 -05:00
Isaac Connor abb8aa5da5 bump version for function replacement 2022-02-27 14:17:14 -05:00
Isaac Connor 3b9d13eb8e rename to 1.37.12 and add missing updates for other functions 2022-02-27 14:16:40 -05:00
Isaac Connor cf31db0bad Merge branch 'master' into replace_function_concept 2022-02-27 14:05:34 -05:00
Isaac Connor 133553e630 Revert "Merge pull request #3119 from Carbenium/fmt" 
This reverts commit 90d930c7c3, reversing
changes made to 0bcb9d276f.
 2022-02-27 14:05:14 -05:00
Isaac Connor e33b41745d Merge branch 'master' into replace_function_concept 2022-02-27 14:04:01 -05:00
Isaac Connor 1d15de0534 Make getMonitorCapturingOptions a member of the class, so can call it getCapturingOptions. Same with Analysing and Recording options 2022-02-27 14:03:48 -05:00
Isaac Connor 13251b133a Make getMonitorCapturingOptions a member of the class, so can call it getCapturingOptions. Same with Analysing and Recording options 2022-02-27 14:03:37 -05:00
Isaac Connor 46c43ca508 Revert "Fix fmt=>Fmt and add it's libs to list of libraries to link to" 
This reverts commit d5101ef32a.
 2022-02-27 13:46:52 -05:00
Isaac Connor c5b9ed9451 Revert "Fix zms build" 
This reverts commit e6b36bb186.
 2022-02-27 13:46:51 -05:00
Isaac Connor 57da477f69 Revert "Install fmt-devel" 
This reverts commit fad152e93d.
 2022-02-27 13:46:50 -05:00
Isaac Connor c3485a6840 Revert "Add libfmt-dev" 
This reverts commit d8eaaa4a50.
 2022-02-27 13:46:32 -05:00
Isaac Connor d8eaaa4a50 Add libfmt-dev 2022-02-27 11:07:10 -05:00
Isaac Connor fad152e93d Install fmt-devel 2022-02-27 10:53:07 -05:00
Isaac Connor e6b36bb186 Fix zms build 2022-02-27 10:41:42 -05:00
Isaac Connor d5101ef32a Fix fmt=>Fmt and add it's libs to list of libraries to link to 2022-02-27 10:41:40 -05:00
Isaac Connor 90d930c7c3
Merge pull request #3119 from Carbenium/fmt 
Add fmt library for type-safe string formatting
 2022-02-27 10:37:41 -05:00
Isaac Connor 47fae7a296 spacing, improve debug 2022-02-26 19:18:28 -05:00
Isaac Connor 0bcb9d276f code style. 2022-02-26 18:25:51 -05:00
Isaac Connor 914581bc57 add libavdevice-dev and libgsoap-dev to build 2022-02-26 18:25:51 -05:00
Isaac Connor 2bd85089f4 Put integers in quotes as well. Proper JSON has all values in quotes. This is important because integers like 0123 are invalid 2022-02-26 18:25:51 -05:00
Isaac Connor cad57df0bb
Merge branch 'master' into fmt 2022-02-26 13:56:20 -05:00
Isaac Connor 6fc5803e16 Add another clearInterval to prevent looping during window.location 2022-02-25 15:54:56 -05:00
Isaac Connor 9b0714d20d Fix use of value instead of val in filter term 2022-02-25 14:14:02 -05:00
Isaac Connor 813fd36b0a clearInterval when location.replacing so that timer stops. Prevents infinite loop 2022-02-25 14:13:18 -05:00
Isaac Connor 372e493b9c
Merge pull request #3442 from BHMSD-bdailey/lazy-load-images 
Lazy load images
 2022-02-22 08:57:49 -05:00
Ben Dailey b2428b5522 Merge branch 'master' into lazy-load-images 2022-02-22 08:47:26 -05:00
Isaac Connor 831dca814f Include EndDateTimeShort in event stats 2022-02-22 08:31:41 -05:00
Isaac Connor dfb6a96b42 Handle empty endtime more gracefully. If there is a next event just jump to it. 2022-02-22 08:31:41 -05:00
Isaac Connor 959b08f46a Include EndDateTimeShort in event ajax response 2022-02-22 08:31:41 -05:00
Isaac Connor 347d3c08b6 Spacing, remove dead code, add comments. When implementing CLOSE_ALARM mode, check Alarm Frames against alarm_frame_count instead of 0. 2022-02-22 08:31:41 -05:00
Isaac Connor 968acc2d43 Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed. 2022-02-22 08:31:41 -05:00
Isaac Connor 26d89292d7 Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed. 2022-02-22 08:31:41 -05:00
Isaac Connor e9b3269278 cleanup and add fallback to read/write if no sendfile support. 2022-02-22 08:31:41 -05:00
Isaac Connor 00b4ed9c53 Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed. Use new reworked zm_sendfile and handle if not all bytes are sent. Fixes #3437. 2022-02-22 08:31:41 -05:00