Commit Graph

7427 Commits

Author SHA1 Message Date
Andy Bauer 858b49a603 remove all patches 2017-03-05 13:04:37 -06:00
Andy Bauer 5ea9f695de Merge branch 'master' into travis_test1 2017-03-05 13:02:59 -06:00
Andy Bauer ca71ee8e71 remove rules.new 2017-03-05 12:40:27 -06:00
Andy Bauer 4fe70f0e7d recreate patch 2017-03-05 12:39:03 -06:00
Isaac Connor 2686946ce9 Merge pull request #1800 from knnniggett/fix_deb_zm.conf_perms
fix permissions on zm.conf in deb pkg scripts
2017-03-05 13:32:48 -05:00
Andy Bauer c6fc6cb0ca change patch method 2017-03-05 11:46:45 -06:00
Andy Bauer 7e0860f6bf move patch after symlink is established 2017-03-05 11:37:22 -06:00
Andy Bauer 696cfb1fc3 patch deb scripts to set perms on zm.conf 2017-03-05 11:14:28 -06:00
Andy Bauer f66408b998 update the path to zm.conf 2017-03-05 10:50:09 -06:00
Andy Bauer cfeb12fc73 fix permissions on zm.conf in deb pkg scripts 2017-03-05 10:37:44 -06:00
Andy Bauer b4a04b1d61 allow builds from local command line e.g. when not running Travis 2017-03-05 10:26:36 -06:00
Andy Bauer 18ce4ab966 install zoneminder deb only when running in Travis 2017-03-05 09:06:57 -06:00
Andy Bauer 713b2c12a3 add gdebi as required binary 2017-03-05 08:32:52 -06:00
Andy Bauer 6ec3a29f3e set version & release vars prior to calling packpack 2017-03-04 18:09:42 -06:00
Andy Bauer 02ea25e8a0 set group ownership on zm.conf 2017-03-04 10:49:14 -06:00
Andy Bauer 285e04bbf8 move code into subroutines, retire installzm.sh 2017-03-04 10:30:36 -06:00
Andy Bauer 92eda0b298 add Travis cron functionality 2017-03-04 10:16:05 -06:00
Andy Bauer 1dda7eeef1 change exit codes, debian filename issue fixed upstream 2017-03-04 09:44:42 -06:00
Andrew Bauer b8a162b2dc comment out autosetup patch 2017-02-28 14:23:20 -06:00
Andrew Bauer 7a06166d6b fix path in patch 2017-02-28 08:20:55 -06:00
Andrew Bauer 42a5dea4bb temporarily deploy all commits rather than just to master 2017-02-28 07:30:11 -06:00
Andrew Bauer 37e34b3715 fix exit code 2017-02-28 07:28:07 -06:00
Andrew Bauer cd9a3fd59b fix %autosetup support 2017-02-28 07:26:54 -06:00
Andrew Bauer 526d1bc99e configure rsync xfers to zmrepo 2017-02-27 09:45:08 -06:00
Andrew Bauer b9cd96b269 initial ssh config, add encrypted rsa keys 2017-02-27 08:38:58 -06:00
Isaac Connor e723b6dbef Must cast codec 2017-02-21 16:28:53 -05:00
Isaac Connor 0880412e7f Merge branch 'master' into feature-h264-videostorage 2017-02-21 16:04:27 -05:00
Isaac Connor f9c6742c25 Merge pull request #1794 from knnniggett/getdiskpercent
use === operator in getDiskPercent function
2017-02-21 14:53:36 -05:00
Andy Bauer 8759e2bdb4 prevent divide by zero, make error messages more descriptive 2017-02-21 13:10:41 -06:00
Andy Bauer 27ca8d8674 use === operator in getDiskPercent function 2017-02-21 12:33:05 -06:00
Isaac Connor 971c70f540 Merge pull request #1793 from mnoorenberghe/api_debug_default
Reduce the default API debug level
2017-02-20 21:44:48 -05:00
Andrew Bauer 81403eb1ce Merge pull request #1792 from kunkku/link-content
zmlinkcontent: fix syntax error
2017-02-20 06:52:46 -06:00
Kaarle Ritvanen 548464c0d5 zmlinkcontent: fix syntax error 2017-02-20 11:12:15 +02:00
Isaac Connor 6ecfdf2c31 Merge pull request #1790 from vajonam/1789-fix-misssing-isset-check
fix missing isset check, caused number of Undefined Property warnings
2017-02-19 17:12:26 -05:00
Andy Bauer 4f8b11d56f move bash commands into external script 2017-02-19 10:18:59 -06:00
Andy Bauer c305f9dbfd add set -ev 2017-02-19 07:56:34 -06:00
Andy Bauer 8dbea3a20a set correct perms on zm.conf 2017-02-19 07:40:34 -06:00
Matthew Noorenberghe df4739826b Reduce the default API debug level 2017-02-18 23:06:53 -08:00
Dan Walkes aa1aeeeca4 Additional controls for FI8908W cameras
Mobile application ZM View uses relative move commands and presetGoto
commands which were not supported by the previous version of the script.

Add these commands based on documentation in
http://www.foscam.es/descarga/ipcam_cgi_sdk.pdf

Commands were tested on an FI8908W camera running version 11.37.2.65
firmware
2017-02-18 17:14:59 -07:00
Manojav Sridhar f50c0e2096 fix missing isset check, caused number of Undefined Property warnings 2017-02-18 11:15:43 -05:00
Andy Bauer d64de1f65a remove clang compiler for now 2017-02-18 09:04:52 -06:00
Andy Bauer a66c15f8a3 use sudo and specify full path to binaries 2017-02-18 08:36:04 -06:00
Andy Bauer 3bdb84cf0f initial commit to use packpack 2017-02-18 07:57:51 -06:00
Markos Vakondios ef8f5ceb23 Dockerfile Xenial & php 7 support 2017-02-18 00:17:18 +02:00
Markos Vakondios 2bfb28c079 Merged Dockerfile from feature-h264-videostorage to master 2017-02-17 23:34:17 +02:00
Markos Vakondios fe8166e64c Merge pull request #1 from ZoneMinder/master
17/2/2017
2017-02-17 23:13:01 +02:00
Andrew Bauer 33e8afa0e0 only patch packpack if it is not already patched 2017-02-17 13:25:17 -06:00
Kyle Johnson b2b73edbfa Merge pull request #1785 from vajonam/1784-wrong-key-for-alarmref
fix usage of wrong key
2017-02-17 11:13:06 -07:00
Manojav Sridhar 11b90e6011 fix usage of wrong key 2017-02-17 12:37:58 -05:00
Andrew Bauer dc76a876a1 packpack rpm specfile - ensure Crud submodule folder is empty 2017-02-17 07:07:17 -06:00