Isaac Connor
|
e04cc1be05
|
add mp4 and x264 to ubuntu1204 and remove duplicated mp4.x264 lines from ubuntu1604.
|
2017-03-11 10:41:39 -05:00 |
Isaac Connor
|
6ac6161af6
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-03-08 16:25:16 -05:00 |
Andy Bauer
|
e61a3fae9c
|
always delete then recreate Crud folder for redhat builds
|
2017-03-07 14:44:53 -06:00 |
|
Andy Bauer
|
d6caa7562f
|
move the check for trusty arch
|
2017-03-07 14:43:14 -06:00 |
|
Andy Bauer
|
f23e43ef85
|
add multiarch support
|
2017-03-07 14:24:06 -06:00 |
|
Isaac Connor
|
14c4a156c6
|
set img.src='' first so that Chrome closes the old stream.
|
2017-03-06 20:21:12 -05:00 |
Andrew Bauer
|
b514ab0b3c
|
remove double quotes
|
2017-03-06 18:56:44 -06:00 |
|
Andrew Bauer
|
bfe84e6a7c
|
move debain versioning into a function
|
2017-03-06 18:54:55 -06:00 |
|
Andrew Bauer
|
0ee6da84c0
|
set VERSION & RELEASE in trusty build
|
2017-03-06 18:41:48 -06:00 |
|
Andrew Bauer
|
0cf94c3573
|
echo VERSION and RELEASE
|
2017-03-06 18:27:45 -06:00 |
|
Isaac Connor
|
4df12ae370
|
Merge branch 'montage_width_height' of github.com:ConnorTechnology/ZoneMinder into montage_width_height
|
2017-03-06 17:30:00 -05:00 |
|
Isaac Connor
|
d3f7451736
|
Merge branch 'storageareas' into montage_width_height
|
2017-03-06 16:56:18 -05:00 |
|
Andrew Bauer
|
6dc2b13aee
|
change package versioning scheme
|
2017-03-06 15:25:54 -06:00 |
|
Isaac Connor
|
fdcb93eacc
|
Merge branch 'master' into storageareas
|
2017-03-06 16:22:28 -05:00 |
|
Isaac Connor
|
3f7583ebda
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-03-06 16:22:25 -05:00 |
|
Andrew Bauer
|
07a9a8bf70
|
check the built package exists signal failure if it doesn't
|
2017-03-06 06:50:59 -06:00 |
|
Andy Bauer
|
297e9b0463
|
remove set -e, deploy on master branch only
|
2017-03-05 14:02:02 -06:00 |
|
Andy Bauer
|
42887c8c2c
|
specify the deb package name more precisely
|
2017-03-05 13:44:42 -06:00 |
|
Andy Bauer
|
26fbc04f7c
|
fix typo
|
2017-03-05 13:41:17 -06:00 |
|
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 |
|
Isaac Connor
|
ebafc62b51
|
Must reopen the session so we can generate an auth hash
|
2017-03-01 15:27:42 -05:00 |
|
Isaac Connor
|
4fc0aead70
|
wip
|
2017-03-01 15:26:40 -05: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 |
|
Isaac Connor
|
c4caa9a631
|
convert arguments from an array of strong to a hash and use http_build_query
|
2017-02-27 21:48:08 -05:00 |
Isaac Connor
|
c3a52272d8
|
implement changeWidth, changeHeight and alter getStreamHTML to take an array of options
|
2017-02-27 20:56:14 -05:00 |
|
Isaac Connor
|
a0dd36d869
|
add width and height scale dropdowns
|
2017-02-27 16:40:40 -05: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
|
f9c6742c25
|
Merge pull request #1794 from knnniggett/getdiskpercent
use === operator in getDiskPercent function
|
2017-02-21 14:53:36 -05:00 |