Commit Graph

7231 Commits

Author SHA1 Message Date
Isaac Connor 7c86bcdfce add the link from /usr/share/zoneminder/www/api/app/tmp to /var/tmp 2017-03-24 11:52:55 -04:00
Isaac Connor f082183fd6 add the cache directories used by cake php under /var/tmp 2017-03-24 11:52:29 -04:00
Isaac Connor 3a8a04c213 Merge branch 'master' into feature-h264-videostorage 2017-03-22 09:02:02 -04:00
Andrew Bauer a43adc241f fix incorrect gpl license mailing address 2017-03-22 07:03:53 -05:00
Kfir Itzhak 3431cf7732 Reduce code duplication in the SSSE3 functions: a single function for delta and a single function for RGB32->grayscale convert 2017-03-22 11:38:15 +02:00
Kfir Itzhak 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
IDDQDesnik 6081374ace Updated Russian translation 2017-03-21 17:39:22 +03:00
Isaac Connor eaca58bb7c Merge pull request #1815 from mnoorenberghe/postlogin
Properly escape postLoginQuery. Fixes #1797
2017-03-21 10:27:13 -04:00
Isaac Connor 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
Matthew Noorenberghe ea558c79a0 Fix check that API user is enabled 2017-03-20 17:16:24 -07:00
Isaac Connor b1d5fbef0b revert an unintended change 2017-03-20 13:19:50 -04:00
Isaac Connor 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
Isaac Connor 9f30ccfa75 Use new UriDecode function to decode username and password 2017-03-20 11:16:39 -04:00
Isaac Connor 3b15ba91d1 Rough in a CURL based UriDecode 2017-03-20 11:16:21 -04:00
Andrew Bauer 7bb0d12a4f Merge pull request #1819 from ZoneMinder/Copyright_patch1
Fix failure to attribute previous work
2017-03-20 09:17:03 -05:00
Kfir Itzhak ca99d84995 Only include sys/auxv.h on ARM systems. That way the code can compile with glibc < 2.16 2017-03-20 15:12:28 +02:00
Kfir Itzhak 8b593b701b Fixed hwcaps_detect() failing to compile on x86-64 2017-03-19 15:11:06 +02:00
Kfir Itzhak 29885135a6 Corrected issues in last two ARM Neon commits 2017-03-19 13:39:24 +02:00
Kfir Itzhak 510f65c414 Added ARM Neon (AArch32) FastBlend function 2017-03-19 13:31:44 +02:00
Kfir Itzhak c5c9b52d18 Added ARM Neon (AArch32) Delta functions for 32bit color and 8bit grayscale 2017-03-19 13:02:42 +02:00
Andrew Bauer 2dcd95bc7f Merge pull request #1504 from ZoneMinder/improve_filter
Improve filter
2017-03-18 21:12:58 -05:00
Andrew Bauer d38bae72ae integrate csrf-magic library 2017-03-18 20:12:06 -05:00
Kfir Itzhak e02e033cc8 Renamed ssedetect() to hwcaps_detect() and added ARM Neon and AVX2 detection 2017-03-19 02:05:01 +02:00
SteveGilvarry e5b18ee213 Remove zmc -r argument as it does not seem to be implemented. 2017-03-18 23:25:14 +11:00
Steve Gilvarry 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
SteveGilvarry a16ea554a3 Swap to PNG 2017-03-18 22:34:13 +11:00
Matthew Noorenberghe c7955cd1b6 Add eslint configuration files extending Google's rules 2017-03-18 00:02:17 -07:00
Matthew Noorenberghe 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
Matthew Noorenberghe ea5342abd2 Properly escape postLoginQuery. Fixes #1797 2017-03-17 21:05:28 -07:00
Andrew Bauer 9d6a65abbe have to use ln with -T flag to force overwrite of existing link 2017-03-17 09:32:58 -05:00
Isaac Connor 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
Andrew Bauer 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
Isaac Connor 6a447194eb Fix zmc crashing when zones are no good bby decreasing n_zone before continuing 2017-03-16 10:55:13 -04:00
Andrew Bauer 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
Andrew Bauer 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
Kfir Itzhak f7fcab24c4 Fixed a mistake in recent commit e7a681b8ff 2017-03-14 22:46:36 +02:00
Kfir Itzhak f30192e5da Use standard memcpy() on x86-64, as it behaves similar performs the equal or better 2017-03-14 22:41:35 +02:00
Kfir Itzhak 67f7ad40ae Removed SSSE3 deinterlacing functions, as they were typically equal or slower than the standard code (when compiled with -O2 or better)
The function is too complicated to be vectorized efficiently
2017-03-14 22:36:26 +02:00
Kfir Itzhak e7a681b8ff Added BGRA, ARGB and ABGR variants of SSSE3 32bit color to grayscale conversion and made the code actually use them all 2017-03-14 22:29:55 +02:00
Kfir Itzhak 20604c2150 SSSE3 rgba->gray8 convert function now uses less instructions and is 10-20% faster 2017-03-14 16:54:00 +02:00
Kfir Itzhak 844b4bb5ee SSSE3 delta functions now use less instructions and are 5-10% faster 2017-03-14 12:17:01 +02:00
Markos Vakondios ed96013605 Mysql starts without upstart/systemd 2017-03-12 21:28:49 +02:00
Qu Wenruo 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
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
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