538658403c
Merge pull request #1822 from knnniggett/csrf
...
Implement CSRF Mitigation
2017-03-30 10:39:55 -04:00
e46f64125e
Update zoneminder.tmpfiles.in
...
With cakephp debug mode off, we must ensure cake's tmp folders are created
2017-03-29 13:28:15 -05:00
96b14bd646
Merge pull request #1836 from connortechnology/fix_x10
...
fix inserting x10 record with missing comma
2017-03-29 08:01:28 -05:00
fe5fe63254
Update zoneminder.service.in
...
This was a typo. Quotes are not needed.
2017-03-29 07:53:15 -05:00
184eb507a7
zm_local_camera.cpp: Improve format strings
...
This avoids printing '0x0' as char and hence terminating the output too
early.
2017-03-29 12:45:44 +02:00
589b369109
fix inserting x10 record with missing ,
2017-03-28 20:03:46 -04:00
eb55a6bb9b
set action,view, and/or request to NULL if there are not defined
2017-03-28 17:52:31 -05:00
4e16ae6d19
add ZM_ENABLE_CSRF_MAGIC toggle
2017-03-28 17:29:36 -05:00
c69b37c4ac
Merge pull request #1835 from connortechnology/setup_api_cache_dirs
...
Setup api cache dirs
2017-03-24 12:35:49 -05:00
7c86bcdfce
add the link from /usr/share/zoneminder/www/api/app/tmp to /var/tmp
2017-03-24 11:52:55 -04:00
f082183fd6
add the cache directories used by cake php under /var/tmp
2017-03-24 11:52:29 -04:00
a43adc241f
fix incorrect gpl license mailing address
2017-03-22 07:03:53 -05:00
8debb1277f
Fixed out-of-source building failing because pod2man fails to find the files, and cmake complains about target name containing slahes
2017-03-21 22:46:10 +02:00
eaca58bb7c
Merge pull request #1815 from mnoorenberghe/postlogin
...
Properly escape postLoginQuery. Fixes #1797
2017-03-21 10:27:13 -04:00
676f92d3f1
Merge pull request #1828 from mnoorenberghe/api_user_enabled
...
Fix check that API user is enabled
2017-03-20 21:09:14 -04:00
ea558c79a0
Fix check that API user is enabled
2017-03-20 17:16:24 -07:00
b1d5fbef0b
revert an unintended change
2017-03-20 13:19:50 -04:00
badbf1c74c
Merge pull request #1816 from mnoorenberghe/flat_window_sizes
...
Increase default window sizes for the flat theme. Fixes #1059
2017-03-20 13:10:13 -04:00
9f30ccfa75
Use new UriDecode function to decode username and password
2017-03-20 11:16:39 -04:00
3b15ba91d1
Rough in a CURL based UriDecode
2017-03-20 11:16:21 -04:00
7bb0d12a4f
Merge pull request #1819 from ZoneMinder/Copyright_patch1
...
Fix failure to attribute previous work
2017-03-20 09:17:03 -05:00
2dcd95bc7f
Merge pull request #1504 from ZoneMinder/improve_filter
...
Improve filter
2017-03-18 21:12:58 -05:00
d38bae72ae
integrate csrf-magic library
2017-03-18 20:12:06 -05:00
e5b18ee213
Remove zmc -r argument as it does not seem to be implemented.
2017-03-18 23:25:14 +11:00
3a69238381
Fix failure to attribute previous work
...
Just fixing this up as there is a issue logged from Debian for it.
2017-03-18 23:05:32 +11:00
91ad6afffb
Increase default window sizes for the flat theme. Fixes #1059
...
Used the computed height of <html> and rounded up the nearest multiple of 5.
2017-03-17 22:24:42 -07:00
ea5342abd2
Properly escape postLoginQuery. Fixes #1797
2017-03-17 21:05:28 -07:00
9d6a65abbe
have to use ln with -T flag to force overwrite of existing link
2017-03-17 09:32:58 -05:00
c24853ad11
Merge pull request #1806 from adam900710/compile_fix
...
ZoneMinder: Rename public enum CHAR_WIDTH/CHAR_HEIGHT to avoid conflicts
2017-03-17 09:42:15 -04:00
0d4acb9bc8
Merge pull request #1811 from connortechnology/fix_crash_with_invalid_zones
...
Fix zmc crashing when zones are no good
2017-03-16 14:51:42 -05:00
6a447194eb
Fix zmc crashing when zones are no good bby decreasing n_zone before continuing
2017-03-16 10:55:13 -04:00
9681a444b4
Merge pull request #1765 from SteveGilvarry/ffmpeg_url
...
Align Method description to what it is actually doing
2017-03-16 09:32:30 -05:00
7e0ac4b239
Merge pull request #1780 from connortechnology/fix_1775
...
use escapeshellarg on inputs to daemonControl and other functions
2017-03-16 09:27:04 -05:00
0b9853e1d4
ZoneMinder: Rename public enum CHAR_WIDTH/CHAR_HEIGHT to avoid conflicts
...
CHAR_WIDTH is defined by limits.h, and class Image redefines it to 6,
which causes gcc6, clang, gcc5 to complain about it.
Fix by adding ZM_ prefix to CHAR_WIDTH and CHAR_HEIGHT, so it can be
compiled.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
2017-03-12 22:00:46 +08:00
e61a3fae9c
always delete then recreate Crud folder for redhat builds
2017-03-07 14:44:53 -06:00
d6caa7562f
move the check for trusty arch
2017-03-07 14:43:14 -06:00
f23e43ef85
add multiarch support
2017-03-07 14:24:06 -06:00
b514ab0b3c
remove double quotes
2017-03-06 18:56:44 -06:00
bfe84e6a7c
move debain versioning into a function
2017-03-06 18:54:55 -06:00
0ee6da84c0
set VERSION & RELEASE in trusty build
2017-03-06 18:41:48 -06:00
0cf94c3573
echo VERSION and RELEASE
2017-03-06 18:27:45 -06:00
6dc2b13aee
change package versioning scheme
2017-03-06 15:25:54 -06:00
07a9a8bf70
check the built package exists signal failure if it doesn't
2017-03-06 06:50:59 -06:00
297e9b0463
remove set -e, deploy on master branch only
2017-03-05 14:02:02 -06:00
42887c8c2c
specify the deb package name more precisely
2017-03-05 13:44:42 -06:00
26fbc04f7c
fix typo
2017-03-05 13:41:17 -06:00
858b49a603
remove all patches
2017-03-05 13:04:37 -06:00
5ea9f695de
Merge branch 'master' into travis_test1
2017-03-05 13:02:59 -06:00
ca71ee8e71
remove rules.new
2017-03-05 12:40:27 -06:00
4fe70f0e7d
recreate patch
2017-03-05 12:39:03 -06:00
Isaac Connor
Andrew Bauer
Michael Schupikov
Isaac Connor
Andy Bauer
Kfir Itzhak
Matthew Noorenberghe
Andrew Bauer
SteveGilvarry
Qu Wenruo