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

4086 Commits

Author SHA1 Message Date
SteveGilvarry 2712da614e Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2014-11-05 19:51:15 +11:00
Andrew Bauer 5abd7ce7cd Merge pull request #544 from kylejohnson/ignore-more-files 
Ignore more files and initial travis framework
 2014-10-31 12:22:04 -05:00
Kyle Johnson 39ac8c8b34 git ignore files created during bootstrap, configure and make. 2014-10-31 12:31:40 -04:00
Kyle Johnson c48b039b15 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	.travis.yml
 2014-10-31 12:25:57 -04:00
Andrew Bauer 16c86e6604 Merge pull request #535 from knnniggett/travis_libvlc 
Add libvlc to Travis
 2014-10-26 15:08:59 -05:00
Isaac Connor 387dfa9862 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-10-23 09:00:59 -04:00
Isaac Connor 57e5b4fee8 Fix segfault on zmu -l due to not connectig to the shared mem 2014-10-23 09:00:53 -04:00
Andrew Bauer 9ea24a6e04 Merge pull request #539 from SteveGilvarry/test-ffmpeg-2.4.2 
Update Travis to ffmpeg 2.4.2
 2014-10-23 07:00:23 -05:00
SteveGilvarry 838eb64537 Update Travis to ffmpeg 2.4.2 2014-10-23 20:22:09 +11:00
SteveGilvarry 0e4156c095 Add CaptureAndRecord to vlc, still need to make it record 2014-10-23 19:56:35 +11:00
Isaac Connor 2f32c3895b Merge branch 'release-1.28' 
Conflicts:
	web/skins/flat/js/skin.js
 2014-10-22 15:10:19 -04:00
Isaac Connor c9c6c17699 add script for TVIP862IC. Should also work with IP672 and others. 2014-10-22 15:08:58 -04:00
Isaac Connor c5a1d9ffa9 fix console refresh in this skin too 2014-10-22 10:58:06 -04:00
Isaac Connor c8a985a65f Merge branch 'release-1.28' 2014-10-22 10:31:57 -04:00
Isaac Connor 85529efffc check for existence of the columns beefore trying to add them 2014-10-22 10:31:23 -04:00
Andrew Bauer 23ebbf3887 Update skin.js 
Move this line down to mitigate the problem where the console doesn't refresh.
 2014-10-21 17:22:33 -05:00
Isaac Connor e23c756ca4 Revert "replace uri_encode with uri_escape" 
This reverts commit ce5396f4ea.
 2014-10-21 15:17:34 -04:00
Isaac Connor 07cddf4164 Merge branch 'master' into release-1.28 2014-10-21 09:48:05 -04:00
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
SteveGilvarry ee90541370 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2014-10-18 15:02:43 +11: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
SteveGilvarry d49754613c Add web dir back into Makefile.am 
Revert "Removed web from SUBDIRS in Makefile.am"

This reverts commit d9bbcdf3a9.
 2014-10-17 23:19:11 +11: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
m-bene 32f05ada86 add digest auth file for cmake 
Conflicts:
	src/CMakeLists.txt
 2014-10-13 16:51:21 +11:00
SteveGilvarry 19a946fb07 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2014-10-13 16:31:30 +11:00
Andrew Bauer 7dbad45e30 Update README.Fedora 2014-10-12 15:54:54 -05:00
SteveGilvarry 7f530bcc2a Removed duplicate code and brackets 2014-10-12 22:12:54 +11:00