mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-20 06:48:00 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,394 Commits 80 Branches 104 Tags
08c8da3e8f19089028fa7f72decfe3dffc504a7f
Commit Graph

64 Commits

Author SHA1 Message Date
Steve Gilvarry
da157f5a1a Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-04-30 22:27:10 +10:00
arjunrc
804ac1de81 Clone feature added 2016-04-14 13:53:10 -04:00
Isaac Connor
9a795432cf merge all the commits from the messed up iconnor_video branch 2016-04-05 17:14:46 -04:00
Isaac Connor
abcf48b65c Merge branch 'master' into feature-h264-videostorage 2016-04-01 08:53:45 -04:00
Isaac Connor
247cb3d0b2 Merge pull request #1360 from schrorg/monitornames-spaces 
Allow spaces in monitor names
 2016-03-30 09:17:57 -04:00
Andrew Bauer
ab05d52a0a Update en_gb.php 
typo
 2016-03-28 08:35:34 -05:00
Robin Daermann
af68fd20a8 Some Translations for Monitor names with spaces 2016-03-24 14:51:24 +01: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
7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
 2016-01-30 15:45:08 +11:00
Isaac Connor
d48ec1cfbe Add AddNewServer and Hostname entries 2016-01-08 10:15:41 -05:00
Isaac Connor
1aa79c306b Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server 2015-12-22 09:47:45 -05:00
Isaac Connor
6f5c70dd5d Add Attr lines for ServerId and ServerName 2015-12-21 10:10:11 -05:00
SteveGilvarry
e28e3c2b75 Merge branch 'master' into feature-h264-videostorage 2015-12-20 14:13:30 +11:00
Andy Bauer
e5f243a9f8 Merge branch 'maxfps' of https://github.com/knnniggett/ZoneMinder into knnniggett-maxfps 2015-12-19 08:16:20 -06:00
SteveGilvarry
d8494aba2d Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_remote_camera_rtsp.h
	web/skins/classic/views/monitor.php
 2015-10-23 22:07:22 +11:00
Pliable Pixels
23b549a471 recaptcha fixes to avoid lockout 2015-09-24 15:44:35 -04:00
Andrew Bauer
a995d72ebd add warning and help text for maxfps fields 2015-08-22 12:36:49 -05:00
Andrew Bauer
2fbf79674b Add RTSP Describe checkbox to web console 2015-08-21 10:32:50 -05:00
Andrew Bauer
fe3595bfa1 Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_update-1.28.101.sql
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
 2015-08-18 20:20:53 -05:00
Andrew Bauer
68adcc9e67 Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp 
Conflicts:
	CMakeLists.txt
	configure.ac
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
 2015-08-18 14:07:38 -05:00
Andrew Bauer
c17de4a00f add Exif checkbox to monitor 2015-08-16 17:56:03 -05:00
Robin Daermann
078e18e6c5 Add label size to monitor options (frontend part) 
This commit adds the option "Font size" to monitor options in the
timestamp panel. Includes translations of "Font size" for german
(de_de), french (fr_fr) and spanish (es_es). All other language files
contain the english text.
 2015-08-10 15:35:19 +02: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
SteveGilvarry
b6af731400 Add translate options for h264 Storage options in Monitor and update en_gb file 2015-06-10 23:41:17 +10:00
Lihis
0e7fa89dd1 Fix: typo in options_libvlc 
Fixed typo in the OPTIONS_LIBVLC help.
 2015-04-22 15:26:33 +03:00
Emmanuel Papin
ac8ace33f8 Remove hardcoded localized strings and update lang files 2015-04-18 17:14:14 +02:00
Andy Bauer
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
Isaac Connor
2b53e439b9 Add Capture Resolution to replace Capture Width and Capture Height 2015-02-11 13:14:51 -05:00
Isaac Connor
641c94d5be add CSSDescription which is used on the options tab for skin 2014-11-26 11:57:01 -05:00
Jan M. Hochstein
f1b2ba091c Update meta makefiles 2014-09-12 16:06:19 +02:00
Isaac Connor
e065e2b3cc add V4L 2014-07-24 11:37:10 -04:00
Jan M. Hochstein
0a2515c00e Added basic ONVIF support 2014-07-14 20:36:18 +02:00
Isaac Connor
edd794a993 ensure captures_per_frame >0 
add missing lang entries for MultiBuffer and CapturesPerFrame
 2014-07-14 14:07:28 -04: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
c119c49cd9 Merge remote branch 'nagyrobi/patch-25' into nagyrobi 2014-02-26 09:21:38 -06:00
Andrew Bauer
0258579ef3 Merge remote branch 'nagyrobi/patch-10' into nagyrobi 2014-02-26 08:25:16 -06:00
Edward Barnard
3201e5a431 Adds web ui support for libvlc camera. 2013-12-19 21:51:39 +00:00
nagyrobi
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
nagyrobi
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
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