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

7298 Commits

Author SHA1 Message Date
Kyle Johnson 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
Kyle Johnson 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
Andy Bauer 160aa1cac4 check for polkit only if systemd is present 2017-02-04 15:34:57 -06:00
abishai 8d5a8f5512 make clang happy 2017-02-03 14:53:53 +03:00
Isaac Connor 9135da92ed fix typo fileFields => filterFields 2017-01-31 21:33:43 -05:00
Isaac Connor acd1d96a06 revert change to zoneminder-config.cmake 2017-01-31 11:13:16 -05:00
Isaac Connor dc778058f5 fix detection of LIBSWRESAMPLE 2017-01-31 11:13:16 -05:00
Isaac Connor 7d451e1e41 float the scale control right, add css for other skins 2017-01-31 11:13:16 -05:00
Isaac Connor 4a4f62f0a7 add a scale element to the frame view. Include some bits from StorageAreas to make it work 2017-01-31 11:13:16 -05:00
Isaac Connor 568160e5aa add a scale element to the frame view. Include some bits from StorageAreas to make it work 2017-01-31 11:13:15 -05:00
abishai 1687217d18 switch to POSIX basename() 2017-01-31 11:10:25 +03:00
abishai 0f23809b35 rc.d is not require polkit 
provide alternate path for mysql headers
 2017-01-31 10:59:22 +03:00
abishai 97380f009b implement platform-agnostic comparison without abs() 2017-01-31 10:42:57 +03:00
Isaac Connor 3437f23e8a Merge branch 'master' into fix_sql_injection 2017-01-28 14:33:49 -05:00
Isaac Connor 41dab0750e turn whatever gets output into html escaped html so that nothing gets revealed 2017-01-27 21:30:22 -05:00
Isaac Connor b5e995712e Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder-Pro 2017-01-27 17:43:58 -05:00
Isaac Connor a8d1450adf Merge branch 'master' into fix_sql_injection 2017-01-27 17:18:34 -05:00
Kyle Johnson 746a096483 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-01-27 15:16:33 -07:00
Isaac Connor c1e05753d6 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder-Pro 2017-01-27 17:12:46 -05:00
Isaac Connor 05f3944cc6 Merge branch 'master' into feature-h264-videostorage 2017-01-27 09:58:18 -05:00
Isaac Connor 9e9b1a3a35 Merge pull request #1758 from knnniggett/sanitize_image_path 
sanitize the image path before processing
 2017-01-27 09:41:54 -05:00
Isaac Connor 20f31ce804 Merge pull request #1759 from knnniggett/packpack_crud 
check if crud plugin exists before unpacking
 2017-01-27 09:37:05 -05:00
Andrew Bauer fbb8375a1a check if crud plugin exists before unpacking 2017-01-25 10:49:58 -06:00
Andrew Bauer dbd73690b2 use !== false rather than === true 2017-01-25 09:26:07 -06:00
Andrew Bauer 6189d2670c ZM_DIR_EVENTS can be, and often is, a symlink 2017-01-25 09:05:34 -06:00
Isaac Connor 14bb8acc82 Merge branch 'feature-h264-videostorage' of github.com:ZoneMinder/ZoneMinder into feature-h264-videostorage 2017-01-25 09:46:33 -05:00
Isaac Connor 41b6369c36 Merge branch 'master' into feature-h264-videostorage 2017-01-25 09:46:06 -05:00
Andrew Bauer 8b19fca992 sanitize the image path before processing 2017-01-25 08:30:19 -06:00
Andrew Bauer 13dc11bdf5 Merge pull request #1717 from connortechnology/fix_mmap_leak 
must call zmMemInvalidate before next
 2017-01-24 19:39:51 -06:00
Andrew Bauer af728388d0 Merge pull request #1734 from connortechnology/fix_1720 
Fix 1720
 2017-01-23 20:35:10 -06:00
Isaac Connor ab34127d62 bump version too 2017-01-16 21:31:45 -05:00
Isaac Connor 0e64ff9b24 Merge pull request #1754 from pliablepixels/1716-doc-img-typo 
1716 doc img typo
 2017-01-16 21:30:37 -05:00
Isaac Connor 0e8d1baebb add an urgency flag 2017-01-16 21:13:56 -05:00
SteveGilvarry 2f3ebd80da Remove zmf, die..die..die 2017-01-16 13:20:05 -08:00
Andrew Bauer 9fd52c231a remove packpack build files 2017-01-16 08:39:54 -06:00
Andrew Bauer 5833196a84 packpack - change error code handling 2017-01-16 08:36:46 -06:00
Andrew Bauer 000ba2300a packpack - initial support for debian distros 2017-01-15 20:43:03 -06:00
Pliable Pixels 0f3642adf4 added uncompressed xml 2017-01-15 21:40:25 -05:00
Andy Bauer 3882b74766 rpm specfile - el6 buildrequires epel-rpm-macros 2017-01-15 16:39:38 -06:00
Pliable Pixels d5d9a3a8e9 reminder message for website used to draw XML source images 2017-01-15 17:35:34 -05:00
Pliable Pixels 9bf83a409b fixed image type 2017-01-15 17:35:12 -05:00
Andy Bauer 4325e8f7ea Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder 2017-01-15 15:49:46 -06:00
Andy Bauer 49c35d5733 packpack - f24,f25,el7 confirmed working 2017-01-15 15:48:57 -06:00
Isaac Connor a30af05bcf change parameters to use -o= or --option= and add interactive flag 2017-01-15 12:18:51 -05:00
Andrew Bauer 418995df84 rpm specfile changes 
need to put this back in to maintain compatibility with packpack
 2017-01-15 09:59:17 -06:00
Andrew Bauer b3ee97ad11 Merge pull request #1753 from jbehrends/docker_apache_fix 
Docker - Fixed broken cgi-bin path in apache site conf.
 2017-01-14 20:38:33 -06:00
Josh Behrends 41f5ee5032 Fixed broken cgi-bin path 2017-01-14 16:35:46 -08:00
Andy Bauer 08d4d0c5c2 packpack - auto retrieve zmrepo rpm 2017-01-14 16:35:56 -06:00
Andy Bauer 7d91b4cdc7 minor changes to packpack patch 2017-01-14 16:24:55 -06:00
Isaac Connor 80c948b61e Merge pull request #1751 from knnniggett/pp_files 
initial commit for packpack support
 2017-01-14 16:44:05 -05:00