4fc0aead70
wip
2017-03-01 15:26:40 -05:00
b8a162b2dc
comment out autosetup patch
2017-02-28 14:23:20 -06:00
7a06166d6b
fix path in patch
2017-02-28 08:20:55 -06:00
42a5dea4bb
temporarily deploy all commits rather than just to master
2017-02-28 07:30:11 -06:00
37e34b3715
fix exit code
2017-02-28 07:28:07 -06:00
cd9a3fd59b
fix %autosetup support
2017-02-28 07:26:54 -06:00
c4caa9a631
convert arguments from an array of strong to a hash and use http_build_query
2017-02-27 21:48:08 -05:00
c3a52272d8
implement changeWidth, changeHeight and alter getStreamHTML to take an array of options
2017-02-27 20:56:14 -05:00
a0dd36d869
add width and height scale dropdowns
2017-02-27 16:40:40 -05:00
526d1bc99e
configure rsync xfers to zmrepo
2017-02-27 09:45:08 -06:00
b9cd96b269
initial ssh config, add encrypted rsa keys
2017-02-27 08:38:58 -06:00
f9c6742c25
Merge pull request #1794 from knnniggett/getdiskpercent
...
use === operator in getDiskPercent function
2017-02-21 14:53:36 -05:00
8759e2bdb4
prevent divide by zero, make error messages more descriptive
2017-02-21 13:10:41 -06:00
27ca8d8674
use === operator in getDiskPercent function
2017-02-21 12:33:05 -06:00
660939ff37
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-02-21 09:50:52 -05:00
c36872daa5
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-02-21 09:48:12 -05:00
186e5ba866
Merge branch 'master' into storageareas
2017-02-21 09:48:00 -05:00
971c70f540
Merge pull request #1793 from mnoorenberghe/api_debug_default
...
Reduce the default API debug level
2017-02-20 21:44:48 -05:00
f49011c2f3
Merge branch 'master' into storageareas
2017-02-20 14:21:28 -05:00
81403eb1ce
Merge pull request #1792 from kunkku/link-content
...
zmlinkcontent: fix syntax error
2017-02-20 06:52:46 -06:00
548464c0d5
zmlinkcontent: fix syntax error
2017-02-20 11:12:15 +02:00
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
4f8b11d56f
move bash commands into external script
2017-02-19 10:18:59 -06:00
c305f9dbfd
add set -ev
2017-02-19 07:56:34 -06:00
8dbea3a20a
set correct perms on zm.conf
2017-02-19 07:40:34 -06:00
df4739826b
Reduce the default API debug level
2017-02-18 23:06:53 -08:00
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
34d462a5d5
Merge branch 'zm_packet' into ffmpeg_321
2017-02-18 15:23:21 -05:00
f19b3d5505
create zm_packet
2017-02-18 15:22:56 -05:00
f50c0e2096
fix missing isset check, caused number of Undefined Property warnings
2017-02-18 11:15:43 -05:00
d64de1f65a
remove clang compiler for now
2017-02-18 09:04:52 -06:00
a66c15f8a3
use sudo and specify full path to binaries
2017-02-18 08:36:04 -06:00
3bdb84cf0f
initial commit to use packpack
2017-02-18 07:57:51 -06:00
33e8afa0e0
only patch packpack if it is not already patched
2017-02-17 13:25:17 -06:00
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
11b90e6011
fix usage of wrong key
2017-02-17 12:37:58 -05:00
70820abc1e
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-02-17 10:55:50 -05:00
d139623ed5
change where binary packages get uploaded to
2017-02-17 09:42:30 -05:00
980b088d57
google style and add label tags around Scale
2017-02-17 09:19:54 -05:00
dc76a876a1
packpack rpm specfile - ensure Crud submodule folder is empty
2017-02-17 07:07:17 -06:00
4809a5d7de
patch packpack to remove "bebian" from the tarball filename
2017-02-16 15:59:43 -06:00
a97941edd3
change level from error to debug on message about not supporting non-FLTP
2017-02-16 13:30:34 -05:00
8280f79c32
set default on DefaultVideo
2017-02-16 13:29:19 -05:00
ef653b97d7
set default on DefaultVideo
2017-02-16 13:28:50 -05:00
78612e3925
use format 1.0
2017-02-15 11:25:11 -05:00
63d92323eb
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2017-02-15 11:18:49 -05:00
4792d21a68
use source format 1.0
2017-02-15 10:56:38 -05:00
2bf4b5ad1a
use escapeshellarg on inputs to daemonControl and other functions where exec is called
2017-02-15 09:45:25 -05:00
8231af757c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-02-15 09:32:08 -05:00
04e4b1a210
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-02-15 09:30:50 -05:00
Isaac Connor
Andrew Bauer
Isaac Connor
Isaac Connor
Andrew Bauer
Andy Bauer
Kaarle Ritvanen
Matthew Noorenberghe
Dan Walkes
Manojav Sridhar
Kyle Johnson