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

6539 Commits

Author SHA1 Message Date
Isaac Connor e39a757c46 add an icon made from favicon.ico and a .desktop file to be install in /usr/share/applications/ 2017-04-26 15:21:28 -04:00
Isaac Connor ff71777ee6 Merge pull request #1861 from josh4trunks/ctype 
Use ctype_digit
 2017-04-25 09:58:01 -04:00
Joshua Ruehlig 05a141bf78 Update database.php 2017-04-24 23:40:52 -07:00
Joshua Ruehlig ca1e8a13fe Update database.php.default 2017-04-24 23:40:21 -07:00
Isaac Connor 0c236e9033 Merge pull request #1860 from josh4trunks/josh4trunks-patch-1 
Update documentation
 2017-04-24 12:35:35 -04:00
Andrew Bauer ba3e9a9151 Update rsync_xfer.sh 
typo
 2017-04-21 18:57:42 -05:00
Andrew Bauer c60c3bf67c Update rsync_xfer.sh 
rsync to different folders depending on distro type
 2017-04-21 18:57:10 -05:00
Joshua Ruehlig 7e3c0e42b7 Update zm.conf.in 
Add possible formats for ZM_DB_HOST
 2017-04-21 10:56:48 -07:00
Joshua Ruehlig 6779bd74b0 Update multiserver.rst 
No longer needed since https://github.com/ZoneMinder/ZoneMinder/pull/1470
 2017-04-21 10:44:37 -07:00
Joshua Ruehlig 0728b935c0 Update ubuntu.rst 
I'm not a linux/ubuntu guy, but I am 90% sure this is correct =P
 2017-04-21 10:43:16 -07:00
Andrew Bauer 6e28955b9a Update rsync_xfer.sh 
packpack deploy - change rsync parameters
 2017-04-20 18:40:31 -05:00
Andrew Bauer fac47694ed Update rsync_xfer.sh 
travis deploy - modify rsync parameters
 2017-04-20 12:10:48 -05:00
Andrew Bauer e90e6b13e9 Update rsync_xfer.sh 
spelling
 2017-04-19 07:22:03 -05:00
Andrew Bauer 6b43deb1e5 Update rsync_xfer.sh 
remove set -ev, add a message when the remote filesystem mounted successfully
 2017-04-19 07:11:20 -05:00
Andrew Bauer cf4861e08a Update rsync_xfer.sh 
Turn on rsync verbose so we can see what files get transferred
 2017-04-18 20:02:39 -05:00
Andrew Bauer f3e22689ac Merge pull request #1858 from connortechnology/fix_1849 
fixes escaping
 2017-04-18 19:54:28 -05:00
Isaac Connor f2920c37e0 escapeshellarg adds quotes, which is bad. Use escapeshellcmd on the whole string instead. 2017-04-18 12:31:20 -04:00
Kyle Johnson c4164cda07 packpack, return of the packed. 2017-04-17 19:54:40 -06:00
Kyle Johnson acf12fb0f2 packpack, return of the packpack. 2017-04-17 19:47:34 -06:00
Kyle Johnson 4ad7baf8f9 packpack - fix encrypted key 2017-04-17 13:05:16 -06:00
Kyle Johnson 5904e9b703 packacpk - update encrypted rsa file 2017-04-17 12:55:04 -06:00
Andrew Bauer 008624451f Merge pull request #1856 from connortechnology/remove_BOM 
use dos2unix to remove BOM
 2017-04-17 08:32:17 -05:00
Andrew Bauer 24c50ea7bd Merge pull request #1832 from mastertheknife/cmake_pod2man_outofsource 
Fix out-of-source building failing because pod2man
 2017-04-17 07:45:42 -05:00
Andrew Bauer cea31f205a Update zoneminder.tmpfiles.in 
remove cake cache folders from tmpfiles.d since we changed the cake cache engine to apc
 2017-04-16 20:44:41 -05:00
Isaac Connor 5e0012569f use dos2unix to remove BOM 2017-04-16 09:22:37 -04:00
Andy Bauer f10d3f10a0 packpack - add full path to deply_rsa.enc 2017-04-15 09:36:53 -05:00
Andy Bauer 3b1ef579d5 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder 2017-04-15 09:24:45 -05:00
Andy Bauer 4240f03f4e rpm readmefile changes 2017-04-15 09:23:28 -05:00
Isaac Connor 0efca38d68 Merge pull request #1854 from knnniggett/caketmp 
make cake tmp = zoneminder tmp
 2017-04-15 10:23:03 -04:00
