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

3915 Commits

Author SHA1 Message Date
Cosme Domínguez Díaz 972dedd15a * distros/debian -> Autotools 
* distros/debian_cmake -> CMake
 2014-11-11 22:48:04 +01:00
Cosme Domínguez Díaz 964cdde2b3 Use gnutls-openssl instead of gnutls to 
fix build with CMake.
 2014-11-11 00:34:23 +01:00
Andrew Bauer 26c9a77590 Update skin.js 
Fix issue caused by a previous merge
 2014-11-10 12:12:54 -06:00
Cosme Domínguez Díaz 96859e3b11 * Use CMake instead of Autotools. 
* Some lintian love (minor fixes and cosmetic changes...)
* Don't remove database data if we are using a remote MySQL server.
 2014-11-09 14:18:14 +01:00
Isaac Connor 3fe5724ca0 Merge pull request #550 from SteveGilvarry/patch-1 
Update Ubuntu install instructions
 2014-11-08 14:58:49 -05:00
Isaac Connor 1d6dffde47 Merge pull request #560 from manupap1/rtsp_fix 
Send keepalive messages if the rtsp server supports this feature
 2014-11-08 14:53:45 -05:00
Isaac Connor b4a8ba8e8e Merge pull request #561 from manupap1/rtsp_fix2 
Use our own SSRC when sending packets on the RTP control stream
 2014-11-08 14:52:36 -05:00
Isaac Connor 35d3859aa3 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-11-08 14:50:57 -05:00
Isaac Connor 3e8d49d88d add comment to improve understanding 2014-11-08 14:50:44 -05:00
manupap1 336c69e3c0 Use our own SSRC when sending packets on the control stream 2014-11-07 19:38:11 +01:00
manupap1 ea8b93be84 Use our own SSRC when sending packets on the control stream 2014-11-07 19:15:42 +01:00
manupap1 ee7d6a6254 Send keepalive messages if the rtsp server supports this feature 2014-11-07 17:39:50 +01:00
Andrew Bauer 966767e346 Update zoneminder.service.in 
Fix restart issue when using systemd
 2014-11-06 17:42:40 -06:00
Isaac Connor 17e38560d6 just update the perldoc parts 2014-11-06 10:02:34 -05:00
Andrew Bauer 23ee96c966 Merge pull request #556 from ZoneMinder/add_join 
Add a stringVector join function for future use
 2014-11-06 08:33:28 -06:00
Andrew Bauer 22a0daaac8 Merge pull request #557 from manupap1/rtsp_fix 
Fixed bug in rtsp streaming caused by a bad string concatenation
 2014-11-06 07:12:00 -06:00
manupap1 e764938a0d Fixed bug in rtsp streaming caused by a bad string concatenation 2014-11-06 10:16:28 +01:00
Isaac Connor 91986f3159 Merge pull request #555 from manupap1/rtsp_fix 
Fixed bug in rtsp streaming caused by a signed - unsigned conversion.

I like it. but please... somehelp help out with my comments above.
 2014-11-05 15:10:50 -05:00
Isaac Connor a88ce80716 Add a stringVector join function for future use 2014-11-05 14:01:48 -05:00
manupap1 fefc17b0fc Fixed bug in rtsp streaming caused by a signed - unsigned conversion. 2014-11-05 19:08:57 +01:00
Steve Gilvarry 1f73155bfd Update Ubuntu install instructions 
Removed need to install snapshot version for latest Ubuntu now that 1.28 is packaged.
 2014-11-04 07:53:51 +11:00
Isaac Connor 4863ce96a3 remove annoying warning. 2014-10-31 14:12:36 -04:00
Isaac Connor 60ea505139 add avdevice55 as a dependcy instead of 53, which we need for utopic 2014-10-31 14:11:34 -04: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
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