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
5c6ba2f27f
add RTSPServer column to Monitors
2021-02-02 23:19:52 -05:00
b409407b60
redo update from 1.31.40
2021-01-27 09:58:55 -05:00
159f611274
Add Encoder if missing
2021-01-27 09:55:48 -05:00
01c74fdac3
Add RTSPStreamName to Monitors table. Bump version to 1.35.19
2021-03-01 16:46:48 -05:00
671d58f0d0
bump version and put back ZM_MIN_RTSP_PORT setting
2021-01-26 12:35:17 -05:00
db8fead52b
Add more encoder options
2020-12-29 12:18:57 -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
06ecb3ccb1
Add update script to add DecodeEnabled
2020-12-10 14:39:14 -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
b5e4d242ba
Add zm_update-1.35.15.sql that will attempt to add EndTime term to stock filters.
2020-12-03 11:23:25 -05:00
8397ec3b9d
Merge branch 'release-1.34'
2020-12-01 14:28:10 -05:00
be27630a85
escape the word Groups
2020-11-23 19:33:53 -05:00
4deb3a8d84
escape the word Groups
2020-11-23 19:31:21 -05:00
df783f4835
Merge branch 'master' into zma_to_thread
2020-11-12 12:53:55 -05:00
Isaac Connor
Isaac Connor
Kendric Evans
Arek Kossendowski