Commit Graph

6642 Commits

Author SHA1 Message Date
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
Andrew Bauer 6dc2b13aee change package versioning scheme 2017-03-06 15:25:54 -06:00
Andrew Bauer 07a9a8bf70 check the built package exists signal failure if it doesn't 2017-03-06 06:50:59 -06:00
Andy Bauer 297e9b0463 remove set -e, deploy on master branch only 2017-03-05 14:02:02 -06:00
Andy Bauer 42887c8c2c specify the deb package name more precisely 2017-03-05 13:44:42 -06:00
Andy Bauer 26fbc04f7c fix typo 2017-03-05 13:41:17 -06:00
Andy Bauer 858b49a603 remove all patches 2017-03-05 13:04:37 -06:00
Andy Bauer 5ea9f695de Merge branch 'master' into travis_test1 2017-03-05 13:02:59 -06:00
Andy Bauer ca71ee8e71 remove rules.new 2017-03-05 12:40:27 -06:00
Andy Bauer 4fe70f0e7d recreate patch 2017-03-05 12:39:03 -06:00
Isaac Connor 2686946ce9 Merge pull request #1800 from knnniggett/fix_deb_zm.conf_perms
fix permissions on zm.conf in deb pkg scripts
2017-03-05 13:32:48 -05:00
Andy Bauer c6fc6cb0ca change patch method 2017-03-05 11:46:45 -06:00
Andy Bauer 7e0860f6bf move patch after symlink is established 2017-03-05 11:37:22 -06:00
Andy Bauer 696cfb1fc3 patch deb scripts to set perms on zm.conf 2017-03-05 11:14:28 -06:00
Andy Bauer f66408b998 update the path to zm.conf 2017-03-05 10:50:09 -06:00
Andy Bauer cfeb12fc73 fix permissions on zm.conf in deb pkg scripts 2017-03-05 10:37:44 -06:00
Andy Bauer b4a04b1d61 allow builds from local command line e.g. when not running Travis 2017-03-05 10:26:36 -06:00
Andy Bauer 18ce4ab966 install zoneminder deb only when running in Travis 2017-03-05 09:06:57 -06:00
Andy Bauer 713b2c12a3 add gdebi as required binary 2017-03-05 08:32:52 -06:00
Andy Bauer 6ec3a29f3e set version & release vars prior to calling packpack 2017-03-04 18:09:42 -06:00
Andy Bauer 02ea25e8a0 set group ownership on zm.conf 2017-03-04 10:49:14 -06:00