d1cd7d3f91
Merge branch 'master' into add_janus_rtsp_user
2022-09-14 18:34:07 -04:00
f5ad68143c
Add Janus_RTSP_USer to Monitors
2022-09-12 10:33:51 -04:00
e24432ee4d
Merge branch 'master' into reports
2022-08-30 19:40:14 +02:00
85e897f211
move generic update script to version specific
2022-08-25 20:33:58 -04:00
29750a56e7
Merge branch 'master' into add_mqtt
2022-08-25 18:37:54 -04:00
d41792ae00
Adds Janus options Profile-ID Override and Use RTSP Restream to work around camera issues
2022-08-09 00:54:41 -05:00
5405ebdaa8
Replace the Event index with an eventId,ZoneId index, which mysql will actually use to speed up the subquery for AlarmedZone
2022-08-05 10:53:25 -04:00
b4000ef0c7
Add Reports table creation
2022-08-04 09:34:06 -04:00
a34db8bc38
Don't hardcode db in upgrade script.
2022-07-27 12:25:57 -04:00
a3395df49f
Rename ONVIF_Alarm_Txt to ONVIF_Alarm_Text
2022-07-23 16:07:45 -04:00
d2d5b6e489
Add ONVIF_Alarm_text to zm_create.sql
2022-07-23 16:07:13 -04:00
981769b9db
Allows users to set an specific "Onvif alarm text" for each monitor ( #3535 )
...
* Allows users to set an specific "Onvif alarm text" for each monitor
With this personalization the cameras that use strings different to "MotionAlarm"
such as Dahua, will be able to process their Onvif alarms. To make it easier, the change
sets a default "Alarm Text" value for it to work out of the box and then allows to
modify it according to the particular necessities of each brand. It consists of
a new column on table Monitors, changes on Monitors.h, Monitors.cpp and a change
on UI to manage the value of Alarm Text per camera.
Updated es_la.php language file.
Co-authored-by: ovargasp <ovargasp@hoitmail.com>
2022-07-20 12:51:13 -05:00
a617a70620
Add UserId to MontageLayouts
2022-07-12 17:33:34 -04:00
b298b46b5e
Add UserId to MontageLayouts
2022-07-12 17:30:25 -04:00
223a46393e
Add AnalysisImage to Monitor
2022-06-15 11:34:20 -04:00
61fc107808
Fix Analysis remaining turned on for Monitor and NoDect
2022-05-17 14:03:04 -04:00
997c1197cf
Implement decoding=Keyframes + OnDemand
2022-05-10 14:25:34 -04:00
e297bfcfd4
Add System to Config table
2022-05-04 12:58:14 -04:00
1852694a50
Add webm to output containers
2022-04-29 18:39:54 -04:00
32109697d2
Add update for add Decoding to Monitors
2022-03-28 16:22:18 -04:00
a6193bba0e
Fill in Protocol of HikVision control
2022-03-28 14:40:21 -04:00
08332c9be5
add update file for MQTT columns
2022-03-21 16:09:29 -04:00
d8a2d712b5
Put back MQTT_Enabled in Monitors
2022-03-21 16:09:29 -04:00
b23842021c
Add MQTT_Subscriptions to Monitors
2022-03-21 16:08:13 -04:00
69856f2b8c
Delete zm_update-1.37.multistream.sql asit has been merged to 1.37.12
2022-03-04 12:09:41 -05:00
7ef9824736
Handle NoDect case
2022-02-28 09:11:48 -05:00
3b9d13eb8e
rename to 1.37.12 and add missing updates for other functions
2022-02-27 14:16:40 -05:00
10e39b3b13
:wqMerge branch 'master' into replace_function_concept
2022-02-02 17:08:01 -05:00
e69095a9b4
Fix == to =
2022-02-01 17:22:23 -05:00
23bfbcd6ce
Merge branch 'master' into multistream
2022-01-26 10:13:20 -05:00
ec9403fb6f
Adds Amcrest On-camera Motion Detection
2022-01-25 22:38:00 -06:00
35efb111ac
Add Private to Config
2022-01-22 12:30:59 -05:00
fb832e7d1b
Adds janus_enable_audio, a switch to try to enable audio in live stream viewing.
2022-01-19 00:14:52 -06:00
3835087c9d
Merge branch 'master' into multistream
2022-01-18 20:16:08 -05:00
71c7b324e9
Update new Capturing, Analysing, Recording based on Function.
2022-01-11 12:01:07 -05:00
3a9c16aeea
First working Janus build
2022-01-10 23:22:37 -06:00
fd3a70172d
Merge branch 'master' into multistream
2022-01-10 17:51:50 -05:00
701045393c
fix typo
2022-01-10 09:07:59 -05:00
1333d8c751
Adds ONVIF Motion Detection Support
2022-01-06 16:45:15 -06:00
aefed4e174
Merge branch 'master' into multistream
2022-01-05 18:03:44 -05:00
6bd04de5f6
Merge branch 'master' into multistream
2021-12-31 17:53:36 -05:00
f9f8764507
Change Event->Cause to a TEXT instead of varchar(32) because we now inclue Alarmed Zone name and could include other info as well.
...
Fixes #3403
2021-12-28 12:33:03 -05:00
9733cdb576
Update zm_update-1.35.25.sql
2021-12-13 21:07:35 -05:00
e2df6e5074
Add ExecuteInterval to Filters
2021-12-13 15:00:03 -05:00
072d181f79
Fix AlarmStartCommand => EventStartCommand
2021-11-29 13:49:07 -05:00
ea6a84ae66
Fix AlarmEndCommand => EventEndCommand
2021-11-29 13:49:07 -05:00
d51eb63947
Add EventStartCommand and EventEndCommand to monitors table
2021-11-26 19:21:24 -05:00
0a30c55042
install manufacturers.sql and models.sql
2021-11-18 11:09:49 -05:00
f63c124988
include manufacturers and models
2021-11-18 09:55:39 -05:00
18610fd601
Add an update script that includes manufacturers and models
2021-11-18 09:55:19 -05:00
Isaac Connor
Isaac Connor
Jonathan Bennett
Doug Nazar
ovargasp
makers-mark