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

6445 Commits

Author SHA1 Message Date
Isaac Connor 5a0218778c put back some text 2016-04-06 10:50:33 -04:00
Isaac Connor 2f1376950a spelling fix 2016-04-06 10:50:12 -04:00
Isaac Connor 9aeba8ced8 whitespace fixes 2016-04-06 10:50:00 -04:00
Isaac Connor 0ef02287dd revert 2016-04-06 10:49:42 -04:00
Andrew Bauer ad13d889fe bump version from 1.29.0 to 1.29.1 2016-04-06 09:30:47 -05:00
Isaac Connor 222f7755fe fix whitespace 2016-04-06 10:27:41 -04:00
Andrew Bauer 92d1963b1d Merge pull request #1399 from ZoneMinder/deprecate_autotools_distro_builds 
remove autotools builds, replace them with cmake versions
 2016-04-06 08:36:28 -05:00
Isaac Connor 3e5a4b6481 remove autotools builds, replace them with cmake versions 2016-04-06 08:43:20 -04:00
Andrew Bauer 9c5b47404d Update CMakeLists.txt 2016-04-06 06:45:21 -05:00
Isaac Connor 9a795432cf merge all the commits from the messed up iconnor_video branch 2016-04-05 17:14:46 -04:00
Isaac Connor f73d8be765 Merge branch 'master' into feature-h264-videostorage 2016-04-05 09:43:34 -04:00
Isaac Connor 0f1a530891 ciontrol files need spaces on multi-line lines 2016-04-05 09:03:37 -04:00
Andrew Bauer d6a8d53b75 Merge pull request #1285 from SteveGilvarry/TravisUpdate 
Travis update to Trusty, add Clang build and up ffmpeg version
 2016-04-05 07:33:26 -05:00
Steve Gilvarry 08661550d0 Merge pull request #1392 from SteveGilvarry/feature-h264-videostorage 
Merge master to feature-h264-videostorage
 2016-04-05 22:23:12 +10:00
SteveGilvarry 4d7ded5ef0 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	configure.ac
	src/Makefile.am
	web/js/Makefile.am
 2016-04-05 22:06:14 +10:00
Andrew Bauer a0e6c004a2 Merge pull request #1388 from ZoneMinder/reload_stream_on_error 
try to reload the image stream on error.
 2016-04-04 20:57:48 -05:00
Andy Bauer 1f62982bac Merge branch 'SteveGilvarry-Autotools_delete' 2016-04-04 20:54:52 -05:00
Andy Bauer 4e9a925933 Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete 2016-04-04 20:52:49 -05:00
Andy Bauer 96d4d119cd Merge branch 'SteveGilvarry-depracation_nation' 2016-04-04 20:45:30 -05:00
Andy Bauer 7ff8d36598 Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00
Andrew Bauer 7cbccf74bc Merge pull request #1389 from ZoneMinder/larger_pid 
Larger pid
 2016-04-04 20:33:05 -05:00
Andrew Bauer ab6758de45 Merge pull request #1387 from ZoneMinder/reload_stream_on_scale 
reload stream on scale change
 2016-04-04 20:32:53 -05:00
Andrew Bauer 1ff84cf94a Merge pull request #1385 from ZoneMinder/remove_local_zm_conf_override 
Remove the code looks for zm.conf in the current dir.
 2016-04-04 20:29:50 -05:00
Isaac Connor 711343a5cc fix ZM_SERVER_ID instead of ZM_SERVER 2016-04-04 16:34:21 -04:00
Isaac Connor 397eb1a01b increase the size of the Pid field in Logs to accomodate FreeBSD 2016-04-04 15:14:42 -04:00
Isaac Connor ed74168710 increase the size of the Pid field in Logs to accomodate FreeBSD 2016-04-04 15:14:14 -04:00
Isaac Connor 123a1a898a try to reload the image stream on error. 2016-04-04 15:04:09 -04:00
Isaac Connor 0b13f9d76f reload stream on scale change 2016-04-04 14:58:07 -04:00
Isaac Connor 02eb36040a fix bad code 2016-04-04 12:01:37 -04:00
Isaac Connor a31660c1f6 Remove the code looks for zm.conf in the current dir. 2016-04-04 10:45:58 -04:00
Isaac Connor c8fa0a9b4f Merge branch 'master' into feature-h264-videostorage 2016-04-04 10:14:15 -04:00
Isaac Connor 03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
Isaac Connor 9276eea491 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-04-04 09:38:06 -04:00
Isaac Connor 46ac2301a7 Merge pull request #1376 from laerciomotta/patch-1 
Improve test multiserver restart cam.
 2016-04-04 09:29:36 -04:00
SteveGilvarry 966fbb1a10 Add Packet Queue 2016-04-04 20:04:14 +10:00
Isaac Connor abcf48b65c Merge branch 'master' into feature-h264-videostorage 2016-04-01 08:53:45 -04:00
Isaac Connor ecce87b779 mamke status a member so that we aren't return the address of a local variable 2016-03-31 14:43:22 -04:00
Laercio Motta ad912a6c6b Improve test multiserver restart camera. (FIX) 
Check if the server is correctly before restart cam and multiserver is activate.
 2016-03-31 09:45:13 -03:00
Laercio Motta 2f27818e5b Improve test multiserver restart cam. 
Test if correct server from camera edit settings.
 2016-03-31 09:23:01 -03:00
Isaac Connor e9ed046361 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-03-30 10:56:32 -04:00
Isaac Connor b81395843c fix spacing in control file 2016-03-30 10:56:10 -04:00
Isaac Connor 247cb3d0b2 Merge pull request #1360 from schrorg/monitornames-spaces 
Allow spaces in monitor names
 2016-03-30 09:17:57 -04:00
Robin Daermann c8c0586c66 Trim monitor names 2016-03-29 11:40:14 +02:00
Isaac Connor 9a8a08bd83 Merge pull request #1368 from knnniggett/onvifresult 
remove $result from onvif error message
 2016-03-28 14:06:40 -04:00
Andrew Bauer 2365c2156f remove $result from onvif error message 2016-03-28 09:53:57 -05:00
Andrew Bauer ab05d52a0a Update en_gb.php 
typo
 2016-03-28 08:35:34 -05:00
Andrew Bauer ffc0ebaf22 Merge pull request #1361 from ZoneMinder/fix_coverity_issues 
Fix coverity issues
 2016-03-26 21:11:28 -05:00
Isaac Connor e717349116 Merge pull request #1364 from knnniggett/onvif_maxfps 
do not set maxfps fields during onvif probe
 2016-03-26 15:34:54 -04:00
Andy Bauer 6eda3eff72 do not set maxfps fields during onvif probe 2016-03-26 08:38:28 -05:00
Andrew Bauer a3e79e5119 Merge pull request #1362 from czettnersandor/master 
Minor grammar fixes
 2016-03-25 08:38:06 -05:00