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
ef8f5ceb23
Dockerfile Xenial & php 7 support
2017-02-18 00:17:18 +02:00
2bfb28c079
Merged Dockerfile from feature-h264-videostorage to master
2017-02-17 23:34:17 +02:00
fe8166e64c
Merge pull request #1 from ZoneMinder/master
...
17/2/2017
2017-02-17 23:13:01 +02: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
ca303da030
added documentation for feature that allows %tags% to passed as command line args to the exec command in addtion to the event path
2017-02-15 09:38:19 -05:00
7c765b5516
added feature to allow %tags% in arguments of exec command
2017-02-15 09:37:45 -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
d135216ac7
Merge branch 'master' into storageareas
2017-02-15 09:30:35 -05:00
1c5f5e9109
Merge pull request #1777 from vajonam/1776-fix-typo
...
fix typo for correct checking if a command has excuted for an event, …
2017-02-15 09:07:02 -05:00
f0b2910647
fix typo for correct checking if a command has excuted for an event, prevents execution on every filter run
2017-02-15 08:10:50 -05:00
cfb18a05ba
build in auto snapshot from date
2017-02-14 12:14:28 -05:00
706f7239c5
go back to 1.0
2017-02-14 11:57:34 -05:00
60b78ea222
go back to quilt
2017-02-14 11:56:20 -05:00
0f7910cabf
try custom
2017-02-14 11:54:35 -05:00
0677152c2a
try out git format
2017-02-14 11:50:30 -05:00
c58b44bd9e
try out the git format
2017-02-14 11:45:13 -05:00
808d070414
don't copy smCodes, just get a pointer to it.
2017-02-14 11:29:43 -05:00
a95fea4bef
change default Storage location to /var/cache/zoneminder/events
2017-02-14 11:29:20 -05:00
f511af6b89
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-02-14 09:13:23 -05:00
aeedfe8d74
fix some whitespacing
2017-02-14 09:11:54 -05:00
9dcbb8cf4d
Merge pull request #1774 from michaelarnauts/docker-no-ssh
...
Remove SSH server from docker image
2017-02-14 21:40:45 +11:00
5b6a75d171
Merge pull request #1772 from markosv/1771-h264-dockerfile
...
Dockerfile to build feature-h264-videostorage
2017-02-14 21:28:00 +11:00
Kaarle Ritvanen
Isaac Connor
Andy Bauer
Matthew Noorenberghe
Dan Walkes
Isaac Connor
Manojav Sridhar
Markos Vakondios
Andrew Bauer
Kyle Johnson
Andrew Bauer
Steve Gilvarry