92aa29d8d0
Update zm_create.sql.in
2019-01-03 16:00:30 -06:00
c0e54a9874
Delete zm_create.sql
2019-01-03 15:59:28 -06:00
af7d4b1af6
added Control line to zm_create.sql.in
2019-01-03 14:58:17 -05:00
07d745cf55
added Control line to zm_create.sql.in
2019-01-03 14:46:23 -05:00
561a881114
added Control line to zm_create.sql
2019-01-03 14:35:01 -05:00
c4bf67b063
fix commas
2018-12-12 09:17:14 -05:00
21a98f3653
Merge branch 'remove_default_view' of https://github.com/connortechnology/ZoneMinder into connortechnology-remove_default_view
2018-12-11 09:44:13 -06:00
4e4c7502c3
put sql update into zm_update-1.33.0.sql
2018-12-11 10:37:52 -05:00
278abbc201
Merge branch 'master' into remove_default_view
2018-12-11 10:37:26 -05:00
af6b709ae1
bump to 1.33.0 development
2018-12-11 09:28:48 -06: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
1e915e9567
Merge branch 'master' into server_path_prefix
2018-11-28 10:45:36 -05:00
f8b2ff5c77
rework from Url() to PathToIndex(), PathToZMS(), UrlToIndex() and UrlToZMS()
2018-11-27 17:35:25 -05:00
8301f5d039
add missing sql update text
2018-11-25 15:42:35 -06:00
94944abd98
Fix triggers to sum event counts properly ( #2323 )
...
* rpm - update README
* update triggers to su mevent counts properly
* fix merge error
* merge content of triggers.sql with 1.32.3 sql update
* populate day, week, month summary tables with existing
* populate archive summary table with existing
* fix typo
* remove startime column from query
* my machine is possessed
2018-11-25 10:26:51 -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
5b93b77499
bump verion to 1.32.2
2018-10-13 13:36:15 -05:00
7ffc5ab266
Merge branch 'master' into control_plugin_psia
2018-10-11 09:32:06 -05:00
5c6cf88d93
bump version to 1.32.1
2018-10-02 07:37:55 -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
2f7c9a406a
bump sql to 1.32.0
2018-09-12 07:27:45 -05: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
718bb6bba3
Remove zm from alter statement
2018-08-28 10:37:02 -04:00
d64dc4f288
Frames EventId somehow never got an update even though zm_create.sql did.So add an update to convert EventId to a bigint.
2018-08-24 10:49:30 -04: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
11cedb4335
repeat the update that adds Refresh to Monitors. Bump version.
2018-07-31 10:27:34 -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
fc456b3d5f
this file is now autogenerated
2018-06-11 16:34:44 -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
e4465c0a61
add this to git...
2018-04-24 12:44:11 -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
914c608dbc
get rid of stored procedure. Do everything in the Trigger
2018-04-20 08:54:25 -04:00
56d3c2824f
Fix path to triggers.sql
2018-04-19 12:31:50 -04:00
a3373e5e40
Use correct dir to source cmake generated files from
2018-04-19 08:22:28 -07:00
1f80277bee
Add SignalCheckPoints to Monitors
2018-04-19 10:09:32 -04:00
98eb6570dd
use make macros in zm_update-1.31.30.sql.in
2018-04-19 07:43:43 -05: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
dd945eed75
remove wip .42
2018-04-14 11:09:35 -04:00
f9f78e9aa3
Convert event_id to a 64bit unsigned int
2018-04-12 13:40:11 -07:00
4ec595a98d
EventId and FrameId to BIGINT
2018-04-10 13:09:24 -07:00
f1a8d5f1ff
start of work on .41. Adding foreign keysy
2018-04-05 13:41: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
dc074bd2c0
fix path to triggers.sql
2018-02-28 07:18:38 -08:00
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
834edafc63
install triggers as well
2018-02-23 07:46:24 -05:00
52bca9d3ae
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-02-20 22:48:45 -05:00
13ef478820
refix triggers updating EventCounts. remove unsigned from eventcounts and diskspace totals.
2018-02-20 22:48:34 -05:00
0ad01f09bd
refix triggers updating EventCounts. remove unsigned from eventcounts and diskspace totals.
2018-02-20 22:48:23 -05:00
1981359d69
fixes, use summaries from Events_Day/etc instead of Events table
2018-02-19 19:45:21 -05:00
678634916f
fix event insert trigger
2018-02-19 17:29:30 -05:00
e4ec1712f4
remove the table creation/dropping and a if/elseif fix
2018-02-18 11:48:00 -05:00
e18a14337f
use path to triggers.sql
2018-02-18 11:47:03 -05:00
fe0ccafae8
add missing ;
2018-02-18 11:29:22 -05:00
d52277b283
update monitor counts
2018-02-18 11:28:58 -05:00
4b04b1ee7c
remove unwanted space
2018-02-18 11:19:20 -05:00
94212eda2f
fix triggers
2018-02-18 11:01:33 -05:00
717d00ac99
missing //
2018-02-09 16:08:44 -05:00
0d5c8f385f
fix DiskSpace summing when Nulls are present
2018-02-07 08:02:49 -05:00
4c5e47b050
fix DiskSpace summing when Nulls are present
2018-02-07 08:02:05 -05:00
8343793c48
Fix updating Storage area DiskSpace by using COALESCE
2018-02-06 11:34:40 -05:00
0f83dfc769
Correct events_day, etc update trigger
2018-02-06 08:43:09 -05:00
4bd92a3b94
fixes
2018-02-05 23:01:04 -05:00
c767d79aef
fix typo
2018-02-05 22:59:37 -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
cfb7987f0f
Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl
2018-02-03 14:54:30 -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
73f7026643
use COALESCE to ensure integer values
2018-02-03 11:01:33 -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
060acffb9d
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: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
Andrew Bauer
techrockedge
Isaac Connor
Andrew Bauer
Andrew Bauer
Isaac Connor
Verdi R-D
Jonathan Lassoff
Jonathan Lassoff
Roman Dissertori
Daedilus
Isaac Connor
habibapp1365
Isaac Connor
flashoftheblades