3f9564c10a
Merge branch 'master' into storageareas
2019-03-19 10:37:35 -04:00
ad5f6a8729
Camera reboot function ( #2554 )
...
* Adding a button for camera reboot function
This series of commits will add a camera reboot function to the
control interface if supported by the camera configuration.
* Adding reboot function option to contorl configuration
This patch adds a reboot option to the camera control configuration
view.
* Adding Reboot field to Controls table
This patch adds a Reboot field to the Controls table to support
a camera reboot control option.
* Correcting button value to match reset
* Updating language files
I'm not sure of the proper procedure to trigger updating of
non-english language files so I'm updating them all with English
hoping that that will draw attention to the changes and others
will translate accordingly.
* Add missing forward slash
2019-03-18 14:49:05 -04:00
d737e81e21
bump version for DefaultCodec in monitors
2019-03-06 14:57:05 -05:00
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
053289c4a0
rename eventserver to eventnotification
2019-02-27 09:27:50 -05:00
279e0d8bcf
Merge branch 'storageareas' into zma_to_thread
2019-02-22 11:39:58 -05:00
b8117f7fc9
Add support for control of Amcrest cameras ( #2536 )
...
* Add a control module to support the current Amcrest HTTP API
This patch adds ZoneMinder::Control::Amcrest_HTTP
This module is adapted and improved from one available on the ZoneMinder
forums.[1] It appears that a number of individuals have contributed to
it. This is an attempt to correct some of its interactions with ZM::Control
and friends as well as enhance and extend supported control features
for Amcrest cameras.
This work is based on Amcrest HTTP Protocol API Specifications
Rev. 2.12 2017-03-15
[1]https://forums.zoneminder.com/download/file.php?id=1878
* Fixing zoom methods
* Misc. cleanup of comments, etc.
* Fixing up POD, etc.
* Converting line endings to Unix
* Fixing up preset methods
The current Amcrest HTTP API does not support a Home command per se. So this
method is set up to send the camera to the first preset position. Of course,
this presupposes that the user will setup a preset #1 otherwise the command
will fail on a bad preset error.
If a future version of the API supports a true Home command, we'll adjust
at that point. For now this seems to be a useful workaround.
* Removing duplicate home method
* Adding moveAbs method
I'm putting this in, but absolute camera movement does not seem to be well
supported in the classic skin ATM. Reading
www/skins/classic/include/control_functions.php seems to indicate
a faulty implementation, unless I'm reading it wrong. I see nowhere
where the user is able to specify the absolute location to move to. Rather,
the call is passed back movement in increments of 1 unit. At least with the
Amcrest/Duhua API this would result in the camera moving to the 1* or 0* etc.
position.
moveAbsUp, Down, Left, Right, etc. Doesn't make sense given the definition
of Absolute movement.
* Adding a note about the moveMap method
This method does not appear to be implemented in the classic skin,
but we'll leave it here for future implementation. Caveat: It may
or may not work as-is.
* Fixing up zoomConTele/Wide methods
* Adding a vanilla control type for the Amcrest HTTP API
Please note that this control type matches (mostly) the currently
available control options in Amcrest_HTTP.pm. It does not match
all (or possibly any) of the control options available on a specific
Amcrest camera. The user may need to create their own control type
specific to the camera model they are using.
* Removing misplaced comment
Thanks to connortechnology for pointing this out!
2019-02-22 09:17:28 -05:00
7d6286d517
Merge branch 'storageareas' into zma_to_thread
2019-02-18 16:23:17 -05:00
d3a8117385
add missing db update script
2019-02-13 20:38:13 -05:00
419e60e8b4
Allow negative DiskSpace values. Technically shouldn't happen but since we don't have foreign keys yet, it can happen
2019-02-13 16:55:40 -05:00
a9e2011727
Merge branch 'storageareas' into zma_to_thread
2019-02-13 12:24:38 -05:00
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
28dafd5931
Merge branch 'storageareas' into zma_to_thread
2018-12-26 12:02:00 -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
b16cd7ec84
Merge branch 'h265' into zma_to_thread
2018-11-20 12:38:17 -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
5ab1126260
Merge branch 'storageareas' into zma_to_thread
2018-10-20 17:31:14 -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
672b4affe1
Merge branch 'storageareas' into zma_to_thread
2018-08-31 19:05:22 -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
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -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
f6139d33ed
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:25:11 -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
1e3c3643c9
Fix mysql signed bug by casting to signed
2018-04-14 17:25:44 -04:00
c7deb91319
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2018-04-14 14:58:25 -04:00
41c52f25b7
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:57:18 -04:00
dd945eed75
remove wip .42
2018-04-14 11:09:35 -04:00
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -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
e523067df7
Merge branch 'storageareas' into zma_to_thread
2018-03-15 11:28:14 -04:00
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
5ca7871510
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2018-03-10 10:12:22 -05: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
80127cbf81
Merge branch 'storageareas' into zma_to_thread
2018-03-06 10:57:49 -05:00
03d3f5e665
Merge branch 'storageareas' into zma_to_thread
2018-03-03 13:28:01 -08:00
dc074bd2c0
fix path to triggers.sql
2018-02-28 07:18:38 -08:00
a19e6b619c
add Encoder to Monitors
2018-02-28 07:17:52 -08:00
c443168389
split out codec and encoder, allowing one to specify which encoder to use
2018-02-28 07:17:16 -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
83785ac73f
Merge branch 'storageareas' into zma_to_thread
2018-02-22 09:41:50 -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
f3065bd8f6
Source doesn't really work
2018-02-18 10:59:36 -05:00
50eaa690d7
just source the complete list of triggers
2018-02-17 13:00:24 -05:00
670a979a0e
source triggers.sql
2018-02-17 12:59:53 -05:00
e991e2a05d
fix some triggers
2018-02-17 12:57:21 -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
b821d665bf
Fix commas
2018-01-24 12:16:18 -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
fd2d2a0d77
ad update to update events_update_trigger to dix totaldiskspace
2018-01-23 18:43:59 +01: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
e59ade5391
Only alter MonitorIds if it exists.
2018-01-22 14:06:03 -05:00
843eee1e13
handle case where zmstats and zmstats.pl both exist
2018-01-22 14:05:38 -05:00
1291835c45
do some output to tell use what we are doing during update process
2018-01-19 16:32:48 -05:00
a03ceec154
Fix Day=>Wek
2018-01-19 13:29:45 -05:00
bc792a8325
Use coalesce to handle NULLs
2018-01-19 13:09:46 -05:00
b5d1e1e5a2
update triggers to use coalesce
2018-01-19 13:03:47 -05:00
033d8e9cd8
add update
2018-01-19 12:17:42 -05:00
2ce68e83c5
Update TotalEvents on event_insertion
2018-01-19 12:15:05 -05:00
314390a161
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:23 -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
e8dddac142
only rename the columns if they exist. Makes this update re-runnable
2018-01-17 10:01:16 -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
a4d3b32b8c
Update all the event counts in the Monitors so that Triggers can be acurate
2018-01-10 14:40:42 -05:00
f5b8461a54
Fix indexes on Groups_MOnitors
2018-01-10 14:33:31 -05:00
eb2e78ccf7
Fix column names in triggers
2018-01-10 14:33:21 -05:00
4908ca1732
add the zmstats.pl, etc to Servers instead of Stroage
2018-01-10 12:56:01 -05:00
92bc6d6c20
put back the .pl
2018-01-10 12:55:42 -05:00
c6ae965b9c
add Events_Archived and update triggers to update Archived and Total Events
2018-01-10 12:27: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
348764985b
Fix Storage DiskSpace updating when Event.DiskSpace IS NULL
2018-01-08 15:42:28 -05:00
e877fa1d61
make zmupdate_1.31.19 re-runable.
2018-01-08 14:49:57 -05:00
b25452d4c5
Don't both to add the Floreon control type. That can be done with zmcamtool
2018-01-05 15:47: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
37a40a30d3
drop archived and Frames indexes from Events, as they are useless. Add a StorageId Index
2018-01-05 14:39:54 -05:00
b7ad24a266
revert the triggers to update Monitor Stats. THey just don't work
2018-01-04 17:22:51 -05:00
db0e35bf55
Move eventcounts update from zmwatch.pl to triggers and zmaudit.pl
2018-01-04 15:04:13 -05:00
4033cf5ffc
bump version to 1.31.19 with triggers
2018-01-04 13:07:02 -05:00
6c07347721
Fix Update DiskSpace Filter adding
2018-01-01 13:19:16 -05:00
edd5bd8874
create the Update DIskSpace filter if it doesn't exist
2018-01-01 12:44:09 -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
0e2d2ce611
fix typos
2017-12-18 13:05:04 -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
a867c488e0
ned to actually remove the MonitorIds column
2017-12-09 14:05:18 -05:00
e46f75c130
fix db update
2017-12-05 15:22:15 -08:00
4f40b0464c
Don't remove MonitorIds column.. just to support downgrading
2017-12-04 17:11:16 -05:00
1f2f708287
Handle empty strings in MonitorsIds
2017-12-04 17:00:52 -05: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
4a884afecb
need the update file
2017-11-26 15:08:12 -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
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
7cdd6b2596
fix crap from merge of Floreen camera ptz
2017-11-21 12:19:47 -05:00
Isaac Connor
Chris
Andrew Bauer
techrockedge
Andrew Bauer
Andrew Bauer
Isaac Connor
Verdi R-D
Jonathan Lassoff
Jonathan Lassoff
Roman Dissertori
Daedilus
Isaac Connor
habibapp1365
Isaac Connor
Isaac Connor
flashoftheblades
Isaac
Simpler1
Isaac Connor