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

3315 Commits

Author SHA1 Message Date
Kyle Johnson 32286a4869 Added a zmcontrol after_success test 2014-01-02 11:51:19 -05:00
Kyle Johnson 07b4d83d74 Have Usage() in zmcontrol.pl exit 0 instead of -1 2014-01-02 11:50:39 -05:00
Kyle Johnson 739b7b3293 Added a zmfilter after_success test 2014-01-02 11:45:26 -05:00
Kyle Johnson 6534aa546c Fixed readme.debian fstab bind examples 
After receiving a bug report that the examples did not work, I tried them myself.  They did not work, so I updated them to something that does work.
 2014-01-02 08:24:58 -05:00
Andrew Bauer ab06878b7b Update zoneminder.cmake.f19.spec 
Add BuildRequires perl(Sys::Syslog) to successfully build with mock
 2014-01-01 15:03:12 -06:00
Isaac Connor 5669a16502 Merge pull request #293 from hankintosh/master 
Enclose value of the Notes attribute with quotes.
 2014-01-01 11:22:14 -08:00
Andrew Bauer 0eac723409 glob ptz scripts under control folder 2014-01-01 12:17:13 -06:00
Kfir Itzhak f39667c0cd Fix ZM not compiling with ZM_NO_FFMPEG=ON since #259, closes #285 2014-01-01 18:19:42 +02:00
Andrew Bauer 2f3934c20e Merge pull request #289 from dmak/foscam 
Foscam IP cameras control script
 2014-01-01 07:30:46 -08:00
Dmitry Katsubo 20dd76b354 Using the full path for ZM_VERSION. Using "Control Device" value for user/password. 2014-01-01 13:16:53 +01:00
Adam J. Henry e6b9b8218b Enclose value of the Notes attribute with quotes. 2013-12-31 17:32:20 -06:00
Isaac Connor 4f9492f766 Merge pull request #290 from dmak/debian 
Fix for few problems in Debian packaging
 2013-12-31 07:38:41 -08:00
Kfir Itzhak 0ff77d835b Improved error handling and other minor changes 2013-12-31 15:50:06 +02:00
Dmitry Katsubo b370f98004 Improved the script using advise from http://stackoverflow.com/a/16405301/267197 so that re-running the script does not crash reinstall. 2013-12-30 15:32:20 +01:00
Dmitry Katsubo e745bbf14e No need to redefine RUNDIR and ZM_RUNDIR, as they already depend on DESTDIR. 2013-12-30 15:32:06 +01:00
Dmitry Katsubo 7bf0bcf4ef Updated package version (otherwise build process stops). 2013-12-30 15:31:50 +01:00
Dmitry Katsubo 3fb76eaf35 Initial version of control file for Foscam IP cameras. 
Taken from http://www.zoneminder.com/wiki/index.php/Foscam
 2013-12-29 22:24:35 +01:00
Kfir Itzhak c1a74c45bc Fixed minor cmake warning 2013-12-27 18:04:24 +02:00
Kfir Itzhak ff9a26273c cURL is now working! 2013-12-27 18:02:32 +02:00
Kfir Itzhak bf708a8373 Merge branch 'master' into curl 
Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
	src/zm_camera.h
	src/zm_monitor.cpp
	web/skins/classic/views/console.php
	web/skins/classic/views/monitor.php
 2013-12-27 14:21:12 +02:00
Andrew Bauer 4854c495a2 Merge pull request #284 from knnniggett/zmfix 
Specfile changes related to zmfix
 2013-12-26 11:12:26 -08:00
Scott Robinson f2d9deaed6 Update test.monitor.sql 
testing travis build
 2013-12-24 11:07:27 +00:00
Andrew Bauer dbd2ee348e define variables to toggle x10 & ffmpeg support 2013-12-23 19:41:00 -06:00
Andrew Bauer c4d22672ac Specfile changes related to zmfix 2013-12-23 17:06:31 -06:00
Andrew Bauer 6d093c0407 Merge pull request #276 from knnniggett/foreign 
Disables non-POSIX warning when using gnu wildcard
 2013-12-23 14:49:19 -08:00
