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

8460 Commits

Author SHA1 Message Date
Isaac Connor 980b088d57 google style and add label tags around Scale 2017-02-17 09:19:54 -05:00
Andrew Bauer dc76a876a1 packpack rpm specfile - ensure Crud submodule folder is empty 2017-02-17 07:07:17 -06:00
Andrew Bauer 4809a5d7de patch packpack to remove "bebian" from the tarball filename 2017-02-16 15:59:43 -06:00
Isaac Connor a97941edd3 change level from error to debug on message about not supporting non-FLTP 2017-02-16 13:30:34 -05:00
Isaac Connor 8280f79c32 set default on DefaultVideo 2017-02-16 13:29:19 -05:00
Isaac Connor ef653b97d7 set default on DefaultVideo 2017-02-16 13:28:50 -05:00
Isaac Connor 78612e3925 use format 1.0 2017-02-15 11:25:11 -05:00
Isaac Connor 63d92323eb Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2017-02-15 11:18:49 -05:00
Isaac Connor 4792d21a68 use source format 1.0 2017-02-15 10:56:38 -05:00
Isaac Connor 2bf4b5ad1a use escapeshellarg on inputs to daemonControl and other functions where exec is called 2017-02-15 09:45:25 -05:00
Isaac Connor 8231af757c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-02-15 09:32:08 -05:00
Isaac Connor 04e4b1a210 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-02-15 09:30:50 -05:00
Isaac Connor d135216ac7 Merge branch 'master' into storageareas 2017-02-15 09:30:35 -05:00
Isaac Connor 1c5f5e9109 Merge pull request #1777 from vajonam/1776-fix-typo 
fix typo for correct checking if a command has excuted for an event, …
 2017-02-15 09:07:02 -05:00
Manojav Sridhar f0b2910647 fix typo for correct checking if a command has excuted for an event, prevents execution on every filter run 2017-02-15 08:10:50 -05:00
Isaac Connor cfb18a05ba build in auto snapshot from date 2017-02-14 12:14:28 -05:00
Isaac Connor 706f7239c5 go back to 1.0 2017-02-14 11:57:34 -05:00
Isaac Connor 60b78ea222 go back to quilt 2017-02-14 11:56:20 -05:00
Isaac Connor 0f7910cabf try custom 2017-02-14 11:54:35 -05:00
Isaac Connor 0677152c2a try out git format 2017-02-14 11:50:30 -05:00
Isaac Connor c58b44bd9e try out the git format 2017-02-14 11:45:13 -05:00
Isaac Connor 808d070414 don't copy smCodes, just get a pointer to it. 2017-02-14 11:29:43 -05:00
Isaac Connor a95fea4bef change default Storage location to /var/cache/zoneminder/events 2017-02-14 11:29:20 -05:00
Isaac Connor f511af6b89 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-02-14 09:13:23 -05:00
Isaac Connor aeedfe8d74 fix some whitespacing 2017-02-14 09:11:54 -05:00
Steve Gilvarry 9dcbb8cf4d Merge pull request #1774 from michaelarnauts/docker-no-ssh 
Remove SSH server from docker image
 2017-02-14 21:40:45 +11:00
Michaël Arnauts c3da373b1b Disable SSH 2017-02-14 10:52:00 +01:00
Isaac Connor 4ca2bcacde Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-02-13 17:02:59 -05:00
Kyle Johnson bf94980516 Merge pull request #1773 from ZoneMinder/SteveGilvarry-patch-1 
Add the missing F back in.
 2017-02-13 08:15:16 -07:00
Steve Gilvarry bf99d132c7 Add the missing F back in. 2017-02-13 22:15:10 +11:00
Isaac Connor b2657409a1 update with option release 2017-02-12 15:12:36 -05:00
Andrew Bauer 5201abd77d Merge pull request #1770 from ZoneMinder/undo_1590 
remove line that causes endless reading when doing single image mode
 2017-02-11 09:14:07 -06:00
Isaac Connor d5bb6f3210 remove line that causes endless reading when doing single image mode 2017-02-11 09:57:36 -05:00
Isaac Connor 9b7465b328 Merge pull request #1767 from knnniggett/preset_docs 
add motion zone preset disclaimer
 2017-02-10 09:43:11 -05:00
Andrew Bauer e680941568 add motion zone preset disclaimer 2017-02-10 08:30:13 -06:00
Andrew Bauer 91dd2105d2 rpmspecfile - use %{_sysconfdir} macro 2017-02-08 20:44:00 -06:00
Andrew Bauer bd4aea0385 rpm specfile - php requires was listed twice 2017-02-08 20:21:23 -06:00
Andrew Bauer 9c8c87f591 rpm specfile - require php-mysqli, bump to 1.30.2 2017-02-08 20:12:54 -06:00
SteveGilvarry b791504598 Wording of help text fixes 2017-02-06 08:01:04 +11:00
SteveGilvarry 9716c4ef89 Add Option help 2017-02-05 18:43:47 +11:00
SteveGilvarry c72704bf0b Change descriptions for ffmpeg methods and put TCP first. 2017-02-05 15:34:06 +11:00
Andrew Bauer 8feac1747d Merge pull request #1764 from ZoneMinder/vulerability-fixes 
sql injection and session fixation vulerability fixes
 2017-02-04 16:23:51 -06:00
Kyle Johnson 5804cd2462 Merge pull request #2 from connortechnology/fix_sql_injection 
Sanitize input parameters
 2017-02-04 15:05:54 -07:00
Andrew Bauer c5906a5d4f Merge pull request #6 from connortechnology/log_xss_fixes2 
Log xss fixes2
 2017-02-04 16:05:43 -06:00
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
Isaac Connor aae4a1f83b remove extraneous setting of NULL to videowriter which is already NULL 2017-02-04 11:20:21 -05:00
Isaac Connor f73bf0aee0 add a cast to fix compilation with clang 2017-02-02 12:43:13 -05:00
Isaac Connor e3edbf40cf make url full width 2017-02-02 12:16:40 -05:00
Isaac Connor 7b73eb350f update to current. 2017-02-02 12:15:16 -05:00