Isaac Connor
|
07c12d0fae
|
insert NULLs for StorageId when creating event if no Storage Area is defined for the monitor
|
2016-09-14 09:16:17 -04:00 |
Isaac Connor
|
ef8d8bd1e5
|
try inserting NUll for StorageId when creating event
|
2016-09-14 09:02:32 -04:00 |
Isaac Connor
|
f82cd461b2
|
more debug
|
2016-09-13 12:01:02 -04:00 |
Isaac Connor
|
0bc50810de
|
only add the development h3 if it has contents, otherwise it pushes the header size down
|
2016-09-13 10:25:49 -04:00 |
Isaac Connor
|
a6b23f50d5
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-09-13 10:21:14 -04:00 |
Isaac Connor
|
2b4bad86cb
|
Merge branch 'master' into storageareas
|
2016-09-13 10:21:10 -04:00 |
Isaac Connor
|
59b28e8346
|
deprecate the z_frame_rate stuff which is deprecated in ffmpeg
|
2016-09-13 10:15:47 -04:00 |
Isaac Connor
|
3dfe1185ff
|
add ffmpeg as option to libav-tols
|
2016-09-13 10:11:50 -04:00 |
Isaac Connor
|
a80881bb98
|
Merge branch 'fix_1620' into storageareas
|
2016-09-13 10:03:02 -04:00 |
Isaac Connor
|
88d86afd85
|
Merge ../ZoneMinder.master into storageareas
|
2016-09-13 10:02:53 -04:00 |
Isaac Connor
|
2bc5742aec
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-09-13 09:53:39 -04:00 |
Isaac Connor
|
39e06b929f
|
add braces and only call closeEvent if there is an event
|
2016-09-13 09:36:45 -04:00 |
Isaac Connor
|
44591432dd
|
Merge pull request #1622 from SteveGilvarry/zmu_record
Fix for ZMU killing recording
|
2016-09-13 09:30:38 -04:00 |
Steve Gilvarry
|
fc060135fe
|
Move our recording flag deeper into closeevent
|
2016-09-13 22:58:38 +10:00 |
Isaac Connor
|
54db9f2e3a
|
ptzControl expects a monitor object instead of a dbrow array.
|
2016-09-12 21:36:03 -04:00 |
Isaac Connor
|
d0fb2acfaa
|
rename videowriterprefs to videowriter. Use an enum to for videowriter values to make code easier to read. Add some comments
|
2016-09-12 21:35:14 -04:00 |
Isaac Connor
|
6366d137bc
|
add more debug code
|
2016-09-12 21:34:18 -04:00 |
Steve Gilvarry
|
54375d7653
|
Merge pull request #1587 from knnniggett/travis-zmonvif-off
don't build the onvif libraries in travis
|
2016-09-11 14:14:33 +10:00 |
Steve Gilvarry
|
563f4a9d46
|
Merge pull request #1505 from ZoneMinder/fix_filter_actions
Confirmed check box status is now retained after save and changing filters.
|
2016-09-11 14:13:51 +10:00 |
Andrew Bauer
|
e35ef3ce83
|
Merge pull request #1617 from coracis/master
Update German translation
|
2016-09-09 08:55:19 -05:00 |
Andrew Bauer
|
321deb5506
|
Merge pull request #1599 from sabbath88/master
add some more translation
|
2016-09-09 08:40:05 -05:00 |
corax
|
070051d06a
|
Merge commit '6fab2e97b1f45115107c4f5138424408f42dc3e9'
For easy pull-requesting
|
2016-09-09 14:20:03 +02:00 |
corax
|
6fab2e97b1
|
Update German translation of Buffer
|
2016-09-09 13:32:20 +02:00 |
corax
|
b10c79b4f7
|
Add translation for 'Montage Review'
|
2016-09-09 13:26:19 +02:00 |
corax
|
6b18184e4a
|
Remove confusing link to web console
|
2016-09-09 12:38:30 +02:00 |
corax
|
4dc6fc03b3
|
Add a missing translate()-call
|
2016-09-09 12:35:34 +02:00 |
corax
|
430ecd8e32
|
Fix some too direct translations into German
|
2016-09-09 11:51:53 +02:00 |
corax
|
d017138550
|
Fix a 'false friend' in German translation
|
2016-09-09 11:25:12 +02:00 |
Isaac Connor
|
5fb1c45c4e
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-09-08 11:34:36 -04:00 |
Isaac Connor
|
7b0a14ee72
|
change doulbe quotes to single quotes. Detect if we can't chdir into the monitor dir.
|
2016-09-08 11:06:02 -04:00 |
Isaac Connor
|
3c228e6c16
|
Merge pull request #1614 from pliablepixels/1537-zone-controller-bug
1537 zone controller bug
|
2016-09-07 12:52:09 -04:00 |
Pliable Pixels
|
1440dd9265
|
retab
|
2016-09-03 15:02:32 -04:00 |
Pliable Pixels
|
7bf0b3c423
|
readded forMonitor - removed by mistake
|
2016-09-03 14:51:24 -04:00 |
Pliable Pixels
|
9a4330eb59
|
#1537 Zones Controller not returning all zones
|
2016-09-03 14:46:47 -04:00 |
Kyle Johnson
|
d6852e10b7
|
Merge pull request #1609 from connortechnology/fix_1606
implement suggested code to stop the monitor when Function is set to …
|
2016-09-01 22:57:57 -06:00 |
Isaac Connor
|
dfb06fd548
|
Merge pull request #1607 from mattdurant/fix_issue_1460
Fix issue #1460
|
2016-09-01 14:02:13 -04:00 |
Isaac Connor
|
21431a5733
|
Merge pull request #1608 from mattdurant/issue_1590
Added check for SINGLE_IMAGE to ignore socket closed by remote side
|
2016-09-01 12:30:47 -04:00 |
Isaac Connor
|
e0472cf820
|
Merge pull request #1602 from mdrush/1601-fix-ssmtp-messages
added missing ssmtp support in sendMessage
|
2016-09-01 11:49:42 -04:00 |
Isaac Connor
|
55f5db55dd
|
implement suggested code to stop the monitor when Function is set to None
|
2016-09-01 11:43:20 -04:00 |
Isaac Connor
|
81e9d31a95
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-09-01 10:53:35 -04:00 |
Isaac Connor
|
586eab25e6
|
Merge branch 'fix_issue_1460' of https://github.com/mattdurant/ZoneMinder into merge_1607
|
2016-09-01 10:25:00 -04:00 |
Isaac Connor
|
10abe98e91
|
merge from packet queue. add monitorId to livestream div lookup
|
2016-09-01 10:15:12 -04:00 |
Matt Durant
|
350352d956
|
Added check for SINGLE_IMAGE if ReadData() detects the socket closed by remote side to return 0 instead of -1.
|
2016-08-31 20:56:30 -05:00 |
Matt Durant
|
0950ecbcb9
|
Replaced loops to create color tables during initialization with statically declared arrays.
|
2016-08-31 19:36:14 -05:00 |
Isaac Connor
|
e51cc7efc8
|
add a missing / in error message
|
2016-08-31 11:21:46 -04:00 |
Steve Gilvarry
|
e371d9ec7f
|
Merge pull request #7 from connortechnology/feature-h264-videostorage
Feature h264 videostorage
|
2016-09-01 01:07:33 +10:00 |
Isaac Connor
|
e74bf3fedf
|
pull in the new byte range code for viewing videos
|
2016-08-31 10:58:50 -04:00 |
Isaac Connor
|
fb35f5c48a
|
Merge ../ZoneMinder.master into feature-h264-videostorage
|
2016-08-31 10:58:19 -04:00 |
Isaac Connor
|
5f07911a63
|
fix spacing
|
2016-08-31 10:09:42 -04:00 |
Isaac Connor
|
ed1b6ccd58
|
Implement range support
|
2016-08-31 10:09:01 -04:00 |