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

3816 Commits

Author SHA1 Message Date
Isaac Connor ce5396f4ea replace uri_encode with uri_escape 2014-10-21 09:47:31 -04:00
Andrew Bauer cbfe7a3e9e Update version 
What is this file used for?
 2014-10-21 07:21:13 -05:00
Andrew Bauer 607ce08613 Update version 
What is this file used for?
 2014-10-21 07:20:53 -05:00
Isaac Connor 5dedbc2135 detect when the control address has a http in front, and do the right thing 2014-10-20 16:55:24 -04:00
Isaac Connor 9ce7da4147 Don't 'use Data::Dumper'; it was only there for debug 2014-10-20 16:47:03 -04:00
Isaac Connor 693c4b2e68 Merge branch 'release-1.28' 2014-10-20 16:45:59 -04:00
Isaac Connor c4394c3c92 add liburi-encode-perl to dependencies, we use it in M8640, will likely use it elsewhere 2014-10-20 16:45:15 -04:00
Isaac Connor 38ec44f04e Merge branch 'release-1.28' 2014-10-20 15:33:06 -04:00
Isaac Connor 896ae6250a Merge branch 'release-1.28' of github.com:ZoneMinder/ZoneMinder into release-1.28 2014-10-20 15:32:42 -04:00
Isaac Connor 8d225566b1 Move this line down to mitigate the problem where the console doesn't refresh. 2014-10-20 15:32:30 -04:00
Andrew Bauer 6a1db0f895 Use libvlccore5 instead of 7 or 8 2014-10-19 10:11:17 -05:00
Andrew Bauer bdef494ac3 Use libvlccore7 instead of 8 2014-10-19 10:07:34 -05:00
Andrew Bauer 7bb8422b00 Add libvlc to Travis 2014-10-19 09:49:49 -05:00
Andrew Bauer 408bbbd535 Merge branch 'release-1.28' 2014-10-19 07:44:27 -05:00
Andrew Bauer fcf39fc9fa Update zoneminder.cmake.f20.spec 
Fix path to README file
 2014-10-18 17:36:12 -05:00
Andrew Bauer 71b56a163d Zoneminder 1.28.0 Release 2014-10-18 15:23:13 -05:00
Isaac Connor 4fd2230b1d add release 1.28.0 2014-10-17 09:27:54 -04:00
Isaac Connor 61ebb56424 add 1.28.0 release 2014-10-17 09:26:59 -04:00
Isaac Connor a043526994 Merge pull request #462 from knnniggett/memory 
Fix for shared data size conflict
 2014-10-17 09:18:21 -04:00
Isaac Connor 8a33f78243 bugfix; coredump if no codec name was specified in url. 2014-10-15 14:35:01 -04:00
Isaac Connor 638ef29e28 Merge branch 'libav_ffmpeg_fixes' 2014-10-15 13:25:06 -04:00
Isaac Connor 2a71973307 make zm compile using libav on ubunut 14.04 2014-10-15 13:23:29 -04:00
Isaac Connor 58b826b0a2 more url documentation 2014-10-15 13:14:56 -04:00
Isaac Connor 525d4110da bump snapshot # 2014-10-15 13:14:36 -04:00
Isaac Connor 348538b778 distros/ubuntu1204/changelog 2014-10-15 13:14:19 -04:00
Isaac Connor 9eb88d3f15 add a check for db connection to handle the db going away and coming back 2014-10-15 09:43:00 -04:00
Andrew Bauer 7dbad45e30 Update README.Fedora 2014-10-12 15:54:54 -05:00
Andrew Bauer 0bb2d9f81d Merge pull request #407 from m-bene/rtspDigest 
Rtsp digest
 2014-10-11 17:39:57 -05:00
Andrew Bauer 810cf1aed3 Merge pull request #530 from knnniggett/ffmpeg 
fixes ftbs with no ffmpeg support
 2014-10-11 17:29:05 -05:00
Andrew Bauer 9ef9b17c6b fixes ftbs with no ffmpeg support 2014-10-11 17:14:09 -05:00
Andy Bauer f4b248a711 Merge branch 'Sune1337-zms/videostream-improvements' 2014-10-11 15:39:07 -05:00
Andy Bauer 549360cabd Merge branch 'zms/videostream-improvements' of https://github.com/Sune1337/ZoneMinder into Sune1337-zms/videostream-improvements 
Conflicts:
	src/zm_ffmpeg.h
	src/zm_mpeg.cpp
 2014-10-11 15:38:38 -05:00
Andrew Bauer e57b130293 Merge pull request #527 from SteveGilvarry/498-DockerContainer-Broken 
498-Docker-Container-Broken
 2014-10-11 08:27:53 -05:00
SteveGilvarry 820208c2ef Removed line adding Universe repo as already in images 2014-10-11 17:29:46 +11:00
Andrew Bauer 9c8419f89a detaint to keep perl from complaining 2014-10-10 09:03:30 -05:00
Andrew Bauer 19482851ff New method to determine bitness 2014-10-10 08:10:03 -05:00
Andrew Bauer 4b8aa30a2c Merge branch 'hamiltont-patch-docker' 2014-10-09 15:32:31 -05:00
Andrew Bauer 12412ff5ca Merge branch 'patch-docker' of https://github.com/hamiltont/ZoneMinder into hamiltont-patch-docker 
Conflicts:
	Dockerfile
 2014-10-09 15:32:09 -05:00
Andrew Bauer a0fccfce01 Merge pull request #492 from SteveGilvarry/434-readthedocs-documentation 
Initial attempt to migrate wiki to readthedocs #434
 2014-10-09 15:17:20 -05:00
Andrew Bauer 7ea003441d Merge pull request #371 from m-bene/resizeWindows 
Reduce window size to exclude task bar area
 2014-10-09 14:46:46 -05:00
Isaac Connor bc07a43afb Merge pull request #524 from knnniggett/tmpdir 
Changes to handling of tmpdir & related variables
 2014-10-07 10:05:51 -04:00
Andrew Bauer a359ea7101 fix copy paste typo 2014-10-05 11:40:10 -05:00
Andrew Bauer 1a5844afef auto-recreate missing folders during startup 2014-10-05 11:25:41 -05:00
Andrew Bauer f8cf0401ce fedora specfile changes 2014-10-05 10:27:50 -05:00
Andrew Bauer 48d45c0d00 Add F20 target distro 2014-10-05 10:27:20 -05:00
Andrew Bauer 6aac41b06f Redhat and Fedora distro folder housekeeping 2014-10-05 09:54:29 -05:00
Andrew Bauer 56fd08d6e9 Change TMPDIR default to /var/tmp, Add ZM_SOCKDIR 2014-10-05 09:42:47 -05:00
Isaac Connor e468896828 Merge pull request #521 from SteveGilvarry/520-Travis-Build-ffmpeg-failure 
Fixes 520 travis build ffmpeg failure
 2014-10-04 14:35:14 -04:00
SteveGilvarry 2926e9b26c Clone most recent ffmpeg release instead of master 2014-10-04 15:52:11 +10:00
SteveGilvarry d1d952729f Getting Tag to checkout 2014-10-04 15:25:08 +10:00