Commit Graph

8949 Commits

Author SHA1 Message Date
Isaac Connor 70820abc1e Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-02-17 10:55:50 -05:00
Isaac Connor d139623ed5 change where binary packages get uploaded to 2017-02-17 09:42:30 -05:00
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
Manojav Sridhar ca303da030 added documentation for feature that allows %tags% to passed as command line args to the exec command in addtion to the event path 2017-02-15 09:38:19 -05:00
Manojav Sridhar 7c765b5516 added feature to allow %tags% in arguments of exec command 2017-02-15 09:37:45 -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
Steve Gilvarry 5b6a75d171 Merge pull request #1772 from markosv/1771-h264-dockerfile
Dockerfile to build feature-h264-videostorage
2017-02-14 21:28:00 +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
Markos Vakondios 13f8d7dba0 Dockerfile to build feature-h264-videostorage 2017-02-12 13:14:48 +02: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
abishai 74dd8ab027 make clang happy take two 2017-02-06 09:57:22 +03:00
SteveGilvarry b791504598 Wording of help text fixes 2017-02-06 08:01:04 +11:00
abishai c7aaa8a933 Merge pull request #1 from knnniggett/master
check for polkit only if systemd is present
2017-02-05 12:16:42 +04: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