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

6129 Commits

Author SHA1 Message Date
Isaac Connor 238a25a302 Merge branch 'master' into iconnor_video 2016-04-05 09:38:59 -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
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 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
Isaac Connor 9287cd0e0a undo code style changes and whitespace changes 2016-04-01 15:47:40 -04:00
Isaac Connor 89598da5c1 undo code style changes and whitespace changes 2016-04-01 15:30:30 -04:00
Isaac Connor 58c39f930e revert some structure changes 2016-04-01 14:57:48 -04:00
Isaac Connor f4fc129ecf revert some structure changes 2016-04-01 14:15:31 -04:00
Isaac Connor 86c888d079 revert some structure changes 2016-04-01 14:14:02 -04:00
Isaac Connor 210873e5ae put test back, they got lost 2016-04-01 14:09:08 -04:00
Isaac Connor fb3bd1182d put this back, it got lost again 2016-04-01 14:08:25 -04:00
Isaac Connor 82b32578ec Merge branch 'master' into iconnor_video 2016-04-01 12:54:09 -04:00
Isaac Connor 6ebd71f980 instead of loading and looking at current recording settings, check to see if the images exist. If not, generate them from the video file 2016-04-01 12:51:09 -04:00
Isaac Connor a2e228a5ca put quotes aroudn the string 2016-04-01 11:01:16 -04:00
Isaac Connor e7ee464a17 Add a RecordAudio setting to the Storage Tab 2016-03-31 15:50:44 -04:00
Isaac Connor 5c68e0c9cb structure, whitespace fixes. Add not storing audio frames 2016-03-31 15:33:27 -04:00
Isaac Connor 742fab2ea4 Add db updates for Video and recordAudio 2016-03-31 15:32:24 -04:00
Isaac Connor fbc96fed61 bump version to 1.30, neccessary for db update scripts 2016-03-31 15:32:02 -04:00
Isaac Connor c7e766faef finish the record_audio constructor defs 2016-03-31 13:30:31 -04:00
Isaac Connor c26dbb9028 rough in record_audio, and do lots of whitespace cleanups 2016-03-31 12:54:56 -04:00
Isaac Connor 2a3ed0c32c Add record_audio member, also correct whitespace 2016-03-31 12:17:17 -04:00
Isaac Connor 4e8255c80a Add record_audio member 2016-03-31 12:16:50 -04:00
Isaac Connor 92b98e1953 spacing, code structure and code documentation. Also, add in a flag to say whether to store the audio packets 2016-03-31 11:55:21 -04:00
Isaac Connor fa08646243 spacing fix 2016-03-31 11:54:21 -04:00
Isaac Connor 74301b3ff3 Add the dependencies for libmp4v2 2016-03-31 11:53:36 -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 e5a36c02bd Merge remote-tracking branch 'origin/master' into video_remote 2016-03-30 16:55:24 -04: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