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

6448 Commits

Author SHA1 Message Date
Kyle Johnson f4d51d01a9 Merge pull request #1273 from knnniggett/enableonvif 
By default, enable ONVIF discovery support
 2016-02-16 12:53:05 -07:00
Andrew Bauer 5f771327be Merge pull request #1295 from ZoneMinder/zmdc_better_error_messages 
include the sock path in the error message and output an error on fai…
 2016-02-16 10:04:11 -06: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
Isaac Connor 26f5f12190 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-02-16 09:29:57 -05:00
Isaac Connor 172a4c6bd4 Add montagereview.php to autotools build. 2016-02-16 09:29:49 -05:00
Isaac Connor 6f221ed269 Merge pull request #1278 from schrorg/bigfont-license 
Added script to generate src/zm_bigfont.h
 2016-02-16 09:17:54 -05:00
Isaac Connor e2f88f6bb6 Merge pull request #1293 from kunkku/memcpy-overlap 
zm_monitor: fix overlap in memcpy buffers
 2016-02-16 09:16:04 -05:00
Isaac Connor b3f5c10591 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-02-16 08:59:56 -05:00
Kaarle Ritvanen 6332f28c53 zm_monitor: fix overlap in memcpy buffers 
behavior undefined by POSIX and causes a crash with FORTIFY_SOURCE
 2016-02-16 11:47:49 +02: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 37c7b71b03 add out-of-source build support to onvif/scripts folder 2016-02-13 15:26:31 -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
SteveGilvarry 4303aa4fe2 Remove libvlc5 and libvlccore5, also attempt clang builds 2016-02-13 16:34:49 +11:00
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