SteveGilvarry
|
20c295ad0c
|
Merge remote-tracking branch 'upstream/master' into feature-plugins
Conflicts:
.travis.yml
CMakeLists.txt
Makefile.am
bootstrap.sh
configure.ac
distros/debian8/control
distros/debian_cmake/control
misc/Makefile.am
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
src/CMakeLists.txt
src/Makefile.am
src/zm_monitor.cpp
src/zm_monitor.h
src/zmstreamer.cpp
web/lang/ru_ru.php
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
|
2016-04-07 00:00:38 +10:00 |
Jon Burgess
|
9c98ccbb75
|
Fix spelling in ffmpeg options help: s/verbosiy/verbosity/
|
2016-03-20 16:13:53 +00:00 |
|
Jon Burgess
|
020731a89e
|
Fix typo in ffmpeg options help: s/passwd/passed/
|
2016-03-20 16:10:49 +00:00 |
SteveGilvarry
|
a700cbffdb
|
Merge remote-tracking branch 'upstream/master' into feature-plugins
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
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/es_es.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/views/monitor.php
|
2015-11-08 21:06:21 +11:00 |
Emmanuel Papin
|
649a39b372
|
Replace analysis interval parameter by analysis framerate
|
2015-07-23 16:36:30 -04:00 |
|
Emmanuel Papin
|
132e0a1798
|
Add analysis fps paramter to monitors
|
2015-07-22 21:38:35 +02:00 |
|
Emmanuel Papin
|
a6b7c6e99f
|
Add analysis interval parameter to monitors
|
2015-07-21 22:52:52 +02:00 |
|
Emmanuel Papin
|
2b770b2f58
|
Add an error message if plugin option is not valid
|
2015-05-16 06:12:38 +02:00 |
|
Emmanuel Papin
|
676968ed04
|
Add list option for plugins
|
2015-05-14 11:38:38 +02:00 |
|
Emmanuel Papin
|
55d974a0b3
|
Update lang files
|
2015-05-06 20:46:09 +02:00 |
|
Emmanuel Papin
|
630c8f335f
|
Merge master
|
2015-05-05 23:37:20 +02:00 |
|
Emmanuel Papin
|
ac8ace33f8
|
Remove hardcoded localized strings and update lang files
|
2015-04-18 17:14:14 +02:00 |
|
Emmanuel Papin
|
77138c48d2
|
Fix a conflict in php lang files after merge from upstream master
|
2015-01-10 17:55:46 +01:00 |
|
manupap1
|
cee8b77bec
|
Add plugin translations in language files
|
2014-11-12 10:20:18 +01:00 |
m-bene
|
a81b9b8ce2
|
change examples for options
|
2014-05-17 21:48:08 +02:00 |
|
m-bene
|
9a71a0068a
|
add help window for ffmpeg/libvlc options
|
2014-05-17 04:33:33 +02: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 |
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 |
|
m-bene
|
2784b3d1f5
|
Merge master
|
2014-03-20 10:26:12 +01:00 |
|
m-bene
|
26777487dc
|
add feature to extend preclusive zone alarm state by x frames
|
2014-03-09 17:05:39 +01: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
|
5ac8a5cc99
|
New localization strings from Nagyrobi copied verbatim from en_gb
|
2014-02-26 08:38:47 -06:00 |
Isaac Connor
|
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 |
nextime
|
33cbd89212
|
Migrate svn to git
|
2013-03-17 00:45:21 +01:00 |
|
Kfir Itzhak
|
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 |
stan
|
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 |
|
stan
|
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 |
|
stan
|
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 |
|
stan
|
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 |
|
stan
|
f6bcc70b0d
|
Updated for new tokens
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3268 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-01-30 21:17:50 +00:00 |
|
stan
|
c652b358d7
|
Fixed issue with bogus empty lines after closing php tag.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2889 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-05-24 10:00:20 +00:00 |
|
stan
|
595f303870
|
Updated with new probe settings.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2830 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-03-31 13:01:52 +00:00 |
|
stan
|
411952c3c7
|
Updated for 1.24.0
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2746 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-02-08 17:39:12 +00:00 |
|
stan
|
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 |
|
stan
|
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 |