mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-01-30 09:01:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,384 Commits 66 Branches 101 Tags
181a94de82f7205dcf2c0cb9d960bd5f7ee55e56
Commit Graph

1583 Commits

Author SHA1 Message Date
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
Isaac Connor
a6c3d05071 Debug return events and the sql used 2016-01-04 16:01:07 -05:00
Isaac Connor
455f6d5b7b have to use ->Path() as {Path} might not be filled in 2016-01-04 15:57:35 -05:00
Isaac Connor
88f902ea20 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-01-04 15:29:10 -05:00
Isaac Connor
17adc2b4e5 Rough in a Monitor class 2016-01-04 15:27:42 -05:00
Isaac Connor
196339b48b Add new object classes to autoconf 2016-01-04 15:19:46 -05:00
Isaac Connor
6e685ec8c8 add Monitor object class and use it in zmaudit.pl to print out path where monitor should have been 2016-01-04 15:13:01 -05:00
Isaac Connor
f04ba9c87e linefeed when saying that a db monitor doesn't exist in fs 2016-01-04 15:05:49 -05:00
Isaac Connor
fb7b171d6e fix merge 2016-01-04 14:37:23 -05:00
Simpler1
1432c6ae1f Added profiles for Wanscam-HW0025 and IPCC-7210W 2016-01-04 12:30:46 -05:00
Isaac Connor
b1205bcaa9 Merge branch 'multi-server' into storageareas 
Conflicts:
	CMakeLists.txt
	configure.ac
	scripts/zmaudit.pl.in
	version
 2016-01-02 14:45:24 -05:00
Isaac Connor
bf2195828f Merge branch 'multi-server' into storageareas 
Conflicts:
	docs/installationguide/index.rst
 2016-01-02 14:42:47 -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