faaf237731
Revert "Broke zmfilter.pl.in in order to test travis"
...
This reverts commit acc158f3cb
2014-01-04 15:10:15 -05:00
acc158f3cb
Broke zmfilter.pl.in in order to test travis
2014-01-04 15:04:14 -05:00
ec9efc22c4
move after_success test to success in .travis.yml
2014-01-04 14:54:15 -05:00
d92d100784
Move travis db creative to before_script
2014-01-04 14:48:13 -05:00
0bf4122016
Set execute bit on travis.pl
2014-01-04 14:45:22 -05:00
2b789332c8
Initial commit of perl test script for travis builds
2014-01-04 14:44:12 -05:00
6e5d9272e0
supposed to fix #296
2014-01-03 18:33:01 -05:00
d185f05006
robustness/code style changes
2014-01-03 12:55:30 -05:00
3d55dde548
COnfig fixes
2014-01-03 09:33:49 -05:00
b3af313370
Merge pull request #282 from scottgrobinson/master
...
Add zmMontageScale so montage scale is also 'saved'
2014-01-02 11:18:39 -08:00
c5afecc2b4
Revert "Introducing a bug in zmfilter.pl.in to test travis"
...
This reverts commit 337750430b
2014-01-02 12:15:06 -05:00
337750430b
Introducing a bug in zmfilter.pl.in to test travis
2014-01-02 12:02:07 -05:00
32286a4869
Added a zmcontrol after_success test
2014-01-02 11:51:19 -05:00
07b4d83d74
Have Usage() in zmcontrol.pl exit 0 instead of -1
2014-01-02 11:50:39 -05:00
739b7b3293
Added a zmfilter after_success test
2014-01-02 11:45:26 -05:00
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
ab06878b7b
Update zoneminder.cmake.f19.spec
...
Add BuildRequires perl(Sys::Syslog) to successfully build with mock
2014-01-01 15:03:12 -06:00
5669a16502
Merge pull request #293 from hankintosh/master
...
Enclose value of the Notes attribute with quotes.
2014-01-01 11:22:14 -08:00
0eac723409
glob ptz scripts under control folder
2014-01-01 12:17:13 -06:00
f39667c0cd
Fix ZM not compiling with ZM_NO_FFMPEG=ON since #259 , closes #285
2014-01-01 18:19:42 +02:00
2f3934c20e
Merge pull request #289 from dmak/foscam
...
Foscam IP cameras control script
2014-01-01 07:30:46 -08:00
20dd76b354
Using the full path for ZM_VERSION. Using "Control Device" value for user/password.
2014-01-01 13:16:53 +01:00
e6b9b8218b
Enclose value of the Notes attribute with quotes.
2013-12-31 17:32:20 -06:00
4f9492f766
Merge pull request #290 from dmak/debian
...
Fix for few problems in Debian packaging
2013-12-31 07:38:41 -08:00
0ff77d835b
Improved error handling and other minor changes
2013-12-31 15:50:06 +02:00
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
e745bbf14e
No need to redefine RUNDIR and ZM_RUNDIR, as they already depend on DESTDIR.
2013-12-30 15:32:06 +01:00
7bf0bcf4ef
Updated package version (otherwise build process stops).
2013-12-30 15:31:50 +01:00
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
c1a74c45bc
Fixed minor cmake warning
2013-12-27 18:04:24 +02:00
ff9a26273c
cURL is now working!
2013-12-27 18:02:32 +02:00
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
4854c495a2
Merge pull request #284 from knnniggett/zmfix
...
Specfile changes related to zmfix
2013-12-26 11:12:26 -08:00
f2d9deaed6
Update test.monitor.sql
...
testing travis build
2013-12-24 11:07:27 +00:00
dbd2ee348e
define variables to toggle x10 & ffmpeg support
2013-12-23 19:41:00 -06:00
c4d22672ac
Specfile changes related to zmfix
2013-12-23 17:06:31 -06:00
6d093c0407
Merge pull request #276 from knnniggett/foreign
...
Disables non-POSIX warning when using gnu wildcard
2013-12-23 14:49:19 -08:00
3c3a895ea1
Merge pull request #283 from nkwood/master
...
Remove references to zmfix in /distros
2013-12-23 13:47:55 -08:00
f4d6d99ab2
Update zoneminder.f19.spec
2013-12-23 15:09:12 -06:00
4a89c8d5e9
Update zoneminder.el6.spec
2013-12-23 15:08:19 -06:00
f12dd88e5d
Update zoneminder.cmake.f19.spec
2013-12-23 15:06:38 -06:00
8e7d89024f
Update zoneminder.cmake.el6.spec
2013-12-23 15:05:11 -06:00
942b9c65da
Update init.d
2013-12-23 15:01:21 -06:00
922385d761
Update init.d
2013-12-23 14:55:56 -06:00
89cfb96855
Merge pull request #277 from ebarnard/libvlc
...
Add libVLC source type
2013-12-22 13:01:19 -08:00
375d67cdf2
Update montage.php
...
Make use of new zmMontageScale cookie
2013-12-22 20:56:18 +00:00
db41693fd6
Update montage.js
...
save montage scale % as cookie
2013-12-22 20:53:09 +00:00
7b26636bcd
Merge pull request #280 from ZoneMinder/zmfixremoval
...
Remove zmfix
2013-12-22 11:22:18 -08:00
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
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
Kyle Johnson
Isaac Connor
Isaac Connor
Kyle Johnson
Andrew Bauer
Kfir Itzhak
Dmitry Katsubo
Adam J. Henry
Scott Robinson
nkwood
Miklos Marton