Merge pull request #3450 from gonzalezcalleja/fix_zmpkg
master
Isaac Connor
2022-03-08 11:21:00 -0500
858ab62fc4Fix when using a custom state
Javier Gonzalez
2022-03-08 17:10:29 +0100
05b5ca9b15Merge branch 'master' of github.com:ZoneMinder/zoneminder
Isaac Connor
2022-03-08 09:06:37 -0500
0785e3571ccode style, remove duplicated code.
Isaac Connor
2022-03-08 09:06:31 -0500
a748b0ed0aWhen connecting to a monitor, if it fails, disconnect. This should fix a bug in zmtrigger and others where it would never reconnect. The idea is that we asked for a successful connection, if it failed, we shouldn't be in a failed connected state, we should be disconnected.
Isaac Connor
2022-03-08 09:06:06 -0500
8fe0cb5e33tidy up the mem_info hash and turn into a hash instead of a pointer to a hash. Check for validity flah before checking sizes. Improve debug logging.
Isaac Connor
2022-03-08 09:04:41 -0500
Merge pull request #3449 from jp-bennett/master
Isaac Connor
2022-03-05 12:48:47 -0500
9f4df40ac5Add rtsp_quirk to Janus mountpoints. Workaround for Vivotek and possibly other cameras that use nonstandard RTSP URIs,
Jonathan Bennett
2022-03-04 20:40:56 -0600
10402fdabeUse template backticks for the Notes string to handle multi-line
Isaac Connor
2022-03-04 13:41:19 -0500
8db08f5a10Merge branch 'master' of github.com:ZoneMinder/zoneminder
Isaac Connor
2022-03-04 12:09:44 -0500
69856f2b8cDelete zm_update-1.37.multistream.sql asit has been merged to 1.37.12
Isaac Connor
2022-03-04 12:09:41 -0500
1fb42d0b77Change 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
Isaac Connor
2022-03-04 12:08:29 -0500
920f5470a8Don'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
Isaac Connor
2022-03-04 12:07:32 -0500
0c31e35b4eAdd classes to fields of monitor status so we can style them as needed
Isaac Connor
2022-03-04 12:06:49 -0500
9b9746113eIf we asked for stream, keep streaming even not decoding or other problem. We will wait for the situation to change
Isaac Connor
2022-03-04 12:06:24 -0500
1d15de0534Make getMonitorCapturingOptions a member of the class, so can call it getCapturingOptions. Same with Analysing and Recording options
Isaac Connor
2022-02-27 14:03:48 -0500
13251b133aMake getMonitorCapturingOptions a member of the class, so can call it getCapturingOptions. Same with Analysing and Recording options
Isaac Connor
2022-02-27 14:03:37 -0500
46c43ca508Revert "Fix fmt=>Fmt and add it's libs to list of libraries to link to"
Isaac Connor
2022-02-27 13:46:52 -0500
c5b9ed9451Revert "Fix zms build"
Isaac Connor
2022-02-27 13:46:51 -0500
57da477f69Revert "Install fmt-devel"
Isaac Connor
2022-02-27 13:46:50 -0500
c3485a6840Revert "Add libfmt-dev"
Isaac Connor
2022-02-27 13:46:32 -0500
d8eaaa4a50Add libfmt-dev
Isaac Connor
2022-02-27 11:07:10 -0500
fad152e93dInstall fmt-devel
Isaac Connor
2022-02-27 10:53:07 -0500
e6b36bb186Fix zms build
Isaac Connor
2022-02-27 10:39:21 -0500
d5101ef32aFix fmt=>Fmt and add it's libs to list of libraries to link to
Isaac Connor
2022-02-27 10:38:15 -0500
Merge pull request #3119 from Carbenium/fmt
Isaac Connor
2022-02-27 10:37:41 -0500
47fae7a296spacing, improve debug
Isaac Connor
2022-02-26 19:18:28 -0500
0bcb9d276fcode style.
Isaac Connor
2022-02-26 18:25:46 -0500
914581bc57add libavdevice-dev and libgsoap-dev to build
Isaac Connor
2022-02-26 15:12:40 -0500
2bd85089f4Put integers in quotes as well. Proper JSON has all values in quotes. This is important because integers like 0123 are invalid
Isaac Connor
2022-02-26 11:56:29 -0500
Merge pull request #3442 from BHMSD-bdailey/lazy-load-images
Isaac Connor
2022-02-22 08:57:49 -0500
b2428b5522Merge branch 'master' into lazy-load-images
Ben Dailey
2022-02-22 08:47:26 -0500
831dca814fInclude EndDateTimeShort in event stats
Isaac Connor
2022-02-17 13:31:25 -0500
dfb6a96b42Handle empty endtime more gracefully. If there is a next event just jump to it.
Isaac Connor
2022-02-17 13:30:50 -0500
959b08f46aInclude EndDateTimeShort in event ajax response
Isaac Connor
2022-02-17 13:30:01 -0500
347d3c08b6Spacing, remove dead code, add comments. When implementing CLOSE_ALARM mode, check Alarm Frames against alarm_frame_count instead of 0.
Isaac Connor
2022-02-16 17:27:12 -0500
968acc2d43Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed.
Isaac Connor
2022-02-16 14:18:37 -0500
26d89292d7Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed.
Isaac Connor
2022-02-16 14:16:46 -0500
e9b3269278cleanup and add fallback to read/write if no sendfile support.
Isaac Connor
2022-02-16 14:16:25 -0500
00b4ed9c53Rework 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.
Isaac Connor
2022-02-16 14:16:01 -0500
d7c8e32ec9Remove non-translations
Isaac Connor
2022-02-16 09:59:39 -0500
0da942a14brework zm_sendfile to try again if not all bytes were sent. According to the docs, this is entirely possible.
Isaac Connor
2022-02-16 09:59:23 -0500
88a68af775DefaultCodec is for event view, not live
Isaac Connor
2022-02-16 09:28:58 -0500
cf7b3b9f9fDefaultCodec is for event view, not live
Isaac Connor
2022-02-16 09:28:21 -0500
bcd590aedeuse rockylinux:8 container for ci workflow
Andrew Bauer
2022-02-16 08:33:44 -0600
b5e2cb4220include arp-scan polkit files in rpm
Andrew Bauer
2022-02-16 08:22:37 -0600
2c7e90d61dbump rpm specfile rtsp commit
Andrew Bauer
2022-02-16 07:54:01 -0600
3a2e5a580bDebug the contents of REQUEST on every hit.
Isaac Connor
2022-02-15 18:52:40 -0500
5aef8408a4serialize form instead of just passing filter id because the modal can now handle unsaved filters
Isaac Connor
2022-02-15 18:52:27 -0500
b32164e992Add handling of NOT IN and =\[\] and \!\[\]
Isaac Connor
2022-02-15 18:51:54 -0500
e523777eceSync up n_frames, frame_count, curr_frame_id on int instead of a mix of long int, int and unsigned long int
Isaac Connor
2022-02-15 18:51:10 -0500
e4f5f59e8d3 more img tags
Ben Dailey
2022-02-15 13:04:56 -0500
ce267c7e3cMost programmatic images are lazy.
Ben Dailey
2022-02-15 13:00:26 -0500
Merge pull request #3441 from peat-psuwit/for-upstream/dbqueue-stop-mutex
Isaac Connor
2022-02-20 10:32:19 -0500
a40b305065Merge branch 'master' into replace_function_concept
Isaac Connor
2022-02-20 09:52:03 -0500
ebe502a747db: fix dead lock in zmDbQueue::stop()
Ratchanan Srirattanamet
2022-02-20 09:58:03 +0000
fe69261f10Include MonitorId as second argument of EventStartCommand and EventEndCOmmand at @baudneo's request.
Isaac Connor
2022-02-19 15:33:05 -0500
dc8f1bc8edSet shared_data->score before state transitions so that linked monitors pick it up. Should help with missed linked events
Isaac Connor
2022-02-18 17:44:23 -0500
fc541ac57dfix potential double lock of jpeg mutex
Isaac Connor
2022-02-18 17:11:02 -0500
1a54a96c04Improve title on alarm buttons when we don't have permission. Move onclick from data-on-click to setup in initPage only if permitted
Isaac Connor
2022-02-18 17:09:24 -0500
002b2c39aafix button assignments. Don't abort ajax, as it might be important
Isaac Connor
2022-02-18 17:08:40 -0500
28f3cb18e4Make std function warning into a debug. Warning will happen if they are actually used
Isaac Connor
2022-02-18 15:59:00 -0500
aaf391fc65Include EndDateTimeShort in event ajax response
Isaac Connor
2022-02-17 13:30:01 -0500
8822463ac7Handle empty endtime more gracefully. If there is a next event just jump to it.
Isaac Connor
2022-02-17 13:30:50 -0500
9cc17024c5Include EndDateTimeShort in event stats
Isaac Connor
2022-02-17 13:31:25 -0500
adf8413333Include EndDateTimeShort in event stats
Isaac Connor
2022-02-17 13:31:25 -0500
8dedac1a21Handle empty endtime more gracefully. If there is a next event just jump to it.
Isaac Connor
2022-02-17 13:30:50 -0500
909c0e903fInclude EndDateTimeShort in event ajax response
Isaac Connor
2022-02-17 13:30:01 -0500
1983801004Merge branch 'master' into replace_function_concept
Isaac Connor
2022-02-16 18:49:01 -0500
b9e6cf8038Spacing, remove dead code, add comments. When implementing CLOSE_ALARM mode, check Alarm Frames against alarm_frame_count instead of 0.
Isaac Connor
2022-02-16 17:27:12 -0500
zhiyang7
Isaac Connor
Javier Gonzalez
Isaac Connor
Jonathan Bennett
Ben Dailey
Andrew Bauer
Ratchanan Srirattanamet