mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-17 21:38:45 -04:00
Code Issues Packages Projects Releases Wiki Activity
12,349 Commits 80 Branches 104 Tags
84c812725e5322c87a0428fec83704580098e52d
Commit Graph

348 Commits

Author SHA1 Message Date
Isaac Connor
f726666f54 Merge branch 'master' into h265 2019-01-14 12:36:11 -05:00
Andrew Bauer
151c7677d8 add WebSite type to enum (#2382) 
* add WebSite type to enum

* add website enum to update script

* update enum

* bump the version
 2019-01-03 17:06:44 -05:00
Andrew Bauer
92aa29d8d0 Update zm_create.sql.in 2019-01-03 16:00:30 -06:00
techrockedge
af7d4b1af6 added Control line to zm_create.sql.in 2019-01-03 14:58:17 -05:00
techrockedge
07d745cf55 added Control line to zm_create.sql.in 2019-01-03 14:46:23 -05:00
Isaac Connor
278abbc201 Merge branch 'master' into remove_default_view 2018-12-11 10:37:26 -05:00
Isaac Connor
4272225a17 Merge branch 'master' into h265 2018-11-30 16:42:16 -05:00
Isaac Connor
1c17f334d3 fix missing bits. Implement UrlToIndex in Monitor and fix use of Url(). Implement PathToApi as well 2018-11-29 14:26:30 -05:00
Isaac Connor
f8b2ff5c77 rework from Url() to PathToIndex(), PathToZMS(), UrlToIndex() and UrlToZMS() 2018-11-27 17:35:25 -05:00
Isaac Connor
c5f7fb7b18 Merge branch 'master' into server_path_prefix 2018-11-22 10:04:33 -05:00
Isaac Connor
490fb40917 DefaultView in the past was used to control whether the watch view starts up with ptz controls visible or the events list. Isaac changed the watch view to always have the controls visible... so this setting is no longer useful. 2018-11-14 09:22:38 -05:00
Isaac Connor
a8329465fb Merge branch 'master' into h265 2018-10-22 10:30:01 -04:00
Verdi R-D
325405b0b8 Added monitor preset for D-link DCS-930L (#2255) 
* added monitor preset for d-link dcs-930l

* moved update to new database update version
 2018-10-15 17:14:57 -04:00
Andrew Bauer
7ffc5ab266 Merge branch 'master' into control_plugin_psia 2018-10-11 09:32:06 -05:00
Jonathan Lassoff
c7e1e7b901 Control plugin for Dahua PTZ cameras (#2192) 
* Control plugin for Dahua PTZ cameras

* Update http/https protocol handling

* Update doc and license

* Remove license from top of file

* Use named regex capture groups for ControlAddress parsing

* Remove trailing whitespace in Trendnet.pm
 2018-09-20 12:29:54 -04:00
Isaac Connor
03f769eacc Rough in codec specification for Events 2018-09-10 12:22:55 -04:00
Jonathan Lassoff
c605769fc9 Add Control plugin for PTZ cameras supporting the PSIA IP Media Device API 2018-08-28 15:28:52 +00:00
Isaac Connor
6e5472d305 Merge branch 'master' into server_path_prefix 2018-08-22 12:57:16 -04:00
Isaac Connor
459a88a5e7 Merge branch 'master' into ip_webcam_preset 2018-08-22 11:23:56 -04:00
Isaac Connor
4e30a9e71c Stats.EventId must be a bigint too 2018-08-21 12:50:33 -04:00
Isaac Connor
70ba0ad342 Merge https://github.com/michaelbarkdoll/ZoneMinder into trendnet 2018-08-13 11:05:50 -04:00
Isaac Connor
ee97dc39dc Add Refresh column to Monitors table. Explicitly put it after ZoneCount in the update.sql 2018-07-31 10:22:13 -04:00
Roman Dissertori
48b91c5544 Bugfix in Control and added new Camera (#2171) 
* fixed control typos

missing word "s" for "Controls" Table for database queries

* added Dericam P2 camera Control

* fixed missing CanReset column

* Update DericamP2.pm

* added some more missing controls

CanSleep, CanWake

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update zm_create.sql.in
 2018-07-28 09:26:02 -04:00
Daedilus
d90e3daf80 Added default settings for control script IPCAMIOS as per comments in Pull #2161 2018-07-17 08:31:55 -06:00
Isaac Connor
34299aff2c Add PathPrefix to Servers Table 2018-07-09 12:09:10 -04:00
Isaac Connor
6ad10a5b73 Correct Load to CpuLoad in Servers 2018-06-11 15:49:23 -04:00
Isaac Connor
8a80cf686b Merge branch 'master' into storageareas 2018-04-26 21:58:34 -04:00
Andrew Bauer
86b2f6a12e New Monitor Type - Website (#2065) 
* implement website monitor

* don't check certain fields when using website monitor

* continue to fix javascript errors for website monitors

* check $monitor, not $new_monitor here

* add website monitor documentation

was somehow left out of the initial commit

* fix corruption of functions.php

* add missing comma

* remove errors by testing for existence of key.  If it's a new monitor, then none of the keys will be valid

* If the monitor type is WebSite, then default Status to Running.

* put back start function that got lost in merge.  Don't start StreamCmd's if it's a WebSite

* Add midding comma

* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite

* Don't show control or any of the status fields for WebSite type monitors

* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
 2018-04-26 17:18:36 -04:00
Isaac Connor
20f6985dff implement capturing bandwidth 2018-04-24 14:11:27 -04:00
Andrew Bauer
0a24f8550a Update path to zmtriggers.sql 
ZM_PATH_DATA is not configured as a make macro. Use @PKGDATADIR@ instead.
 2018-04-23 08:59:31 -05:00
Isaac Connor
1f80277bee Add SignalCheckPoints to Monitors 2018-04-19 10:09:32 -04:00
Isaac Connor
b965eca683 Use a build substr for the default path to events 2018-04-18 21:06:13 -04:00
Isaac Connor
cb7107ec4d Fix insert for default Storage Group 2018-04-18 21:04:54 -04:00
Isaac Connor
4ec595a98d EventId and FrameId to BIGINT 2018-04-10 13:09:24 -07:00
Isaac Connor
793f630ee0 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-02 10:43:07 -07:00
Isaac Connor
1ff17c97b8 Add DoDelete to Storage and Locked to Events 2018-04-02 09:04:09 -07:00
Isaac Connor
2748f47fb7 add Url to Storage for S3 support 2018-03-28 08:23:03 -07:00
Isaac Connor
27736fb5d9 Merge ../ZoneMinder.master into storageareas 2018-03-15 11:04:41 -04:00
Andy Bauer
b41363fd60 Merge branch 'patch-3' of https://github.com/habibapp1365/zoneminder into habibapp1365-patch-3 2018-03-06 11:37:49 -06:00
habibapp1365
aa2134bde4 Update zm_create.sql.in 2018-03-06 19:59:06 +03:30
Isaac Connor
3aa31fd524 Merge branch 'master' into storageareas 2018-02-23 10:23:35 -05:00
Isaac Connor
cece2f35f0 remove triggers from zm_create.sql.in as they are now contained in triggers.sql 2018-02-23 07:50:05 -05:00
Isaac Connor
0a6b463301 FIx MontageLayout=>MontageLayouts 2018-02-23 07:46:37 -05:00
Isaac Connor
0ad01f09bd refix triggers updating EventCounts. remove unsigned from eventcounts and diskspace totals. 2018-02-20 22:48:23 -05:00
Isaac Connor
e18a14337f use path to triggers.sql 2018-02-18 11:47:03 -05:00
Isaac Connor
94212eda2f fix triggers 2018-02-18 11:01:33 -05:00
Isaac Connor
717d00ac99 missing // 2018-02-09 16:08:44 -05:00
Isaac Connor
4c5e47b050 fix DiskSpace summing when Nulls are present 2018-02-07 08:02:05 -05:00
Isaac Connor
0f83dfc769 Correct events_day, etc update trigger 2018-02-06 08:43:09 -05:00
flashoftheblades
34f6584081 Update zm_create.sql.in 2018-02-05 18:53:47 -05:00