ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,582 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

6582 Commits

Author SHA1 Message Date
SteveGilvarry 5150829a9f Convert to Travis Trusty 2016-02-13 16:22:44 +11: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
Isaac Connor 292e3a141f Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-02-12 13:53:34 -05:00
Isaac Connor 5da8df45a7 Merge branch 'hide_rtspdescribe' into storageareas 2016-02-12 13:53:09 -05:00
Isaac Connor 5f217b48e0 When Protocol is HTTP, hide the RTSPDescribe line. Make it appear when Protocol is changed to RTSP 2016-02-12 13:52:59 -05: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
Isaac Connor f9b3287539 Merge pull request #1283 from pliablepixels/1282-multiserver-debug-demote 
demoted to debug due to lots of logs
 2016-02-11 17:08:56 -05:00
arjunrc e8c38dd016 demoted to debug due to lots of logs 2016-02-11 15:12:21 -05: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
Robin Daermann b28224cacb Added copyright information to mk_bigfont.pl 2016-02-11 07:35:21 +01: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
Andrew Bauer 51a4298fc7 Merge pull request #1280 from altaroca/1272-onvif-copyright 
1272 onvif copyright
 2016-02-10 12:03:08 -06:00
Jan M. Hochstein 61932a6470 Corrected file copyrights 2016-02-10 16:36:21 +01:00
Jan M. Hochstein ee48c830d0 Added README and removed WSDL files in onvif folder 2016-02-10 16:25:23 +01:00
Jan M. Hochstein 2b9693748b Added README and removed WSDL files in onvif folder 2016-02-10 16:22:34 +01: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
Robin Daermann 226b77bb63 Added script to generate src/zm_bigfont.h 
Also added a line to the header of src/zm_bigfont.h on how it is
generated.
 2016-02-10 11:28:56 +01: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 cb1514193f Merge branch 'schrorg-vivotek-ePTZ' 2016-02-09 06:57:05 -06: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
Andrew Bauer 0b2a309014 Merge pull request #961 from Linwood-F/960-montage-review-new-feature 
960 montage review new feature
 2016-02-08 20:40:04 -06:00
Andrew Bauer 308d98955e By default, enable ONVIF discovery support 2016-02-08 14:05:06 -06:00
Isaac Connor a2ae29dfbe Add php5-gd to depends 2016-02-08 09:47:52 -05:00
Isaac Connor a5c1533ab1 Merge pull request #1266 from onlyjob/codespell 
codespell: misc. spelling corrections
 2016-02-08 09:36:44 -05:00
Dmitry Smirnov 0f63f4357d sphinx: fix warning "Title underline too short". 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2016-02-08 21:06:21 +11: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 e106a86f5e Add Concurrent 2016-02-05 11:59:05 -05:00
Isaac Connor a07dee8a34 bump version to 1.30.2 2016-02-05 11:58:40 -05:00
Isaac Connor e67f247374 add ConcurrentFilter translation 2016-02-05 11:58:20 -05:00
Isaac Connor 51d814ad46 add concurrent to save filter 2016-02-05 11:58:05 -05:00