f726666f54
Merge branch 'master' into h265
2019-01-14 12:36:11 -05:00
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
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
Isaac Connor
Andrew Bauer
techrockedge
Andrew Bauer
Andrew Bauer
Isaac Connor
Verdi R-D
Jonathan Lassoff
Jonathan Lassoff
Roman Dissertori
Daedilus
Isaac Connor