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

20140 Commits

Author SHA1 Message Date
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
Isaac Connor d7c8e32ec9 Remove non-translations 2022-02-22 08:31:41 -05:00
Isaac Connor 0da942a14b rework zm_sendfile to try again if not all bytes were sent. According to the docs, this is entirely possible. 2022-02-22 08:31:41 -05:00
Isaac Connor 88a68af775 DefaultCodec is for event view, not live 2022-02-22 08:31:41 -05:00
Isaac Connor cf7b3b9f9f DefaultCodec is for event view, not live 2022-02-22 08:31:41 -05:00
Andrew Bauer bcd590aede use rockylinux:8 container for ci workflow 2022-02-22 08:31:41 -05:00
Andrew Bauer b5e2cb4220 include arp-scan polkit files in rpm 2022-02-22 08:31:41 -05:00
Andrew Bauer 2c7e90d61d bump rpm specfile rtsp commit 
anytime the rtsp commit is bumped in packpack, it must also be bumped in the rpm specfile
 2022-02-22 08:31:41 -05:00
Isaac Connor 3a2e5a580b Debug the contents of REQUEST on every hit. 2022-02-22 08:31:41 -05:00
Isaac Connor 5aef8408a4 serialize form instead of just passing filter id because the modal can now handle unsaved filters 2022-02-22 08:31:41 -05:00
Isaac Connor b32164e992 Add handling of NOT IN and =\[\] and \!\[\] 2022-02-22 08:31:41 -05:00
Isaac Connor e523777ece Sync up n_frames, frame_count, curr_frame_id on int instead of a mix of long int, int and unsigned long int 2022-02-22 08:31:41 -05:00
Ben Dailey e4f5f59e8d 3 more img tags 2022-02-22 08:31:41 -05:00
Ben Dailey ce267c7e3c Most programmatic images are lazy. 2022-02-22 08:31:02 -05:00
Isaac Connor fc21fb643e Release lock before notify 2022-02-20 10:33:13 -05:00
Isaac Connor 02ccf13c7b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-02-20 10:32:43 -05:00
Isaac Connor b896974a29 Should get lock before testing for connected 2022-02-20 10:32:40 -05:00
Isaac Connor f4412c81d1
Merge pull request #3441 from peat-psuwit/for-upstream/dbqueue-stop-mutex 
db: fix dead lock in zmDbQueue::stop()
 2022-02-20 10:32:19 -05:00
Isaac Connor a40b305065 Merge branch 'master' into replace_function_concept 2022-02-20 09:52:03 -05:00