ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,249 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

7249 Commits

Author SHA1 Message Date
Andrew Bauer cd1b09d977 Update zoneminder.spec 
use rpm macros
 2017-03-31 20:35:24 -05:00
Andrew Bauer 716a25fc1f rpmspecfile - ensure cache folders are created during install 2017-03-31 20:17:05 -05:00
Andrew Bauer 7068efd581 rpmspecfile - modify tarball handling 2017-03-30 18:31:58 -05:00
Andrew Bauer 9a2c31d2c0 bump rpmspecfile to 1.30.2 release 2017-03-30 18:20:41 -05:00
Andrew Bauer 3405a540a4 Merge pull request #1843 from connortechnology/fix_1842 
Test for Controllable as well as ControlId
 2017-03-30 13:43:06 -05:00
Kfir Itzhak 5f6332f313 Fixed the assembly in hwcaps_detect() to compile with -fpic & -fPIC and added SSE4.1, SSE4.2 and AVX detection 2017-03-30 20:35:31 +03:00
Isaac Connor d3f6ab3d29 fix Monitors filtering SQL 2017-03-30 13:06:54 -04:00
Isaac Connor 7e3b27a130 Test for Controllable as well as ControlId 2017-03-30 10:49:02 -04:00
Isaac Connor 538658403c Merge pull request #1822 from knnniggett/csrf 
Implement CSRF Mitigation
 2017-03-30 10:39:55 -04:00
Andrew Bauer 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
Andrew Bauer 96b14bd646 Merge pull request #1836 from connortechnology/fix_x10 
fix inserting x10 record with missing comma
 2017-03-29 08:01:28 -05:00
Andrew Bauer fe5fe63254 Update zoneminder.service.in 
This was a typo. Quotes are not needed.
 2017-03-29 07:53:15 -05:00
Michael Schupikov 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
Isaac Connor 589b369109 fix inserting x10 record with missing , 2017-03-28 20:03:46 -04:00
Andy Bauer eb55a6bb9b set action,view, and/or request to NULL if there are not defined 2017-03-28 17:52:31 -05:00
Andy Bauer 4e16ae6d19 add ZM_ENABLE_CSRF_MAGIC toggle 2017-03-28 17:29:36 -05:00
Kfir Itzhak 7162c62d26 Implemented a fix to get the Neon code to compile successfully with GCC < 6.0 2017-03-25 21:49:15 +03:00
Andrew Bauer c69b37c4ac Merge pull request #1835 from connortechnology/setup_api_cache_dirs 
Setup api cache dirs
 2017-03-24 12:35:49 -05:00
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