Commit Graph

3249 Commits

Author SHA1 Message Date
Andrew Bauer dbe6fc539c Additional error checking 2014-01-25 11:26:29 -06:00
Andrew Bauer ae1731477b further refinements 2014-01-25 10:39:38 -06:00
Andrew Bauer 2037afb3ca new subroutine runQuery 2014-01-23 08:41:47 -06:00
Andrew Bauer 869a139809 create rmName subroutine 2014-01-22 19:18:08 -06:00
Andy Bauer 91b0676343 Call checkName for certain reptitive tasks 2014-01-22 09:20:56 -06:00
Andrew Bauer f00e72be1e Initial commit for new zmcamtool.pl script 2014-01-21 16:22:30 -06:00
Andrew Bauer ed40ee4d11 Update zm_create.sql.in
Fix typo created during a manual merge
2014-01-17 09:54:37 -06:00
Andrew Bauer b2b9f3f466 Merge branch 'master' of https://github.com/Tim-Craig/ZoneMinder into Tim-Craig-master
Conflicts:
	db/zm_create.sql.in
2014-01-17 09:50:05 -06:00
Andrew Bauer 532d1ba413 Update zm_create.sql.in
Don't explicitly set the Id number of each ptz control.  The auto increment flag has previously been turned on so mysql will insert the proper value for us when we create a new record. This will make the list of ptz controls easier to manager as the list gets bigger.
2014-01-17 08:42:26 -06:00
Andrew Bauer c2a0c5917d Update zm_create.sql.in
Changed the CaSe on a few INSERT INTO statements for consistency.
2014-01-17 08:38:54 -06:00
Andrew Bauer 10ebb7442c Update zm_create.sql.in
When creating a new dB, we should drop the Logs table if it already exists, just like we do with the other tables.
2014-01-17 08:35:37 -06:00
tim 05e395613b Adding PTZ module for Toshiba IK-WB11A 2014-01-14 00:58:12 -08:00
Kfir Itzhak 784f9d925c Remove src/zm_config_defines.h from repository as its not needed, its generated by zmconfgen.pl and will cause conflicts when doing an out-of-source build 2014-01-12 13:27:59 +02:00
Kfir Itzhak a74b22a5ed Merge pull request #297 from ZoneMinder/curl
Add cURL source type
2014-01-11 06:04:03 -08:00
Kfir Itzhak 3ded7276e1 Attempt to fix zmu "Error, failed to enumerate standard X: Success"
http://www.zoneminder.com/forums/viewtopic.php?f=30&t=21803
2014-01-10 13:40:52 +02:00
Kfir Itzhak 936198de85 Fix typo 2014-01-10 09:27:55 +02:00
Kfir Itzhak b2a65dc343 cURL minor corrections and improvements 2014-01-10 09:17:12 +02:00
Kfir Itzhak 21f7ec12eb Added useful string functions that will be used later on for rtsp digest authentication 2014-01-08 15:57:17 +02:00
Andrew Bauer 5ccfa305d3 Merge pull request #294 from knnniggett/glob_ptz_scripts
glob ptz scripts under control folder
2014-01-06 08:50:48 -08:00
Kfir Itzhak 9901ce9e84 Merge remote branch 'origin/master' into curl 2014-01-05 10:16:01 +02:00
Kfir Itzhak e202cdb6d0 Fixed digest authentication and minor changes 2014-01-05 10:15:28 +02:00
Kfir Itzhak a962815624 Change default alarm blend percent to 6 and make upgrades smooth by copying the existing blend percent to the alarm one 2014-01-05 08:59:09 +02:00
Kyle Johnson faaf237731 Revert "Broke zmfilter.pl.in in order to test travis"
This reverts commit acc158f3cb.
2014-01-04 15:10:15 -05:00
Kyle Johnson acc158f3cb Broke zmfilter.pl.in in order to test travis 2014-01-04 15:04:14 -05:00
Kyle Johnson ec9efc22c4 move after_success test to success in .travis.yml 2014-01-04 14:54:15 -05:00
Kyle Johnson d92d100784 Move travis db creative to before_script 2014-01-04 14:48:13 -05:00
Kyle Johnson 0bf4122016 Set execute bit on travis.pl 2014-01-04 14:45:22 -05:00
Kyle Johnson 2b789332c8 Initial commit of perl test script for travis builds 2014-01-04 14:44:12 -05:00
Isaac Connor 6e5d9272e0 supposed to fix #296 2014-01-03 18:33:01 -05:00
Isaac Connor d185f05006 robustness/code style changes 2014-01-03 12:55:30 -05:00
Isaac Connor 3d55dde548 COnfig fixes 2014-01-03 09:33:49 -05:00
Isaac Connor b3af313370 Merge pull request #282 from scottgrobinson/master
Add zmMontageScale so montage scale is also 'saved'
2014-01-02 11:18:39 -08:00
Kyle Johnson c5afecc2b4 Revert "Introducing a bug in zmfilter.pl.in to test travis"
This reverts commit 337750430b.
2014-01-02 12:15:06 -05:00
Kyle Johnson 337750430b Introducing a bug in zmfilter.pl.in to test travis 2014-01-02 12:02:07 -05:00
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