Kfir Itzhak 3c3a895ea1 Merge pull request #283 from nkwood/master 
Remove references to zmfix in /distros
 2013-12-23 13:47:55 -08:00
nkwood f4d6d99ab2 Update zoneminder.f19.spec 2013-12-23 15:09:12 -06:00
nkwood 4a89c8d5e9 Update zoneminder.el6.spec 2013-12-23 15:08:19 -06:00
nkwood f12dd88e5d Update zoneminder.cmake.f19.spec 2013-12-23 15:06:38 -06:00
nkwood 8e7d89024f Update zoneminder.cmake.el6.spec 2013-12-23 15:05:11 -06:00
nkwood 942b9c65da Update init.d 2013-12-23 15:01:21 -06:00
nkwood 922385d761 Update init.d 2013-12-23 14:55:56 -06:00
Kfir Itzhak 89cfb96855 Merge pull request #277 from ebarnard/libvlc 
Add libVLC source type
 2013-12-22 13:01:19 -08:00
Scott Robinson 375d67cdf2 Update montage.php 
Make use of new zmMontageScale cookie
 2013-12-22 20:56:18 +00:00
Scott Robinson db41693fd6 Update montage.js 
save montage scale % as cookie
 2013-12-22 20:53:09 +00:00
Isaac Connor 7b26636bcd Merge pull request #280 from ZoneMinder/zmfixremoval 
Remove zmfix
 2013-12-22 11:22:18 -08:00
Isaac Connor 01820117f0 Merge pull request #281 from martonmiklos/master 
In the web/includes/functions.php there were some html formatting errors...
 2013-12-22 11:21:23 -08:00
Miklos Marton 5de638214b In the web/includes/functions.php there were some html formatting errors in the outputVideoStream function. 
These errors were:
- Unclosed object and embed tags
- param tags without closing tags

These errors lead to rendering errors when using the mobile skins with some specific streaming options.
 2013-12-22 15:17:21 +01:00
Kfir Itzhak e9bb632a78 Remove zmfix 2013-12-22 16:08:17 +02:00
Edward Barnard 14024451e5 Monitor link now displays for all valid libvlc paths. 2013-12-22 01:29:40 +00:00
Ed Barnard 40b0f5d091 Merge pull request #1 from ZoneMinder/libvlc-improvements 
Add header file checks for vlc/vlc.h
 2013-12-21 17:07:57 -08:00
Edward Barnard 6c94308ba0 Fix bug in frame difference checker. 2013-12-22 01:06:12 +00:00
Andrew Bauer b5e4e1e573 Update FI8608W_Y2k.pm 
Fix typo
 2013-12-21 11:32:47 -06:00
Kyle Johnson 2cadb3c5a6 Fixed a small typo in ConfigData.pm.in 2013-12-21 10:55:36 -05:00
Andrew Bauer 45385526d7 Update README.CentOS 
Future versions of zmupdate will requite the Lock Tables permission.  Documentation updated accordingly.
 2013-12-21 09:45:40 -06:00
Andrew Bauer db2398d1ba Update README.Fedora 
Future versions of zmupdate will requite the Lock Tables permission.  Documentation updated accordingly.
 2013-12-21 09:45:21 -06:00
Kfir Itzhak dce1cbf0ce Add header file checks for vlc/vlc.h 2013-12-21 06:47:12 +02:00
Edward Barnard aa6380c4bd Might now build with autotools. 2013-12-19 23:15:16 +00:00
Edward Barnard 3e2647782d Better error handling 2013-12-19 23:10:45 +00:00
Edward Barnard f4d72752a8 Check for frame differences as libvlc provides frames at a constant 15fps even if they are duplicates 2013-12-19 23:02:21 +00:00