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
f0a1a1b0ee
Merge branch 'master' into add_event_data
2022-10-27 17:08:12 -04:00
a25436369f
Add db update to create Event_Data table
2022-10-27 14:17:24 -04:00
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
196ae7cf89
Add UpdatedOn field to Monitor_Status
2022-10-12 19:12:36 -04:00
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
f48511acba
Add NULL for ModelId column when adding MonitorPresets.
2021-11-16 09:19:42 -05:00
6cbc4c0a7a
Update MonirorPresets to link to Amcrest cams
2021-11-15 16:30:39 -05:00
4e9a56624d
Use UPSERTS and add some more models
2021-11-15 16:30:17 -05:00
e63222d733
Add IGNORE so it does UPSERT
2021-11-15 16:30:03 -05:00
d00430f799
Add ModelId to MonitorPresets
2021-11-15 09:47:11 -05:00
dc756ad670
add back update for Manufacturers and Models
2021-11-10 19:20:39 -05:00
9d71f1192a
merge manufacturer update into existing zm_update-1.37.2 and then move it to .in
2021-11-10 19:18:16 -05:00
1fd99424bb
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-11-05 10:13:41 -04:00
4351f51929
Fix logic ordering in 1.35.14 updated that moves columns from Monitors table to Monitor_Status
2021-10-20 13:14:04 -04:00
c81f3d9c61
add Capturing, Analysing, AnalysisSource, Recording, RecordingSource to Monitors
2021-10-16 20:37:16 -04:00
64ab429519
Correct definition of Importance. Want less importance to have a hgiher value. Make not null.
2021-10-13 16:05:49 -04:00
9cf4e89254
add update to 1.37.3
2021-09-27 11:03:16 -04:00
227e5794fa
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-09-08 18:32:46 -04:00
89d7685b14
Change Montage Layouts to reset width when choosing Freeform. Use full width instead of slightly less. I think at some point I fixed our layout so that we can use 25% instead of 24.5% etc.
2021-08-19 15:42:39 -04:00
cb4e17e49a
Merge branch 'release-1.36'
2021-08-09 10:27:24 -04:00
413ac984eb
add models.sql
2021-07-07 09:48:24 -04:00
8df915e7a4
Fix merge.
2021-07-07 09:45:53 -04:00
cc486beed5
Add some Acti models
2021-07-07 09:45:23 -04:00
95263d148d
Rename zm_update-1.35.29.sql zm_update-1.36.6.sql so that it gets picked up.
2021-07-05 10:35:26 -04:00
271c59c24f
Updating the size of the Longitude field
...
To address https://github.com/ZoneMinder/zoneminder/issues/3311
2021-07-05 10:34:24 -04:00
2b6d54fd81
move db update script so it gets used. Bump version to 1.37.1 for db update
2021-07-05 09:33:03 -04:00
6373ef9be7
move db update script so it gets used. Bump version to 1.37.1 for db update
2021-07-05 09:32:39 -04:00
7e8a064725
Updating the size of the Longitude field
...
To address https://github.com/ZoneMinder/zoneminder/issues/3311
2021-07-02 16:11:34 -06:00
829708f8f2
Change SQL to add Controls for ONVIF camera, Foscam 9831W and 8918W to specify columns so that if other columns are present the sql still executes. Fixes #3260
2021-05-28 10:24:13 -04:00
16cc69ca2b
Change SQL to add Controls for ONVIF camera, Foscam 9831W and 8918W to specify columns so that if other columns are present the sql still executes. Fixes #3260
2021-05-28 10:23:42 -04:00
da8128aba1
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-05-07 19:16:35 -04:00
e514c77e90
Change encoder to a text field. enums will be too much of a hassle
2021-05-05 14:09:22 -04:00
c539969faa
Cleanup
2021-04-23 14:52:29 -04:00
8a59d60854
add ModectDuringPTZ to Monitors
2021-04-23 14:52:29 -04:00
bd65420c07
Specify columns when inserting admin user. Add Snapshots column
2021-04-14 13:00:16 -04:00
7e579fd851
Implement Snapshots user permission
2021-04-12 15:59:31 -04:00
ed29021179
Rough in an importance setting in monitor that we can use to decrease the log level of certain events like PrimeCapture for cameras that we don't care about
2021-04-11 12:59:18 -04:00
6319ea887c
Need to install generate update script
2021-04-09 21:55:07 -04:00
35b3d236e0
Fix typo in triggers
2021-04-09 19:47:08 -04:00
4e5ef01156
Fixup event summary column population, update triggers
2021-04-09 16:46:36 -04:00
c5ca123042
Move event summaries to their own table to reduce contention on Monitor_Status
2021-04-09 10:16:16 -04:00
9f5bc8b2b9
Merge pull request #3174 from akeyx/3173-bugfix-fix-onvif-control
...
3173 bugfix fix onvif control
2021-03-30 18:38:00 -04:00
dedf42371b
copy onvif.pm which isn't actually onvif to FoscamCGI.pm We will later replace onvif.pm with an Actual onvif implementation.
2021-03-30 18:32:42 -04:00
569efd8471
Add MaxImageBufferCount and udpate values as appropriate in update script
2021-03-26 14:32:06 -04:00
7db3895458
Fix default user creation after we added HomeView column
2021-03-14 20:11:13 -04:00
11c2318a05
Rough in the ui for Snapshots
2021-03-12 09:28:05 -05:00
620806a1bf
Add Snapshots and Snapshot_Events Tables. Add HomeView to Users.
2021-03-12 09:26:13 -05:00
95fe689d58
WIP, rabbit hole too deep
2021-03-03 09:55:57 -05:00
0eab9987fc
Just updated the script with moveMap and moveRel functions.
2021-02-26 00:11:29 +00:00
36f11158df
Replaced the onvif control module with a modified version of Netcat.
...
The original onvif module was NOT at all ONVIF protocol implementation.
This one pretty much copies the Netcat module but with a bit of clarity
to the XML that is sent to the camera but most importantly allows
specification of full onvif URL including authentication and control URI
through the Control Address field. Parsing of the url is done through a
combination of sane defaults and the URI module.
2021-02-25 22:37:34 +00:00
Isaac Connor
Isaac Connor
Jonathan Bennett
Doug Nazar
ovargasp
makers-mark
Kendric Evans
Arek Kossendowski