mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-31 20:23:20 -04:00
Code Issues Packages Projects Releases Wiki Activity
19,928 Commits 80 Branches 104 Tags
2f5a403fc4a54ecefbb7f832bef7900a08c24baf
Commit Graph

948 Commits

Author SHA1 Message Date
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
Jonathan Bennett
3a9c16aeea First working Janus build 2022-01-10 23:22:37 -06:00
Isaac Connor
701045393c fix typo 2022-01-10 09:07:59 -05:00
Jonathan Bennett
1333d8c751 Adds ONVIF Motion Detection Support 2022-01-06 16:45:15 -06:00
Isaac Connor
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
makers-mark
9733cdb576 Update zm_update-1.35.25.sql 2021-12-13 21:07:35 -05:00
Isaac Connor
e2df6e5074 Add ExecuteInterval to Filters 2021-12-13 15:00:03 -05:00
Isaac Connor
072d181f79 Fix AlarmStartCommand => EventStartCommand 2021-11-29 13:49:07 -05:00
Isaac Connor
ea6a84ae66 Fix AlarmEndCommand => EventEndCommand 2021-11-29 13:49:07 -05:00
Isaac Connor
d51eb63947 Add EventStartCommand and EventEndCommand to monitors table 2021-11-26 19:21:24 -05:00
Isaac Connor
0a30c55042 install manufacturers.sql and models.sql 2021-11-18 11:09:49 -05:00
Isaac Connor
f63c124988 include manufacturers and models 2021-11-18 09:55:39 -05:00
Isaac Connor
18610fd601 Add an update script that includes manufacturers and models 2021-11-18 09:55:19 -05:00
Isaac Connor
f48511acba Add NULL for ModelId column when adding MonitorPresets. 2021-11-16 09:19:42 -05:00
Isaac Connor
6cbc4c0a7a Update MonirorPresets to link to Amcrest cams 2021-11-15 16:30:39 -05:00
Isaac Connor
4e9a56624d Use UPSERTS and add some more models 2021-11-15 16:30:17 -05:00
Isaac Connor
e63222d733 Add IGNORE so it does UPSERT 2021-11-15 16:30:03 -05:00
Isaac Connor
d00430f799 Add ModelId to MonitorPresets 2021-11-15 09:47:11 -05:00
Isaac Connor
dc756ad670 add back update for Manufacturers and Models 2021-11-10 19:20:39 -05:00
Isaac Connor
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
Isaac Connor
1fd99424bb Merge branch 'master' into add_manufacturer_model_to_monitors 2021-11-05 10:13:41 -04:00
Isaac Connor
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
Isaac Connor
64ab429519 Correct definition of Importance. Want less importance to have a hgiher value. Make not null. 2021-10-13 16:05:49 -04:00
Isaac Connor
9cf4e89254 add update to 1.37.3 2021-09-27 11:03:16 -04:00
Isaac Connor
227e5794fa Merge branch 'master' into add_manufacturer_model_to_monitors 2021-09-08 18:32:46 -04:00
Isaac Connor
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
Isaac Connor
cb4e17e49a Merge branch 'release-1.36' 2021-08-09 10:27:24 -04:00
Isaac Connor
413ac984eb add models.sql 2021-07-07 09:48:24 -04:00
Isaac Connor
8df915e7a4 Fix merge. 2021-07-07 09:45:53 -04:00
Isaac Connor
cc486beed5 Add some Acti models 2021-07-07 09:45:23 -04:00
Isaac Connor
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
Kendric Evans
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
Isaac Connor
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
Isaac Connor
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
Kendric Evans
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
Isaac Connor
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
Isaac Connor
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
Isaac Connor
da8128aba1 Merge branch 'master' into add_manufacturer_model_to_monitors 2021-05-07 19:16:35 -04:00
Isaac Connor
e514c77e90 Change encoder to a text field. enums will be too much of a hassle 2021-05-05 14:09:22 -04:00
Isaac Connor
c539969faa Cleanup 2021-04-23 14:52:29 -04:00
Isaac Connor
8a59d60854 add ModectDuringPTZ to Monitors 2021-04-23 14:52:29 -04:00
Isaac Connor
bd65420c07 Specify columns when inserting admin user. Add Snapshots column 2021-04-14 13:00:16 -04:00
Isaac Connor
7e579fd851 Implement Snapshots user permission 2021-04-12 15:59:31 -04:00
Isaac Connor
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
Isaac Connor
6319ea887c Need to install generate update script 2021-04-09 21:55:07 -04:00
Isaac Connor
35b3d236e0 Fix typo in triggers 2021-04-09 19:47:08 -04:00
Isaac Connor
4e5ef01156 Fixup event summary column population, update triggers 2021-04-09 16:46:36 -04:00
Isaac Connor
c5ca123042 Move event summaries to their own table to reduce contention on Monitor_Status 2021-04-09 10:16:16 -04:00