Isaac Connor 432a38720a Merge pull request #1788 from knnniggett/travis_test1 
packpack nightly builds
 2017-04-15 10:21:42 -04:00
Andrew Bauer 7e9b9944ae rpmspecfile changes to reflect recent commits 2017-04-15 08:51:59 -05:00
Andrew Bauer 65f96df477 Merge pull request #1791 from dwalkes/FI8908ControlAdd 
Additional controls for FI8908W cameras
 2017-04-15 07:23:29 -05:00
Andrew Bauer 8c298b96d0 Merge pull request #1820 from SteveGilvarry/Remove_arg_r 
Remove zmc -r argument as it does not seem to be implemented.
 2017-04-15 07:17:56 -05:00
Isaac Connor ab4b5e6b69 Merge pull request #1853 from knnniggett/cakecache 
change cake cache engine from File -> Apc
 2017-04-14 21:10:23 -04:00
Isaac Connor 5dd4359b80 Merge pull request #1852 from knnniggett/cakelog 
move cake log to zoneminder log folder
 2017-04-14 21:09:50 -04:00
Andrew Bauer 0b729cf295 modify cmakelists.txt 2017-04-14 15:15:29 -05:00
Andrew Bauer d2490cf7e3 make cake tmp = zoneminder tmp 2017-04-14 15:11:41 -05:00
Andrew Bauer 48a73f7e78 change cache engine from File -> Apc 2017-04-14 14:31:42 -05:00
Andrew Bauer 3cbd32cd41 move cake log to zoneminder log folder 2017-04-14 14:24:29 -05:00
Andrew Bauer 48e2c5f6ec Update redhat.rst 2017-04-14 12:40:32 -05:00
Isaac Connor 09d8d7e40f Merge pull request #1851 from knnniggett/timestamponcapture 
invert timestamp_on_capture condition
 2017-04-14 11:05:04 -04:00
Andrew Bauer a6799a8aaa remove unneeded files 2017-04-14 06:40:09 -05:00
Andrew Bauer 6b0f587725 invert timestamp_on_capture condition 2017-04-13 15:51:50 -05:00
Isaac Connor a0b0f0aa79 Merge pull request #1847 from ekwoodrich/patch-1 
Suppress debug messages on ZM service start/restart
 2017-04-07 13:26:04 -04:00
Isaac Connor 68ab2cb756 Merge pull request #1837 from DarkDeepBlue/fix-format-string-local-cam 
zm_local_camera.cpp: Improve format strings
 2017-04-06 08:54:20 -04:00
Isaac Connor b4ac277ecb Merge pull request #1846 from mnoorenberghe/docker_vhost 
Use misc/apache.conf instead of utils/docker/apache-vhost in docker
 2017-04-06 08:41:21 -04:00
Eliot Kent Woodrich c4ec2d7fab Suppress debug messages on ZM service start/restart 
The tests in the script General.pm that determine the format for superuser calls on the target environment may leak debug messages to STDOUT. This can be replicated on a Docker installation of Zoneminder lacking sudo. Starting the Zoneminder process  will display an intimidating series of error messages that can safely be ignored by the user:

e.g.
'''
root@2bfdd23cc27a:~# service zoneminder start

Starting ZoneMinder: Can't exec "sudo": No such file or directory at /usr/share/perl5/ZoneMinder/General.pm line 1                                                   10.
Use of uninitialized value $output in scalar chomp at /usr/share/perl5/ZoneMinder/General.pm line 119.
Use of uninitialized value $output in concatenation (.) or string at /usr/share/perl5/ZoneMinder/General.pm line 1                                                   20.
success
'''

This patch redirects STDERR from the qx(...) calls to the debug message., And if the output of qx(...) is undefined, replaces it with any error in $! resulting from the qx(...) call.
 2017-04-05 17:26:19 -07:00
Andrew Bauer b609b9ad4c Merge pull request #1826 from connortechnology/uri_decode_in_zms 
Uri decode in zms
 2017-04-03 20:13:30 -05:00
Andrew Bauer a10d52a3e1 Merge pull request #1844 from connortechnology/fix_1812 
fix Monitors filtering SQL
 2017-04-03 20:06:39 -05:00
Matthew Noorenberghe a1f0ec3ecf Use misc/apache.conf instead of utils/docker/apache-vhost in docker 
This avoids duplication and fixes a few things that were missing in the Docker version for modern Apache:
* AllowOverride All
* Require all granted

Deleted `ServerName @WEB_HOST@` since `WEB_HOST` was never defined in ZM code so it would give an Apache error.
 2017-04-02 21:54:49 -07:00