Isaac Connor
83b6ae37a9
Deal with missing monitors by dropping the foreign key and adding it back after creating Monitor Permissions
2022-11-19 07:47:09 -05:00
Isaac Connor
6f8ce1343f
Fix Monitor Permission updating. If monitors are specified, they default to View even if MOnitors is set to None.
2022-11-15 15:00:27 -05:00
Isaac Connor
f37786bb2a
Remove quotes from line inserting values into Monitor_Permissions
2022-11-03 16:57:16 -04:00
Isaac Connor
12d5748c1c
Fi test for Groups_Permissions_GroupId_UserId_idx
2022-11-03 11:14:23 -04:00
Isaac Connor
20f01b6953
Remove command to drop Groups_Permissions
2022-11-03 09:30:07 -04:00
Isaac Connor
5106d2aaa4
Move db updates for Groups and Monitor Permissions into place, and bump version it gets picked up
2022-11-03 07:49:44 -04:00
Isaac Connor
6265a1ca41
Move from MonitorIds to Monitor_Permissions and Group_Permissions.
2022-11-02 13:25:43 -04:00
Isaac Connor
7ff928dcf8
Make the primary index on Groups_Permissions a unique index to ensure that the GroupId/UserId mapping is unique. Add Monitor_Permissions
2022-11-02 13:24:26 -04:00
Isaac Connor
893b86ee96
Make the primary index on Monitors_Permissions a unique index to ensure that the MOnitorId/UserId mapping is unique.
2022-11-02 13:24:26 -04:00
Isaac Connor
76f804dadd
Add Permission enum to Groups_Permissions
2022-11-02 12:37:16 -04:00
Isaac Connor
3775be599e
Add Groups_Permissions table
2022-11-02 12:36:42 -04:00
Isaac Connor
cd4a9fbb98
Merge ../ZoneMinder.connortechnology
2022-10-31 18:01:04 -04:00
Isaac Connor
1c38e79c1b
Add Reports table. Also set ENGINE for other tables that were hard coded to InnoDb. Fixes #3615
2022-10-31 09:29:50 -04:00
Isaac Connor
f0a1a1b0ee
Merge branch 'master' into add_event_data
2022-10-27 17:08:12 -04:00
Isaac Connor
a25436369f
Add db update to create Event_Data table
2022-10-27 14:17:24 -04:00
Isaac Connor
ac55528f8f
Untested change to use TIMESTAMP instead of DATETIME for Monitor_Status/UpdatedOn. This is for mysql 5.5.
2022-10-27 10:56:11 -04:00
Isaac Connor
196ae7cf89
Add UpdatedOn field to Monitor_Status
2022-10-12 19:12:36 -04:00
Isaac Connor
d1cd7d3f91
Merge branch 'master' into add_janus_rtsp_user
2022-09-14 18:34:07 -04:00
Isaac Connor
f5ad68143c
Add Janus_RTSP_USer to Monitors
2022-09-12 10:33:51 -04:00
Isaac Connor
e24432ee4d
Merge branch 'master' into reports
2022-08-30 19:40:14 +02:00
Isaac Connor
85e897f211
move generic update script to version specific
2022-08-25 20:33:58 -04:00
Isaac Connor
29750a56e7
Merge branch 'master' into add_mqtt
2022-08-25 18:37:54 -04:00
Jonathan Bennett
d41792ae00
Adds Janus options Profile-ID Override and Use RTSP Restream to work around camera issues
2022-08-09 00:54:41 -05:00
Isaac Connor
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
Isaac Connor
b4000ef0c7
Add Reports table creation
2022-08-04 09:34:06 -04:00
Doug Nazar
a34db8bc38
Don't hardcode db in upgrade script.
2022-07-27 12:25:57 -04:00
Isaac Connor
a3395df49f
Rename ONVIF_Alarm_Txt to ONVIF_Alarm_Text
2022-07-23 16:07:45 -04:00
Isaac Connor
d2d5b6e489
Add ONVIF_Alarm_text to zm_create.sql
2022-07-23 16:07:13 -04:00
ovargasp
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
Isaac Connor
a617a70620
Add UserId to MontageLayouts
2022-07-12 17:33:34 -04:00
Isaac Connor
b298b46b5e
Add UserId to MontageLayouts
2022-07-12 17:30:25 -04:00
Isaac Connor
223a46393e
Add AnalysisImage to Monitor
2022-06-15 11:34:20 -04:00
Isaac Connor
61fc107808
Fix Analysis remaining turned on for Monitor and NoDect
2022-05-17 14:03:04 -04:00
Isaac Connor
997c1197cf
Implement decoding=Keyframes + OnDemand
2022-05-10 14:25:34 -04:00
Isaac Connor
e297bfcfd4
Add System to Config table
2022-05-04 12:58:14 -04:00
Isaac Connor
1852694a50
Add webm to output containers
2022-04-29 18:39:54 -04:00
Isaac Connor
32109697d2
Add update for add Decoding to Monitors
2022-03-28 16:22:18 -04:00
Isaac Connor
a6193bba0e
Fill in Protocol of HikVision control
2022-03-28 14:40:21 -04:00
Isaac Connor
08332c9be5
add update file for MQTT columns
2022-03-21 16:09:29 -04:00
Isaac Connor
d8a2d712b5
Put back MQTT_Enabled in Monitors
2022-03-21 16:09:29 -04:00
Isaac Connor
b23842021c
Add MQTT_Subscriptions to Monitors
2022-03-21 16:08:13 -04:00
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
7ef9824736
Handle NoDect case
2022-02-28 09:11:48 -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
10e39b3b13
:wqMerge branch 'master' into replace_function_concept
2022-02-02 17:08:01 -05:00
Isaac Connor
e69095a9b4
Fix == to =
2022-02-01 17:22:23 -05:00
Isaac Connor
23bfbcd6ce
Merge branch 'master' into multistream
2022-01-26 10:13:20 -05:00
Jonathan Bennett
ec9403fb6f
Adds Amcrest On-camera Motion Detection
2022-01-25 22:38:00 -06:00
Isaac Connor
35efb111ac
Add Private to Config
2022-01-22 12:30:59 -05:00
Jonathan Bennett
fb832e7d1b
Adds janus_enable_audio, a switch to try to enable audio in live stream viewing.
2022-01-19 00:14:52 -06:00
