Kyle Johnson
|
bc89b95470
|
Merge pull request #1292 from ZoneMinder/telemetry
Telemetry Data
|
2016-03-01 07:17:16 -07:00 |
SteveGilvarry
|
d40bf89b17
|
Remove Phone BW settings used with mobile skin
|
2016-02-26 22:43:37 +11:00 |
|
SteveGilvarry
|
6b169af655
|
Remove eyezm configdata
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
|
2016-02-26 22:35:24 +11:00 |
|
SteveGilvarry
|
5ff427d9e9
|
Removed Autotools Makefile.am
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
|
2016-02-26 22:19:02 +11:00 |
Andy Bauer
|
7a42a8c3f9
|
add Netcat ONVIF compatible ptz control
|
2016-02-24 10:15:59 -06:00 |
Isaac Connor
|
826a22a2a8
|
add missing .
|
2016-02-19 11:07:06 -05:00 |
|
Isaac Connor
|
3b07b56400
|
Use more descriptive names for the channels
|
2016-02-19 11:05:55 -05:00 |
|
Isaac Connor
|
64c5b64068
|
Log error before croaking and include port# in the error message
|
2016-02-19 11:04:02 -05:00 |
|
Isaac Connor
|
327a01cb20
|
Log error before croaking and show path to file in the error message
|
2016-02-19 10:59:40 -05:00 |
|
Isaac Connor
|
3a512f87a5
|
Log the reason for croaking before croaking.
|
2016-02-19 10:57:52 -05:00 |
Isaac Connor
|
d1ba45c56a
|
include the sock path in the error message and output an error on failure to open pid file
|
2016-02-16 10:02:30 -05:00 |
Andrew Bauer
|
8a2dc2897d
|
Perl DateTime dependency not needed
|
2016-02-15 14:11:58 -06:00 |
|
Andrew Bauer
|
041585b4a2
|
Change Info to Debug
|
2016-02-15 14:03:16 -06:00 |
|
Andrew Bauer
|
e3afa5d1ec
|
change to testing5
|
2016-02-15 12:38:13 -06:00 |
|
Andrew Bauer
|
87aceef479
|
change server endpoint
|
2016-02-15 08:50:11 -06:00 |
|
Andrew Bauer
|
cd8a4adfab
|
replace uname system call with native perl when applicable
|
2016-02-15 08:43:34 -06:00 |
|
Andy Bauer
|
47eaea78be
|
use units of bytes for total memory
|
2016-02-13 15:01:22 -06:00 |
|
Andy Bauer
|
ee3f87a2ad
|
additional refinements to zmtelemetry
|
2016-02-13 14:53:22 -06:00 |
|
Andy Bauer
|
08af88df10
|
fix compilation errors
|
2016-02-13 08:54:40 -06:00 |
|
Andrew Bauer
|
87857f5dc1
|
more debug and warnings
|
2016-02-12 17:45:08 -06:00 |
|
Andrew Bauer
|
24838a91c9
|
set kernel, distro, and version for Mac OS
|
2016-02-12 17:38:00 -06:00 |
|
Andrew Bauer
|
3c48d81edb
|
tweak regex's. add debug
|
2016-02-12 17:15:04 -06:00 |
|
Andrew Bauer
|
5045da9382
|
add initial distro determination logic to zmtelemetry
|
2016-02-12 15:18:45 -06:00 |
|
Andrew Bauer
|
c892e912cf
|
use uname -p for telemetry architecture
|
2016-02-12 10:47:12 -06:00 |
|
Andrew Bauer
|
b04e1eb0c6
|
let mysql generate the uuid
|
2016-02-12 09:18:15 -06:00 |
|
Andrew Bauer
|
799437fdf1
|
retrieve telemetry data from the monitors table
|
2016-02-12 08:59:16 -06:00 |
|
Andrew Bauer
|
017417d8f8
|
small changes to zmtelemetry
|
2016-02-12 08:06:51 -06:00 |
|
Andrew Bauer
|
1b6af8afae
|
modify telemetry parameters
|
2016-02-11 13:10:36 -06:00 |
|
Andrew Bauer
|
1811d71562
|
make date format compatible with *BSD
|
2016-02-11 08:10:16 -06:00 |
|
Andrew Bauer
|
f5ff5d152c
|
Add count query subroutine
|
2016-02-11 07:22:31 -06:00 |
|
Andy Bauer
|
6d81ef247e
|
build telemetry hash then jsonencode it
|
2016-02-10 20:46:05 -06:00 |
|
Andrew Bauer
|
177a70a248
|
add getIP subroutine to zmtelemetry.pl
|
2016-02-10 14:05:34 -06:00 |
|
Andrew Bauer
|
f48ffb60e6
|
update ZM_TELEMETRY_UUID after creating uuid
|
2016-02-10 13:37:22 -06:00 |
|
Andrew Bauer
|
18c493a180
|
Add getUUID subroutine, Add ZM_TELEMETRY_LAST_UPLOAD
|
2016-02-10 13:04:14 -06:00 |
|
Andrew Bauer
|
7a9740b1a4
|
Update zmtelemetry.pl.in
|
2016-02-09 14:35:45 -06:00 |
|
Kyle Johnson
|
609784f902
|
Update telemetry host, port and protocol
|
2016-02-09 12:49:09 -07:00 |
|
Andy Bauer
|
b718bd298f
|
Merge branch 'vivotek-ePTZ' of https://github.com/schrorg/ZoneMinder into schrorg-vivotek-ePTZ
|
2016-02-09 06:56:38 -06:00 |
Dmitry Smirnov
|
5bcc414038
|
codespell: misc. spelling corrections
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
|
2016-02-08 20:41:36 +11:00 |
|
Andrew Bauer
|
f607e3a6fa
|
zmtelemetry - the typo of my typo is my friend
|
2016-02-06 14:50:02 -06:00 |
|
Andrew Bauer
|
4ad31695ba
|
fix typo in cmakefile
|
2016-02-06 14:25:00 -06:00 |
|
Andrew Bauer
|
e0ee05e05c
|
add zmtelemetry to cmake
|
2016-02-06 14:10:42 -06:00 |
|
Andrew Bauer
|
8a537029ea
|
Initial commit to add zmtelemetry.pl
|
2016-02-06 14:08:28 -06:00 |
Isaac Connor
|
9ace6c518d
|
Merge pull request #1225 from Simpler1/profiles
Added profiles for Wanscam-HW0025 and IPCC-7210W
|
2016-02-04 11:55:48 -05:00 |
|
Isaac Connor
|
d3755611c5
|
Merge pull request #1247 from bodegard/master
Corrected DB update version comments, fixed typos, and skin font modification
|
2016-02-04 11:54:02 -05:00 |
|
Isaac Connor
|
52e16dbdd0
|
Merge pull request #1249 from knnniggett/pelcop
Fix PelcoP checksum calculation
|
2016-02-04 11:52:51 -05:00 |
|
Andrew Bauer
|
748754a213
|
Merge pull request #1209 from adamreiser/StrictKeyChecking
Strict key checking
|
2016-02-04 10:07:19 -06:00 |
|
Andy Bauer
|
fa168027b3
|
Fix PelcoP checksum calculation
|
2016-01-24 07:45:04 -06:00 |
|
Andrew Bauer
|
50b113cd02
|
Merge pull request #1189 from marcolino7/master
PTZ - Added autostop to Down command on FI8918W
|
2016-01-24 07:40:30 -06:00 |
Brandon Odegard
|
9c72579c2e
|
Corrected typo in function info
|
2016-01-22 12:12:39 -06:00 |
|
Andy Bauer
|
66c66106f5
|
Process off+time delay condition
|
2016-01-15 20:31:31 -06:00 |
|
Isaac Connor
|
f0486e5b5e
|
fix dumb mistake, undefing ZM_SERVBER_ID after setting it.
|
2016-01-04 22:07:07 -05:00 |
Simpler1
|
1432c6ae1f
|
Added profiles for Wanscam-HW0025 and IPCC-7210W
|
2016-01-04 12:30:46 -05:00 |
|
Andrew Bauer
|
fc5de5a4f3
|
Merge pull request #1215 from ZoneMinder/multi-server
Multi server
|
2016-01-01 21:50:31 -06:00 |
|
Isaac Connor
|
54bff42fa0
|
Remove warnings when no server set
|
2016-01-01 21:27:30 -05:00 |
|
Andrew Bauer
|
c827f55580
|
Merge pull request #1040 from ZoneMinder/multi-server
Multi server
|
2016-01-01 09:36:04 -06:00 |
Adam Reiser
|
659b3f37f5
|
Stylistic fix
|
2015-12-29 21:08:24 -08:00 |
|
Adam Reiser
|
28bf4dfe7b
|
Add option for strict host key checking
|
2015-12-29 16:34:11 -08:00 |
|
Isaac Connor
|
39bcb20dac
|
Skip directories that have non-digits in them
|
2015-12-22 12:59:37 -05:00 |
|
Isaac Connor
|
1aa79c306b
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2015-12-22 09:47:45 -05:00 |
|
Isaac Connor
|
dfd7986c01
|
Merge branch 'master' into multi-server
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
|
2015-12-21 12:57:45 -05:00 |
|
Isaac Connor
|
118dc12ad5
|
id => Id
|
2015-12-21 11:25:17 -05:00 |
|
Isaac Connor
|
f6d52e77b9
|
it is important to return the object from the constructor
|
2015-12-21 11:13:21 -05:00 |
|
Isaac Connor
|
ac88867fd2
|
fix namespace for dbh
|
2015-12-21 11:10:24 -05:00 |
|
Isaac Connor
|
8682b1af28
|
rough in a Storage class for the perl side of things
|
2015-12-21 11:03:53 -05:00 |
arjunrc
|
27b1b37d5b
|
added opt_use_api
|
2015-12-19 17:43:36 -05:00 |
|
Isaac Connor
|
d035753971
|
Add the event class.
Also, remove the unused Storage class
|
2015-12-17 14:38:18 -05:00 |
|
Isaac Connor
|
b32ef7751b
|
implement the options to generate videos for events specified by a stored filter. Also implement ability to generate a concatenated video of all events specified by the filter.
|
2015-12-17 14:36:40 -05:00 |
|
Isaac Connor
|
c71d1e52ac
|
Fix
|
2015-12-17 13:13:04 -05:00 |
|
Isaac Connor
|
9db9d243f2
|
Fix
|
2015-12-17 13:12:37 -05:00 |
|
Isaac Connor
|
6f34022613
|
add find and find_one routines
|
2015-12-17 13:11:32 -05:00 |
|
Isaac Connor
|
7a979bb891
|
remove duplicated routines
|
2015-12-17 13:11:15 -05:00 |
|
Isaac Connor
|
64f65b55cc
|
use new Filter object to do some of the heavy lifting in zmfilter.pl
|
2015-12-17 12:57:14 -05:00 |
|
Isaac Connor
|
7365c053e6
|
Create a Filter object, out of some of the code in zmfilter.pl. The purpose is to be able to use it elsewhere like zmvideo.pl.
|
2015-12-17 12:56:40 -05:00 |
Marco
|
62095b30d0
|
Added autostop to Down command
|
2015-12-16 16:58:20 +01:00 |
|
Isaac Connor
|
39e396eb6e
|
Merge branch 'master' into multi-server
|
2015-12-09 10:36:51 -05:00 |
|
Isaac Connor
|
ac23efebef
|
Merge pull request #1184 from ZoneMinder/TV-IP862_new_firmware
Add code to detect the change in REALM from older to newer firmware
|
2015-12-09 10:36:27 -05:00 |
|
Isaac Connor
|
7c298c58ed
|
Add code to detect the change in REALM from older to newer firmware
|
2015-12-08 16:20:38 -05:00 |
SteveGilvarry
|
5390605797
|
Add v to front of version string in version->parse to force conversion of decimal to dotted decimal versions, and change from ge to > to prevent reapplying current version
|
2015-12-03 10:23:19 +11:00 |
|
Isaac Connor
|
4d6c4355db
|
Merge branch 'master' into multi-server
|
2015-11-20 16:07:50 -05:00 |
|
Isaac Connor
|
d231ac4533
|
remove comment at end of line
|
2015-11-10 14:46:12 -05:00 |
Robin Daermann
|
49a89b75a8
|
More verbose error reporting
|
2015-11-09 16:15:53 +01:00 |
dreaddy
|
3479af78bd
|
Add more verbose help
|
2015-11-06 13:36:29 -05:00 |
|
dreaddy
|
92401193a7
|
Add missing semicolon
|
2015-11-06 11:19:12 -05:00 |
|
dreaddy
|
ced0240fc3
|
Use the ssmtp path set in options first. shell command if ssmtp path empty. display debug suggesting set ssmtp path in option.
|
2015-11-06 10:43:30 -05:00 |
|
Robin Daermann
|
a942b22541
|
Add camera control module for Vivotek ePTZ protocol
|
2015-11-04 17:12:07 +01:00 |
|
dreaddy
|
35617a6cf7
|
#1128 - Added option to enable send email by ssmtp mail. Option for custom ssmtp path. Conditional checks for new options in filter
|
2015-11-02 22:16:10 -05:00 |
|
Isaac Connor
|
44168ce05e
|
Merge branch 'master' into multi-server
|
2015-10-30 11:29:03 -04:00 |
|
Kyle Johnson
|
1cce60f6ec
|
Update version check URL
|
2015-10-23 11:45:32 -06:00 |
|
Isaac Connor
|
582cbe7567
|
Merge branch 'master' into multi-server
|
2015-10-15 09:01:19 -04:00 |
|
Isaac Connor
|
1367de292e
|
Fix error message when no ZM_SERVER_NAME or ZM_SERVER_HOST set
|
2015-10-07 08:57:50 -04:00 |
|
Isaac Connor
|
79d8e4b74f
|
Merge branch 'master' into fix_zmaudit
|
2015-10-06 09:30:32 -04:00 |
|
Isaac Connor
|
4a506368dc
|
Fix zmaudit sleeping and deleting Empty Events now that Frames also has an Id field
|
2015-10-06 09:30:10 -04:00 |
|
Pliable Pixels
|
e0e048fe7e
|
fixed version compare logic
|
2015-10-04 09:10:05 -04:00 |
|
Isaac Connor
|
aa108eff6e
|
Add Info line on startup saying which Server it is loading for
|
2015-10-02 12:33:09 +00:00 |
|
Isaac Connor
|
b0b69c5176
|
parse ZM_SERVER_HOST into ZM_SERVER
|
2015-10-02 12:32:41 +00:00 |
|
Isaac Connor
|
ea87ffe66f
|
merge master, bump version to 1.28.108
|
2015-10-01 11:52:49 -04:00 |
Bobby Billingsley
|
4eb4bdbfb5
|
Added control script for SunEyes SP-P1802SWPTZ
(http://www.amazon.com/SunEyes-SP-P1802SWPTZ-Wireless-Camera-1080P/dp/B00MOTBXK6)
|
2015-09-30 13:39:50 +02:00 |
|
Isaac Connor
|
e4b0e74f69
|
merge master
|
2015-09-24 10:01:27 -04:00 |
|
Isaac Connor
|
d754239a51
|
add debug statements for when LastWriteTime is not defined.
|
2015-09-24 09:57:58 -04:00 |
|
Isaac Connor
|
4c2545a5ca
|
Merge branch 'master' into multi-server
|
2015-09-17 15:39:26 -04:00 |