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 |
|
Isaac Connor
|
e5a36c02bd
|
Merge remote-tracking branch 'origin/master' into video_remote
|
2016-03-30 16:55:24 -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 |
Sándor Czettner
|
38e3c92546
|
Minor grammar fixes
|
2016-03-25 13:18:43 +00:00 |
|
Andrew Bauer
|
d412e8dc5c
|
Update redhat.rst
|
2016-03-25 07:54:37 -05:00 |
Kyle Johnson
|
664e0be6f9
|
Merge pull request #1356 from violuke/patch-1
Minor improvements to ubuntu documentation
|
2016-03-24 09:22:57 -06:00 |
Luke Cousins
|
0e54831072
|
Swapping back to vi as default editor
|
2016-03-24 15:15:58 +00:00 |
|
Isaac Connor
|
a16c1746e5
|
separate a failure to open versus failure to lock. Quiets coverity because close can't handle a negative value
|
2016-03-24 10:00:02 -04:00 |
|
Robin Daermann
|
af68fd20a8
|
Some Translations for Monitor names with spaces
|
2016-03-24 14:51:24 +01:00 |
|
Isaac Connor
|
1e52a8ad2c
|
remove unused class member
|
2016-03-24 09:44:34 -04:00 |
|
Isaac Connor
|
b6ee4e4228
|
move return up into #ifdef.
|
2016-03-24 09:43:15 -04:00 |
|
Isaac Connor
|
0c32ae61ef
|
Merge branch 'master' into fix_coverity_issues
|
2016-03-24 09:42:01 -04:00 |
|
Robin Daermann
|
71db9b84e6
|
Allow spaces in monitor names
|
2016-03-24 14:37:24 +01:00 |
|
Andrew Bauer
|
2deeb6bebf
|
Merge pull request #1339 from mnoorenberghe/readme-rtd
Change README documentation link to readthedocs
|
2016-03-23 16:46:43 -05:00 |
|
Isaac Connor
|
56301b77e9
|
Add an example rules file for logcheck
|
2016-03-23 09:51:28 -04:00 |
|
Isaac Connor
|
6d4d05184c
|
fix typo
|
2016-03-23 09:49:38 -04:00 |
|
Luke Cousins
|
2ede18a614
|
Minor improvements to documentation
|
2016-03-21 22:47:45 +00:00 |
|
Andrew Bauer
|
671326f686
|
Merge pull request #1347 from jburgess777/tenvis
ONVIF: Tenvis TH661 support
|
2016-03-21 12:47:13 -05:00 |
|
Isaac Connor
|
d3558c5688
|
Merge pull request #1323 from knnniggett/zmfilter
fix missing Net::SFTP::Foreign::debug warning
|
2016-03-21 10:47:50 -04:00 |
|
Isaac Connor
|
06943bae82
|
Merge pull request #1353 from jburgess777/ffmpeg-option-logging
Add more logging to diagnose problems with applying ffmpeg options
|
2016-03-21 10:44:06 -04:00 |
|
Isaac Connor
|
0cb2ad4b01
|
Merge pull request #1352 from jburgess777/ffmpeg-options-help-typos
Fix spelling in ffmpeg options help page
|
2016-03-21 10:43:16 -04:00 |
|
Andrew Bauer
|
cf35da07b5
|
Merge pull request #1349 from altaroca/onvif-discovery-1346
Improved Onvif discovery #1346
|
2016-03-21 08:47:23 -05:00 |
Jon Burgess
|
bfd846bbff
|
Add more logging to diagnose problems with applying ffmpeg options
|
2016-03-20 21:44:58 +00:00 |