mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-21 07:12:21 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,619 Commits 80 Branches 104 Tags
40cd27e68ac4473f8de447e42ee7c4dcf499f607
Commit Graph

326 Commits

Author SHA1 Message Date
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
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
Isaac Connor
86ae1b6598 Add missing commas 2018-02-05 17:31:34 -05:00
Isaac Connor
6822643d22 add update triggers for all the event tables so that diskspace counts work 2018-02-05 15:46:39 -05:00
Isaac Connor
a7171eccf6 Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl 2018-02-03 14:54:01 -05:00
Isaac Connor
8e547134d5 Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl 2018-02-03 14:50:19 -05:00
Isaac Connor
12c4ab07ea use COALESCE to ensure integer values 2018-02-03 11:01:26 -05:00
Isaac Connor
868e17a414 Allow Method in Monitors to be NULL 2018-02-02 10:31:55 -05:00
Isaac Connor
73edd3221a make DiskSpace in storage table be int instead of unsigned. Event deletions can make it go negative and then the delete fails. 2018-02-01 11:32:44 -05:00
Isaac Connor
ef51a21df4 add new runstate called Connected 2018-01-31 14:36:41 -05:00
Isaac Connor
456f29fcba Rename column Id OF Monitor_Statuses to simplify JOINS. 2018-01-26 13:39:37 -05:00
Isaac Connor
2d9f9125aa add update_storage_stats procedure 2018-01-26 13:08:10 -05:00
Isaac Connor
0bd1ee5992 Merge branch 'master' into m 2018-01-25 08:43:31 -05:00
Isaac Connor
50fc4a2d94 Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table. 2018-01-24 11:51:11 -05:00
Simpler1
ce19c65cc9 Ipcc (#2040) 
* fix(ipcc): Invert up/down to work properly

* fix(ipcc): Change the initial values for ipcc camera
 2018-01-22 15:33:11 -05:00
Isaac Connor
bc792a8325 Use coalesce to handle NULLs 2018-01-19 13:09:46 -05:00
Isaac Connor
2ce68e83c5 Update TotalEvents on event_insertion 2018-01-19 12:15:05 -05:00
Isaac Connor
1dbd8405a4 restructure indexes on the various Events tables. Use two separate indexes for MonitorId and StartTime because we access these tables using one or the other, but rarely both 2018-01-18 11:39:09 -05:00
Isaac Connor
306e9a75ee Fix issues with a period in the column name 2018-01-16 21:45:01 -05:00
Isaac Connor
9f42871c86 Fix Zone Triggers, bump version 2018-01-16 11:49:17 -05:00
Isaac Connor
48b636c749 fix missing triggers on Events tables. Add triggers for ZoneCount updating. 2018-01-16 09:30:40 -05:00
Isaac Connor
bb0974044b add Scheme to Events 2018-01-15 17:45:45 -05:00
Andrew Bauer
7451afcfab delete extra apostraphe 2018-01-15 11:13:26 -06:00