10e39b3b13
:wqMerge branch 'master' into replace_function_concept
2022-02-02 17:08:01 -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
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
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
e2df6e5074
Add ExecuteInterval to Filters
2021-12-13 15:00:03 -05:00
d51eb63947
Add EventStartCommand and EventEndCommand to monitors table
2021-11-26 19:21:24 -05:00
f63c124988
include manufacturers and models
2021-11-18 09:55:39 -05:00
f48511acba
Add NULL for ModelId column when adding MonitorPresets.
2021-11-16 09:19:42 -05:00
d00430f799
Add ModelId to MonitorPresets
2021-11-15 09:47:11 -05:00
1fd99424bb
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-11-05 10:13:41 -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
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
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
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
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
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
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
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
5c6ba2f27f
add RTSPServer column to Monitors
2021-02-02 23:19:52 -05:00
01c74fdac3
Add RTSPStreamName to Monitors table. Bump version to 1.35.19
2021-03-01 16:46:48 -05:00
284b9f963f
Merge branch 'master' into zma_to_thread
2020-12-29 12:18:26 -05:00
0702b64cc4
Merge branch 'master' into zma_to_thread
2020-12-15 10:51:40 -05:00
42ab098764
Add DecodingEnabled to Monitors
2020-12-10 14:06:16 -05:00
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
8ddde0d377
Update stock PurgeWhenFull and UpdateDiskSpace filters to add EndTime terms. Add FOREIGN KEYS to Groups_Monitors and Groups.ParentId
2020-12-03 13:11:24 -05:00
df783f4835
Merge branch 'master' into zma_to_thread
2020-11-12 12:53:55 -05:00
63c78b43f8
Change event stats to Monitor_Status
2020-11-06 13:27:00 -05:00
adbd3486bf
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:49:39 -05:00
903c6a2d5a
Add EndTime IS NOT NULL to UpdateDiskSpace Filter
2020-11-03 08:41:57 -05:00
432ae9894b
Add EndTime IS NOT NULL to PurgeWhenFull Filter
2020-11-03 08:34:41 -05:00
858674c0b2
Merge branch 'master' into filter_locking
2020-10-28 12:52:52 -04:00
Isaac Connor
Isaac Connor
Jonathan Bennett
Kendric Evans
Arek Kossendowski