b6af731400
Add translate options for h264 Storage options in Monitor and update en_gb file
2015-06-10 23:41:17 +10:00
0e7fa89dd1
Fix: typo in options_libvlc
...
Fixed typo in the OPTIONS_LIBVLC help.
2015-04-22 15:26:33 +03:00
ac8ace33f8
Remove hardcoded localized strings and update lang files
2015-04-18 17:14:14 +02:00
9f3ff787d1
Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
distros/redhat/archive/zoneminder.el6.spec
distros/redhat/zoneminder.el6.spec
web/skins/classic/views/monitor.php
2015-02-18 18:53:47 -06:00
2b53e439b9
Add Capture Resolution to replace Capture Width and Capture Height
2015-02-11 13:14:51 -05:00
641c94d5be
add CSSDescription which is used on the options tab for skin
2014-11-26 11:57:01 -05:00
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
e065e2b3cc
add V4L
2014-07-24 11:37:10 -04:00
0a2515c00e
Added basic ONVIF support
2014-07-14 20:36:18 +02:00
edd794a993
ensure captures_per_frame >0
...
add missing lang entries for MultiBuffer and CapturesPerFrame
2014-07-14 14:07:28 -04:00
a81b9b8ce2
change examples for options
2014-05-17 21:48:08 +02:00
9a71a0068a
add help window for ffmpeg/libvlc options
2014-05-17 04:33:33 +02:00
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
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
2784b3d1f5
Merge master
2014-03-20 10:26:12 +01:00
26777487dc
add feature to extend preclusive zone alarm state by x frames
2014-03-09 17:05:39 +01:00
c119c49cd9
Merge remote branch 'nagyrobi/patch-25' into nagyrobi
2014-02-26 09:21:38 -06:00
0258579ef3
Merge remote branch 'nagyrobi/patch-10' into nagyrobi
2014-02-26 08:25:16 -06:00
3201e5a431
Adds web ui support for libvlc camera.
2013-12-19 21:51:39 +00:00
8a3850ac11
Update en_gb.php
...
Enable localization of the monitor function names in the console, function window and monitor settings window.
Fix the bandwidth status sentence on the top of the console window, the last word is different than the universal 'bandwidth' word in many other languages.
2013-08-16 14:06:40 +02:00
150cf5ae80
Update en_gb.php
...
Added a couple of localized strings.
These need to be added to each language file too!
2013-08-15 18:52:14 +02:00
cdac403fb1
Merge ../zum into develop
...
Conflicts:
AUTHORS
configure.ac
db/zm_create.sql.in
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/zmupdate.pl.in
src/Makefile.am
src/zm_buffer.cpp
src/zm_config_defines.h
src/zm_event.cpp
src/zm_ffmpeg.h
src/zm_ffmpeg_camera.cpp
src/zm_image.cpp
src/zm_jpeg.h
src/zm_local_camera.cpp
src/zm_logger.cpp
src/zm_mem_utils.h
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_mpeg.cpp
src/zm_remote_camera_http.cpp
src/zm_remote_camera_rtsp.cpp
src/zm_rtsp.cpp
src/zm_sdp.cpp
src/zm_sdp.h
src/zm_stream.cpp
src/zm_thread.cpp
src/zm_thread.h
src/zm_threaddata.cpp
src/zm_user.cpp
src/zm_user.h
src/zm_utils.cpp
src/zm_zone.cpp
src/zm_zone.h
web/includes/actions.php
web/lang/big5_big5.php
web/lang/cn_zh.php
web/lang/cs_cz.php
web/lang/de_de.php
web/lang/dk_dk.php
web/lang/en_gb.php
web/lang/es_ar.php
web/lang/et_ee.php
web/lang/fr_fr.php
web/lang/he_il.php
web/lang/hu_hu.php
web/lang/it_it.php
web/lang/ja_jp.php
web/lang/nl_nl.php
web/lang/pl_pl.php
web/lang/pt_br.php
web/lang/ro_ro.php
web/lang/ru_ru.php
web/lang/se_se.php
web/skins/classic/js/skin.js
web/skins/classic/views/js/monitor.js.php
web/skins/classic/views/monitor.php
web/skins/classic/views/zone.php
2013-07-25 11:49:55 -04:00
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
8ac3dda54b
1) Removal of the ZM_LOCAL_BGR_INVERT option.
...
2) Allow FPS reporting interval to be zero again.
3) Added translation for the new texts.
4) Corrected the blend function declaration.
2012-02-01 07:33:20 +02:00
b64c506659
Added SFTP upload option.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-23 14:10:20 +00:00
6ff385e407
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-21 09:19:10 +00:00
d2f5e9623c
Added checks for mismatches between system and database versions
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3364 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-25 09:15:14 +00:00
0ff4e53832
Allow FPS reporting to be disabled by setting valure to zero
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3308 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-03-02 12:23:10 +00:00
f65edd0cc1
updated /web/skins/classic/views/options.php:
...
added tab for skin selection
updated /web/lang/en_gb.php:
added Display entry and SkinDescription entry
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3205 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-24 01:33:21 +00:00
62503acd16
Added monitor probe facility
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2829 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 13:00:49 +00:00
21d8d74a28
V4L2 updates
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2723 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-27 11:07:24 +00:00
b3b226ebe1
Changed labels to work better with ffmpeg monitors.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2720 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-21 17:45:30 +00:00
23d82a7e03
Added FFMPEG camera type
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2716 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 15:01:32 +00:00
b7f97d388f
Added configuraion and detection of V4L2 to web interface.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2678 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-28 14:25:12 +00:00
106882c161
Updated copyright notices
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:48:16 +00:00
0c4b4ba445
Merged in changes from Axis MPEG
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2527 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 21:20:46 +00:00
81065ba6dd
Removed learn state bits
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2510 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 14:42:20 +00:00
2824cb7355
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 13:54:50 +00:00
SteveGilvarry
Lihis
Emmanuel Papin
Andy Bauer
Isaac Connor
Jan M. Hochstein
m-bene
Kfir Itzhak
Sune1337
Andrew Bauer
Edward Barnard
nagyrobi
Isaac Connor
nextime
stan
stagecoach