mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-24 08:41:40 -04:00
Code Issues Packages Projects Releases Wiki Activity
20,301 Commits 80 Branches 104 Tags
a047cedd47ef629cf14fdff6ab26b49eaae03fcf
Commit Graph

962 Commits

Author SHA1 Message Date
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
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
Isaac Connor
3835087c9d Merge branch 'master' into multistream 2022-01-18 20:16:08 -05:00
Isaac Connor
71c7b324e9 Update new Capturing, Analysing, Recording based on Function. 2022-01-11 12:01:07 -05:00
Jonathan Bennett
3a9c16aeea First working Janus build 2022-01-10 23:22:37 -06:00
Isaac Connor
fd3a70172d Merge branch 'master' into multistream 2022-01-10 17:51:50 -05: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
aefed4e174 Merge branch 'master' into multistream 2022-01-05 18:03:44 -05:00
Isaac Connor
6bd04de5f6 Merge branch 'master' into multistream 2021-12-31 17:53:36 -05: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
c81f3d9c61 add Capturing, Analysing, AnalysisSource, Recording, RecordingSource to Monitors 2021-10-16 20:37:16 -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