mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-01-31 09:31:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
9,772 Commits 66 Branches 101 Tags
2d8a4794de3bfaddacb3fdacc4ef5f1e11ba7d4f
Commit Graph

1497 Commits

Author SHA1 Message Date
Andy Bauer
08af88df10 fix compilation errors 2016-02-13 08:54:40 -06:00
Isaac Connor
0ff0262c8b Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-02-12 19:12:12 -05: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
Isaac Connor
ddb377245e fix error report 2016-02-10 13:29:55 -05:00
Isaac Connor
b7256a6891 Merge branch 'master' into storageareas 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_create.sql.in
	version
 2016-02-10 09:17:40 -05:00
Isaac Connor
2cd21a07c0 use system() instead of backticks 2016-02-10 09:09:36 -05:00
Isaac Connor
1cb8a7ecf5 add missing - 2016-02-10 09:07:48 -05: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
2ca2b07a5e detaint calls for concurrent zmfilter.pl 2016-02-05 13:14:04 -05:00
Isaac Connor
d7f350ac34 fix parm => name 2016-02-05 11:41:54 -05:00
Isaac Connor
009211ae1e exec zmfilter concurrently if the flag is et 2016-02-05 11:24:40 -05:00
Isaac Connor
1837cc89ea Merge branch 'schrorg-vivotek-ePTZ' into storageareas 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2016-02-04 12:24:07 -05:00
Isaac Connor
89cff287cd Merge branch 'master' into storageareas 2016-02-04 12:14:16 -05:00
Isaac Connor
d65c9d797b fix merge, update to 1.30.1 2016-02-04 12:13:48 -05: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
Isaac Connor
11b206e281 fix getPath -> Path 2016-02-01 12:52:14 -05:00
Isaac Connor
ff46344175 Use Storage Areas in geteventPath 2016-02-01 12:51:43 -05:00
SteveGilvarry
7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
 2016-01-30 15:45:08 +11: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
7700623b16 Move SQL debug to Execute 2016-01-13 09:02:37 -05:00
Isaac Connor
f1831383da add a check for valid event link. Ignore anything that doesn't look right 2016-01-08 10:36:38 -05:00
Isaac Connor
270c737f40 Merge branch 'master' into storageareas 2016-01-05 09:36:36 -05:00
Isaac Connor
f0486e5b5e fix dumb mistake, undefing ZM_SERVBER_ID after setting it. 2016-01-04 22:07:07 -05:00