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
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
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
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
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
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
c3da373b1b
Disable SSH
2017-02-14 10:52:00 +01:00
bf94980516
Merge pull request #1773 from ZoneMinder/SteveGilvarry-patch-1
...
Add the missing F back in.
2017-02-13 08:15:16 -07:00
bf99d132c7
Add the missing F back in.
2017-02-13 22:15:10 +11:00
13f8d7dba0
Dockerfile to build feature-h264-videostorage
2017-02-12 13:14:48 +02:00
5201abd77d
Merge pull request #1770 from ZoneMinder/undo_1590
...
remove line that causes endless reading when doing single image mode
2017-02-11 09:14:07 -06:00
d5bb6f3210
remove line that causes endless reading when doing single image mode
2017-02-11 09:57:36 -05:00
9b7465b328
Merge pull request #1767 from knnniggett/preset_docs
...
add motion zone preset disclaimer
2017-02-10 09:43:11 -05:00
e680941568
add motion zone preset disclaimer
2017-02-10 08:30:13 -06:00
91dd2105d2
rpmspecfile - use %{_sysconfdir} macro
2017-02-08 20:44:00 -06:00
bd4aea0385
rpm specfile - php requires was listed twice
2017-02-08 20:21:23 -06:00
9c8c87f591
rpm specfile - require php-mysqli, bump to 1.30.2
2017-02-08 20:12:54 -06:00
74dd8ab027
make clang happy take two
2017-02-06 09:57:22 +03:00
b791504598
Wording of help text fixes
2017-02-06 08:01:04 +11:00
c7aaa8a933
Merge pull request #1 from knnniggett/master
...
check for polkit only if systemd is present
2017-02-05 12:16:42 +04:00
9716c4ef89
Add Option help
2017-02-05 18:43:47 +11:00
c72704bf0b
Change descriptions for ffmpeg methods and put TCP first.
2017-02-05 15:34:06 +11:00
8feac1747d
Merge pull request #1764 from ZoneMinder/vulerability-fixes
...
sql injection and session fixation vulerability fixes
2017-02-04 16:23:51 -06:00
5804cd2462
Merge pull request #2 from connortechnology/fix_sql_injection
...
Sanitize input parameters
2017-02-04 15:05:54 -07:00
c5906a5d4f
Merge pull request #6 from connortechnology/log_xss_fixes2
...
Log xss fixes2
2017-02-04 16:05:43 -06:00
024dd54716
Merge pull request #7 from ZoneMinder/pdo-emulated-prepares
...
Tell PDO to use real prepared statements.
2017-02-04 15:05:25 -07:00
6b3a53ec0f
Tell PDO to use real prepared statements.
...
This makes sure the statement and the values aren't
parsed by PHP before sending it to the MySQL server.
See https://stackoverflow.com/questions/60174/how-can-i-prevent-sql-injection-in-php
and https://secure.php.net/manual/en/pdo.setattribute.php
2017-02-04 14:59:33 -07:00
160aa1cac4
check for polkit only if systemd is present
2017-02-04 15:34:57 -06:00
8d5a8f5512
make clang happy
2017-02-03 14:53:53 +03:00
9135da92ed
fix typo fileFields => filterFields
2017-01-31 21:33:43 -05:00
acd1d96a06
revert change to zoneminder-config.cmake
2017-01-31 11:13:16 -05:00
dc778058f5
fix detection of LIBSWRESAMPLE
2017-01-31 11:13:16 -05:00
Andy Bauer
Matthew Noorenberghe
Dan Walkes
Manojav Sridhar
Markos Vakondios
Andrew Bauer
Kyle Johnson
Andrew Bauer
Isaac Connor
Isaac Connor
Steve Gilvarry
Michaël Arnauts
abishai
abishai