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

1052 Commits

Author SHA1 Message Date
Andrew Bauer 8bbb443c67 fix invalid key name in config hash 2016-05-20 10:35:03 -05:00
Isaac Connor bb5dbf3e4a Need to import Config Data into Config 2016-05-20 09:29:40 -04:00
Isaac Connor 182fa9a5cd revert the bulk of the merge_db_connects changes. 2016-05-20 08:53:53 -04:00
Isaac Connor 924acf4284 fix zmdc.pl hang due to needing to connect to db after fork 2016-05-19 15:01:31 -04:00
Isaac Connor 8e06c0ec63 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-05-19 12:08:56 -04:00
Isaac Connor 183f9c70a4 Must use ZoneMinder instead of ZoneMinder::Logger 2016-05-19 12:08:45 -04:00
Andrew Bauer 8bac5fbdfb typo - remove extra comma 2016-05-18 16:58:04 -05:00
Andrew Bauer 46039a1887 Merge pull request #1472 from ZoneMinder/v4l1_compat 
V4l1 compat
 2016-05-16 13:02:27 -05:00
Isaac Connor b53a0a564d Don't need the extra use ZoneMinder::Config 2016-05-16 10:07:24 -04:00
Isaac Connor dd24c35afa revert bogus optimisation 2016-05-16 10:05:12 -04:00
Isaac Connor 3780f8a2e6 move functions from ConfigAdmin into Config. I see no reason for them to be in a separate module 2016-05-16 09:31:54 -04:00
Isaac Connor 5df85770cd zmupdate.pl.in 2016-05-13 13:52:34 -04:00
Isaac Connor a5ba4759bf fix new config entry 2016-05-10 10:54:40 -04:00
Isaac Connor 17f4f5789e Merge branch 'master' into v4l1_compat 2016-05-10 10:10:48 -04:00
Isaac Connor 605edfd6d0 add ENV{LD_PRELOAD} setting 2016-05-09 12:46:26 -04:00
Isaac Connor 08bf97fe85 Add a config entry for ZM_LD_PRELOAD 2016-05-09 12:44:41 -04:00
Isaac Connor b33e35bda7 move the require to the top 2016-05-09 12:14:59 -04:00
Isaac Connor 3522c5796b add BEGIN Back to ZoneMinder.pm 2016-05-09 12:01:26 -04:00
Isaac Connor b444c8a6b4 Move the BEGIN from ZoneMinder to ZoneMinder/Base. 2016-05-07 09:34:45 -04:00
Isaac Connor 6e32b5d266 Use fully specified COnfig hash to simplify Symbol tables 2016-05-07 09:34:04 -04:00
Isaac Connor f55f979cc9 use fully specified Config to simplify symbol tables 2016-05-07 09:30:03 -04:00
Isaac Connor e3d581dcab use single quotes instead of double quotes 2016-05-03 10:23:09 -04:00
Isaac Connor 24bf91707f Database module should really use DBI 2016-05-03 10:22:38 -04:00
Isaac Connor e80db4c433 Use zmDbConnect instead of duplicated db connect code 2016-05-03 10:22:16 -04:00
Isaac Connor 49e3d3be7a Turn the config loading code from a BEGIN to a function that could be called repeatedly. 2016-05-03 10:21:50 -04:00
Isaac Connor 9406a2337f Add a BEGIN section to load things in the correct order. 2016-05-03 10:21:01 -04:00
Isaac Connor 30f34a6f49 instead of code duplication for opening the db, use zmDbConnect everywhere 2016-05-03 08:59:40 -04:00
Isaac Connor 55d58a140e instead of code duplication for opening the db, use zmDbConnect everywhere 2016-05-03 08:57:51 -04:00
Steve Gilvarry 6bf43631e2 Merge pull request #1428 from ZoneMinder/better_zmvideo 
Better zmvideo
 2016-04-28 22:00:52 +10:00
Andrew Bauer 1072327dd1 remove extra quote 2016-04-21 08:01:13 -05:00
Andrew Bauer 3a9ab7f685 Merge branch '1128_ssmtp_mail_option' of https://github.com/dreaddy/ZoneMinder into dreaddy-1128_ssmtp_mail_option 2016-04-21 07:27:19 -05:00
Isaac Connor 67f38d07df Merge branch 'master' into better_zmvideo 2016-04-20 12:04:15 -04:00
abi 7058b0862a suppressed warnings of killall for FreeBSD 2016-04-16 16:39:58 +03:00
Andy Bauer 4e9a925933 Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete 2016-04-04 20:52:49 -05:00
Andy Bauer 7ff8d36598 Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00
Isaac Connor a31660c1f6 Remove the code looks for zm.conf in the current dir. 2016-04-04 10:45:58 -04:00
Sándor Czettner 38e3c92546 Minor grammar fixes 2016-03-25 13:18:43 +00:00
Isaac Connor 6d4d05184c fix typo 2016-03-23 09:49:38 -04:00
Isaac Connor d3558c5688 Merge pull request #1323 from knnniggett/zmfilter 
fix missing Net::SFTP::Foreign::debug warning
 2016-03-21 10:47:50 -04:00
Kyle Johnson 4e1af516d7 Don't output sudo test cmd to /dev/null. Other tests aren't, and info us useful. 2016-03-11 14:29:48 -07:00
Kyle Johnson b9085cea64 Fix issue where programs are installed in unexpected paths. 
For example, on freebsd, sudo is in /usr/local/bin, and as things
were pre-this commit, sudo wasn't being found.
 2016-03-11 14:28:16 -07:00
Andrew Bauer facae6cb0d use make "-f" parameter instead of "--makefile" 2016-03-10 13:58:41 -06:00
Andrew Bauer 4606d2fbca Update zmtrigger.pl.in 
mention the %Q placholder when using showtext
 2016-03-10 10:13:38 -06:00
Isaac Connor 313f46dceb add zmtelemetry.pl to autotools build 2016-03-09 11:26:10 -05:00
Andy Bauer ab3c35c629 fix missing Net::SFTP::Foreign::debug warning 2016-03-04 17:21:32 -06:00
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