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
Isaac Connor
60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor
238a25a302 Merge branch 'master' into iconnor_video 2016-04-05 09:38:59 -04:00
Isaac Connor
87088d95ac change error to Warning... it is possible to not have any filters returned 2016-04-05 09:22:36 -04: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
dd7f399959 Merge branch 'remove_local_zm_conf_override' into storageareas 2016-04-04 16:13:44 -04:00
Isaac Connor
a31660c1f6 Remove the code looks for zm.conf in the current dir. 2016-04-04 10:45:58 -04:00
Isaac Connor
82b32578ec Merge branch 'master' into iconnor_video 2016-04-01 12:54:09 -04:00
Isaac Connor
c9a1a9020d Merge h264 2016-03-31 11:03:36 -04:00
Isaac Connor
e5a36c02bd Merge remote-tracking branch 'origin/master' into video_remote 2016-03-30 16:55:24 -04:00
Isaac Connor
ea49dc20d1 Merge branch 'master' into storageareas 2016-03-30 10:58:07 -04:00
Isaac Connor
22554603b1 remove duplicate zmtelemetry.pl entry 2016-03-29 12:31:27 -04:00
Isaac Connor
f0a307e082 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 
Conflicts:
	distros/ubuntu1504_cmake/control
 2016-03-29 11:53:17 -04:00
Isaac Connor
e3564f6a63 add zmtelemtry.pl 2016-03-29 11:51:03 -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
Isaac Connor
3a8352eb6b Merge branch 'master' into storageareas 2016-03-21 10:25:03 -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
Isaac Connor
0e8fc7953d Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-03-07 21:46:10 -05:00
Andy Bauer
ab3c35c629 fix missing Net::SFTP::Foreign::debug warning 2016-03-04 17:21:32 -06:00
Isaac Connor
0d8c63f578 Merge branch 'master' into storageareas 2016-03-02 09:11:55 -05: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
Isaac Connor
86c223668d Merge branch 'master' into storageareas 2016-02-25 19:11:38 -05:00
Andy Bauer
7a42a8c3f9 add Netcat ONVIF compatible ptz control 2016-02-24 10:15:59 -06:00
Isaac Connor
e12152602b t push origin masterMerge branch 'knnniggett-zmtrigger2' into storageareas 2016-02-22 09:15:45 -05:00
Andrew Bauer
0fce33b2d3 one too many curly brackets 2016-02-22 06:59:14 -06:00
Andy Bauer
a2e06ed70c Prevent zmtrigger from crashing when memory handles change 2016-02-21 17:55:04 -06:00
Isaac Connor
66e76e4c2e Merge branch 'zm_trigger_improvements' into storageareas 2016-02-19 11:09:41 -05: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
68babd783b Merge branch 'master' into storageareas 2016-02-17 09:46:56 -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