Kfir Itzhak
|
3cee6a133d
|
Merge remote-tracking branch 'Sune1337/motion/FrameSkip'
Conflicts:
db/zm_update-1.27.1.sql
web/lang/nl_nl.php
|
2014-04-22 20:13:11 +03:00 |
m-bene
|
b56093a637
|
Fix window sizes and input field sizes for flat skin
|
2014-04-11 09:53:46 +02:00 |
Sune1337
|
6c637947e2
|
Ability to skip frames in motion detection.
The reason for this is to make it possible to reduce CPU-load if split-second motion detection is not required.
|
2014-04-10 14:59:34 +02:00 |
Andrew Bauer
|
35468af815
|
Merge pull request #338 from m-bene/extendPreclusive
add feature to extend preclusive zone alarm state by x frames
|
2014-04-08 08:04:37 -05:00 |
|
m-bene
|
9a714f8d6d
|
Fix 'Undefined index: filter' php warnings for filter view when called without filter arguments
|
2014-04-07 16:11:48 +02:00 |
|
m-bene
|
2784b3d1f5
|
Merge master
|
2014-03-20 10:26:12 +01:00 |
|
m-bene
|
2345889d64
|
include ExtendAlarmFrames in Presets and enable input for preclusive zones only
|
2014-03-20 09:53:47 +01:00 |
|
Andrew Bauer
|
d20e0ee2e7
|
Temporary workaround to show all ptz control types regardless of monitor source type.
|
2014-02-13 08:43:19 -06:00 |
Kyle Johnson
|
6e9da046b8
|
Fixed additional Makefile.am pointing to classic skin in flat skin
|
2014-01-27 14:26:03 -05:00 |
Justin Lawrence
|
e8f831c055
|
Flat theme: rename new theme from classic copy to flat
|
2014-01-22 16:33:40 +02:00 |
|
Justin Lawrence
|
ce825067a8
|
Flat theme
|
2014-01-22 16:24:06 +02:00 |