Kfir Itzhak
|
1f29aa432a
|
Minor corrections to the cURL source type in the web interface
|
2014-04-23 12:12:41 +03:00 |
|
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 |
Kyle Johnson
|
fd4f77b145
|
Merge pull request #381 from m-bene/flatLayout2
Fix window sizes and input field sizes for flat skin
|
2014-04-18 09:40:00 -04:00 |
m-bene
|
b56093a637
|
Fix window sizes and input field sizes for flat skin
|
2014-04-11 09:53:46 +02:00 |
|
m-bene
|
f737af15b9
|
Fix reload loop on switching skins
|
2014-04-11 09:40:23 +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 |
|
Kyle Johnson
|
db5a8fe194
|
Merge pull request #375 from m-bene/flatLayout
Fix small / cropped DRV controls in event view. Fixes #356
|
2014-04-09 16:45:15 -04:00 |
|
m-bene
|
bd5e25644e
|
same dvr controlls in event as in monitor
|
2014-04-09 20:19:23 +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 |
Isaac Connor
|
957d6f123f
|
remaining conversions
|
2014-03-22 14:16:56 -04:00 |
|
Isaac Connor
|
bfb52ab9aa
|
fix groups
|
2014-03-21 23:10:13 -04:00 |
|
Isaac Connor
|
967dda737c
|
more copying mysql2PDO from classic. Also, some fixes in classic
|
2014-03-21 17:16:56 -04:00 |
|
Isaac Connor
|
c7a8c0601b
|
wip
|
2014-03-21 16:51:09 -04: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
|
a9c83b5e71
|
Merge pull request #342 from knnniggett/nagyrobi
Mostly Translation related changes
|
2014-03-15 08:08:09 -05:00 |
|
m-bene
|
26777487dc
|
add feature to extend preclusive zone alarm state by x frames
|
2014-03-09 17:05:39 +01:00 |
Kyle Johnson
|
5a2009a143
|
Fix popup sizes in flat skins. Fixes #331
|
2014-03-03 21:26:18 -05:00 |
|
Andrew Bauer
|
4196783d97
|
Increased table width just a little bit, to prevent the longer foreign language translated strings to break window layouts.
|
2014-02-26 07:56:31 -06:00 |
|
Andrew Bauer
|
26be1bd041
|
Fix builtin authentication issue caused by commit 6e5d927
|
2014-02-14 18:56:27 -06: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 |
|
Kyle Johnson
|
6f5c9182ce
|
Add paths to flat skin in configure.ac and Makefile.am
|
2014-01-24 13:58:51 -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 |