Commit Graph

7552 Commits

Author SHA1 Message Date
Isaac Connor a1d1a6a0d4 fix Options and and Protocol which can be NULL 2017-06-28 11:32:18 -04:00
Andrew Bauer a656f4a6cd Update zoneminder.conf.in
rpm specfile - make el6 script alias match el7 & f25
2017-06-28 10:04:28 -05:00
Isaac Connor 1ef25ae1f3 switch to single quotes where possible 2017-06-28 11:03:35 -04:00
Isaac Connor 7c877798ea Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-28 10:53:41 -04:00
Isaac Connor 9ba9495ae0 whitespace, braces, move pod doc to bottom. No functional changes 2017-06-28 10:53:35 -04:00
Isaac Connor 983a11f3d9 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2017-06-26 21:10:11 -04:00
Isaac Connor f782aeccd9 fix view is view_video, not action=niew_video 2017-06-26 21:09:54 -04:00
Andrew Bauer 043b382bdd include conf.d folder contents in debian packaging (#1934) 2017-06-26 14:44:33 -04:00
Isaac Connor f71e5261f5 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-26 14:43:20 -04:00
Isaac Connor 3a113899ed whitespace and braces fixing 2017-06-26 14:29:45 -04:00
Isaac Connor c1b8105c0e only include csrf if it's going to be used. This fixes view_video using up all ram sending a video file 2017-06-26 14:23:54 -04:00
Isaac Connor 6db9a78dab add compressing options to the sample logrotate config 2017-06-26 12:17:49 -04:00
Isaac Connor d97d156efb Don't do csrf for view_video 2017-06-26 11:48:26 -04:00
Isaac Connor 923c8358bc Don't do csrf for view_video 2017-06-26 11:45:34 -04:00
Isaac Connor 5d63bc47cc I believe level should be effectiveLevel here 2017-06-23 10:22:37 -04:00
Isaac Connor 52f1e2d235 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-23 10:11:52 -04:00
Isaac Connor 12c3bde8b0 remove debug 2017-06-23 10:04:50 -04:00
Isaac Connor 25b66e9629 whitespace mostly. 2017-06-23 09:58:54 -04:00
Isaac Connor 3a00656c3f WHen can't open file log, turn on terminal logging so that the message goes somewhere useful. 2017-06-23 09:58:19 -04:00
Isaac Connor 2460e1acd9 fix whitspace 2017-06-23 09:58:01 -04:00
Isaac Connor 609c9a351f Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-23 09:04:52 -04:00
Isaac Connor b5565bb16a fix filters, refreshparent in wrong block 2017-06-23 09:04:46 -04:00
Isaac Connor 892f3a06c7 wip 2017-06-23 08:32:09 -04:00
Isaac Connor fcc852c859 fix cpplint.py complaints 2017-06-22 16:06:31 -04:00
Andrew Bauer b10779ab3a Update rsync_xfer.sh
add rsync -l flag to transfer symlinks
2017-06-22 10:57:11 -05:00
abishai 950c8f19d3 Upstream FreeBSD patches (#1926)
* apply FreeBSD patches

* timeval struct needs time.h

* typo

* added forgotten destination for systemd startup script install
2017-06-22 10:14:24 -04:00
Isaac Connor 1bba664e3d whitspace 2017-06-22 09:55:45 -04:00
Isaac Connor 5ee230a141 always restart zoneminder on upgrade, not just when doing a db update 2017-06-21 17:20:50 -04:00
Isaac Connor c33b179a59 :Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-21 17:18:49 -04:00
Andrew Bauer 36683d15d2 Update zoneminder.spec
bump zm version in rpm specfile
2017-06-20 11:41:53 -05:00
Isaac Connor 2e60864e99 always stop and start zm on upgrade, not just if doing a db update 2017-06-20 09:44:18 -04:00
Isaac Connor f78e720db3 add /etc/zm and /etc/zm/conf.d to install dirs 2017-06-20 09:41:35 -04:00
Isaac Connor 42a022d15b always stop and start zoneminder on upgrade 2017-06-20 09:41:02 -04:00
Isaac Connor db68d3e0a2 use restart instead of start 2017-06-19 13:57:00 -04:00
Andrew Bauer 6945bbda7c Merge pull request #1925 from doctormo/patch-1
Fix spelling mistake in link
2017-06-18 07:25:25 -05:00
Martin Owens 6cc6055bd3 Fix spelling mistake in link 2017-06-17 21:50:41 -04:00
Isaac Connor 8527e5f1de Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-15 13:03:09 -04:00
Isaac Connor 119f8fc86c Fix version checks to fix build on yaketty 2017-06-15 13:02:54 -04:00
Isaac Connor 734f099b4a remove content from changelog 2017-06-15 12:15:15 -04:00
Andrew Bauer 108be3b05f Merge pull request #1922 from connortechnology/log_no_truncate
change mode of opening log files to append instead of overwrite
2017-06-14 19:02:15 -05:00
Isaac Connor 2b5139033c Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-14 15:09:28 -04:00
Isaac Connor e2139920a8 change some more quotes 2017-06-14 15:09:21 -04:00
Isaac Connor 5fad7a8470 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-14 13:32:06 -04:00
Andrew Bauer b17a4d8994 Create startpackpack.sh
quiet gdebi output
2017-06-14 12:28:56 -05:00
Andrew Bauer f91e171526 Create startpackpack.sh
increase travis build log output, filter out ONVIF
2017-06-14 12:06:55 -05:00
Isaac Connor 3dc9594461 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-14 11:24:54 -04:00
Isaac Connor 07a2d49a41 Merge branch 'log_no_truncate' 2017-06-14 11:23:39 -04:00
Isaac Connor a4b3f6b41a fix form of delete used 2017-06-14 10:54:21 -04:00
Isaac Connor b51d885f66 fix build on old ffmpeg 2017-06-14 10:36:08 -04:00
Isaac Connor 1361b8952f change mode of opening log files to append instead of overwrite 2017-06-14 10:15:08 -04:00