Isaac Connor
|
0689e8453c
|
guard against dangerous (old or new) monitor names
by rogerroger288
|
2014-06-05 15:21:28 -04:00 |
|
Isaac Connor
|
baf5da9561
|
guard against monitor names being dangerous
by rogerroger288
|
2014-06-05 15:20:04 -04:00 |
|
Isaac Connor
|
5ae3cb8907
|
merge some security fixes from rogerroger288
|
2014-06-05 15:14:12 -04:00 |
Kfir Itzhak
|
5fea101294
|
Merge pull request #421 from m-bene/ffmpegoptions
Add optional options field for ffmpeg and VLC source types
|
2014-05-18 18:07:42 +03:00 |
m-bene
|
82447ebb27
|
remove unwanted comment change
|
2014-05-17 22:05:57 +02:00 |
|
m-bene
|
a81b9b8ce2
|
change examples for options
|
2014-05-17 21:48:08 +02:00 |
|
m-bene
|
f62afdb8cc
|
add select list for rtsp method for ffmpeg and libvlc
|
2014-05-17 20:41:22 +02:00 |
|
m-bene
|
de107f77ba
|
fix option help text for overlooked languages
|
2014-05-17 04:51:01 +02:00 |
|
m-bene
|
9a71a0068a
|
add help window for ffmpeg/libvlc options
|
2014-05-17 04:33:33 +02:00 |
|
m-bene
|
ceff5a98ea
|
add generic Option field to ffmpeg and libvlc cameras
|
2014-05-05 13:29:12 +02:00 |
|
Isaac Connor
|
8da9383d5d
|
use PDO style
|
2014-04-30 10:09:27 -04:00 |
|
Isaac Connor
|
e94fca2778
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2014-04-30 10:01:29 -04:00 |
|
Isaac Connor
|
b3226223f8
|
remove uses of dbEscape
|
2014-04-30 10:01:10 -04:00 |
|
Kfir Itzhak
|
ec5784abe2
|
Fix wrong install path for core.php and database.php
|
2014-04-30 12:25:42 +03:00 |
|
Kfir Itzhak
|
afd4e451fd
|
Add the web/api folder to cmake
|
2014-04-30 12:16:46 +03:00 |
Kyle Johnson
|
40e929e7a6
|
Changed the API readme to be ZoneMinder-relevant
|
2014-04-29 20:49:54 +00:00 |
|
Kyle Johnson
|
f1f3de6d7d
|
Moved the api to underneath the web directory
|
2014-04-29 20:41:04 +00:00 |
|
m-bene
|
28f62c4f8f
|
remove call of undefined "fixDevices" function
|
2014-04-26 04:23:36 +02:00 |
|
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 |
|
Kyle Johnson
|
4b7f1896b9
|
Merge pull request #385 from maciekczwa/master
fix sql error which prevents remote login from working
|
2014-04-18 09:39:09 -04:00 |
Maciej Czerniak
|
50a9055601
|
fix sql error which prevents remote login from working
|
2014-04-13 09:54:11 +02: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
|
f22b956b8b
|
do not quote column names in parse filter
|
2014-04-08 09:07:59 +02: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
|
d6a27b31e8
|
fix extra }
|
2014-03-24 13:44:06 -04: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 |
|
Isaac Connor
|
ffa952419c
|
Merge branch 'mysql2PDO'
Conflicts:
distros/ubuntu1204/changelog
scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
web/includes/actions.php
|
2014-03-20 16:48:03 -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
|
03ded1edd0
|
Merge remote branch 'nagyrobi/patch-2' into nagyrobi
Conflicts:
web/lang/hu_hu.php
|
2014-02-26 09:37:41 -06:00 |
|
Andrew Bauer
|
c2b93c3caf
|
Merge remote branch 'nagyrobi/patch-26' into nagyrobi
|
2014-02-26 09:32:58 -06:00 |
|
Andrew Bauer
|
9a298a2af2
|
Copy nagyrobi's localization changes from en_gb verbatim to the other language files.
|
2014-02-26 09:30:57 -06:00 |
|
Andrew Bauer
|
c119c49cd9
|
Merge remote branch 'nagyrobi/patch-25' into nagyrobi
|
2014-02-26 09:21:38 -06:00 |
|
Andrew Bauer
|
fb698a6755
|
Merge remote branch 'nagyrobi/patch-23' into nagyrobi
|
2014-02-26 09:17:14 -06:00 |
|
Andrew Bauer
|
5b1c79e3d0
|
Merge remote branch 'nagyrobi/patch-22' into nagyrobi
|
2014-02-26 09:16:51 -06:00 |
|
Andrew Bauer
|
1dd8dc4aa6
|
Merge remote branch 'nagyrobi/patch-21' into nagyrobi
|
2014-02-26 09:15:47 -06:00 |
|
Andrew Bauer
|
f435435481
|
Merge remote branch 'nagyrobi/patch-17' into nagyrobi
|
2014-02-26 09:15:05 -06:00 |