07d745cf55
added Control line to zm_create.sql.in
2019-01-03 14:46:23 -05:00
278abbc201
Merge branch 'master' into remove_default_view
2018-12-11 10:37:26 -05:00
4272225a17
Merge branch 'master' into h265
2018-11-30 16:42:16 -05:00
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
f8b2ff5c77
rework from Url() to PathToIndex(), PathToZMS(), UrlToIndex() and UrlToZMS()
2018-11-27 17:35:25 -05:00
c5f7fb7b18
Merge branch 'master' into server_path_prefix
2018-11-22 10:04:33 -05:00
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
a8329465fb
Merge branch 'master' into h265
2018-10-22 10:30:01 -04:00
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
7ffc5ab266
Merge branch 'master' into control_plugin_psia
2018-10-11 09:32:06 -05:00
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
03f769eacc
Rough in codec specification for Events
2018-09-10 12:22:55 -04:00
c605769fc9
Add Control plugin for PTZ cameras supporting the PSIA IP Media Device API
2018-08-28 15:28:52 +00:00
6e5472d305
Merge branch 'master' into server_path_prefix
2018-08-22 12:57:16 -04:00
459a88a5e7
Merge branch 'master' into ip_webcam_preset
2018-08-22 11:23:56 -04:00
4e30a9e71c
Stats.EventId must be a bigint too
2018-08-21 12:50:33 -04:00
70ba0ad342
Merge https://github.com/michaelbarkdoll/ZoneMinder into trendnet
2018-08-13 11:05:50 -04:00
ee97dc39dc
Add Refresh column to Monitors table. Explicitly put it after ZoneCount in the update.sql
2018-07-31 10:22:13 -04:00
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
d90e3daf80
Added default settings for control script IPCAMIOS as per comments in Pull #2161
2018-07-17 08:31:55 -06:00
34299aff2c
Add PathPrefix to Servers Table
2018-07-09 12:09:10 -04:00
6ad10a5b73
Correct Load to CpuLoad in Servers
2018-06-11 15:49:23 -04:00
8a80cf686b
Merge branch 'master' into storageareas
2018-04-26 21:58:34 -04:00
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
20f6985dff
implement capturing bandwidth
2018-04-24 14:11:27 -04:00
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
1f80277bee
Add SignalCheckPoints to Monitors
2018-04-19 10:09:32 -04:00
b965eca683
Use a build substr for the default path to events
2018-04-18 21:06:13 -04:00
cb7107ec4d
Fix insert for default Storage Group
2018-04-18 21:04:54 -04:00
4ec595a98d
EventId and FrameId to BIGINT
2018-04-10 13:09:24 -07:00
793f630ee0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-02 10:43:07 -07:00
1ff17c97b8
Add DoDelete to Storage and Locked to Events
2018-04-02 09:04:09 -07:00
2748f47fb7
add Url to Storage for S3 support
2018-03-28 08:23:03 -07:00
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
b41363fd60
Merge branch 'patch-3' of https://github.com/habibapp1365/zoneminder into habibapp1365-patch-3
2018-03-06 11:37:49 -06:00
aa2134bde4
Update zm_create.sql.in
2018-03-06 19:59:06 +03:30
3aa31fd524
Merge branch 'master' into storageareas
2018-02-23 10:23:35 -05:00
cece2f35f0
remove triggers from zm_create.sql.in as they are now contained in triggers.sql
2018-02-23 07:50:05 -05:00
0a6b463301
FIx MontageLayout=>MontageLayouts
2018-02-23 07:46:37 -05:00
0ad01f09bd
refix triggers updating EventCounts. remove unsigned from eventcounts and diskspace totals.
2018-02-20 22:48:23 -05:00
e18a14337f
use path to triggers.sql
2018-02-18 11:47:03 -05:00
94212eda2f
fix triggers
2018-02-18 11:01:33 -05:00
717d00ac99
missing //
2018-02-09 16:08:44 -05:00
4c5e47b050
fix DiskSpace summing when Nulls are present
2018-02-07 08:02:05 -05:00
0f83dfc769
Correct events_day, etc update trigger
2018-02-06 08:43:09 -05:00
34f6584081
Update zm_create.sql.in
2018-02-05 18:53:47 -05:00
86ae1b6598
Add missing commas
2018-02-05 17:31:34 -05:00
6822643d22
add update triggers for all the event tables so that diskspace counts work
2018-02-05 15:46:39 -05:00
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
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
12c4ab07ea
use COALESCE to ensure integer values
2018-02-03 11:01:26 -05:00
868e17a414
Allow Method in Monitors to be NULL
2018-02-02 10:31:55 -05:00
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
ef51a21df4
add new runstate called Connected
2018-01-31 14:36:41 -05:00
456f29fcba
Rename column Id OF Monitor_Statuses to simplify JOINS.
2018-01-26 13:39:37 -05:00
2d9f9125aa
add update_storage_stats procedure
2018-01-26 13:08:10 -05:00
0bd1ee5992
Merge branch 'master' into m
2018-01-25 08:43:31 -05:00
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
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
bc792a8325
Use coalesce to handle NULLs
2018-01-19 13:09:46 -05:00
2ce68e83c5
Update TotalEvents on event_insertion
2018-01-19 12:15:05 -05:00
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
306e9a75ee
Fix issues with a period in the column name
2018-01-16 21:45:01 -05:00
9f42871c86
Fix Zone Triggers, bump version
2018-01-16 11:49:17 -05:00
48b636c749
fix missing triggers on Events tables. Add triggers for ZoneCount updating.
2018-01-16 09:30:40 -05:00
bb0974044b
add Scheme to Events
2018-01-15 17:45:45 -05:00
7451afcfab
delete extra apostraphe
2018-01-15 11:13:26 -06:00
31cc03eafc
fix datatype issue with BTTV Video presets
2018-01-15 09:45:40 -06:00
d54f3f7168
fix misaligned fields in Axis & Qihan presets
2018-01-15 09:15:57 -06:00
80362f99fa
fix misaligned db fields for certain presets ( #2034 )
2018-01-14 21:14:30 -05:00
4d342abf53
fixes
2018-01-11 14:34:57 -05:00
5e0c954aff
remove crap
2018-01-10 15:23:22 -05:00
f246599704
Fix inserting default Server entry
2018-01-10 14:56:12 -05:00
f5b8461a54
Fix indexes on Groups_MOnitors
2018-01-10 14:33:31 -05:00
92bc6d6c20
put back the .pl
2018-01-10 12:55:42 -05:00
acd12d234a
add Events_Archived table. Add zmstats, zmaudit and zmtrigger settings to Servers table to tell if we should run the services or not. Fix a missing backtick at Scheme
2018-01-10 12:26:59 -05:00
1db4d7df83
start work on Events_(Hour|Day|Month|etc) tables for the event count data
2018-01-09 16:35:28 -05:00
5c75df1a40
drop archived and Frames indexes from Events, as they are useless. Add a StorageId Index
2018-01-05 14:40:03 -05:00
6c07347721
Fix Update DiskSpace Filter adding
2018-01-01 13:19:16 -05:00
a79017b168
add a KEY to Events for EndTime and DiskSpace, since we are constantly selecting on those. Insert the Update DiskSpace filter on db creation.
2018-01-01 12:43:47 -05:00
0c350b8f41
add ServerId to Storage
2017-12-22 11:38:59 -08:00
2c1aa2a92f
missing ;
2017-12-20 21:22:37 -05:00
d312482a2b
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
2017-12-18 12:52:26 -05:00
833ae0ee8f
alter the type of the Channel field to match the update that occurred in 1.23.3
2017-12-11 15:09:41 -05:00
dd69bc3d7b
Merge branch 'master' into storageareas
2017-12-11 11:39:42 -05:00
a2d266f8f9
fix floreen ptz control sql
2017-12-09 16:05:42 -06:00
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
af1729792f
add AutoMove and AutoMoveTo to Filters
2017-12-03 17:04:11 -05:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
9d6b417b60
make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts
2017-11-22 17:03:37 -08:00
1fe421ed9d
add DiskSpace columns to Monitors
2017-11-22 14:22:12 -08:00
1745c83d2f
add eventcount columns to Monitors
2017-11-22 14:04:07 -08:00
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
d411ed329b
get rid of mistyped zmaFPS and zmcFPS
2017-11-16 09:14:26 -05:00
bfd28dda71
Update zm_create.sql.in
...
Added missing column `AnalysisFPS`
2017-11-15 17:59:07 -08:00
087a902698
Update zm_create.sql.in
...
The `CaptureFPS` column is missing in the db creation script, causing errors in the Log whenever a monitor is queried.
2017-11-15 17:44:59 -08:00
a7f590a28d
add value for the DiskSpace column
2017-11-01 12:37:08 -04:00
ac6964b159
add position clearing to other Layouts
2017-11-01 11:56:18 -04:00
36e13039c7
Switch to LONGTEXT FROM JSON type
2017-11-01 11:05:21 -04:00
a6c790b374
use a shared include for the filters bar
2017-10-30 07:37:08 -07:00
techrockedge
Isaac Connor
Isaac Connor
Verdi R-D
Andrew Bauer
Jonathan Lassoff
Jonathan Lassoff
Roman Dissertori
Daedilus
Isaac Connor
Andy Bauer
habibapp1365
flashoftheblades
Simpler1
Isaac Connor
Daniel Hodgson