2dcd95bc7f
Merge pull request #1504 from ZoneMinder/improve_filter
...
Improve filter
2017-03-18 21:12:58 -05:00
b791504598
Wording of help text fixes
2017-02-06 08:01:04 +11:00
9716c4ef89
Add Option help
2017-02-05 18:43:47 +11:00
b4bddee337
Merge branch 'master' into improve_filter
2017-01-03 08:49:56 -05:00
0d549f1db3
spelling fixes
2016-12-29 10:31:05 +01:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
1e233c0ce5
Merge branch 'master' into improve_filter
2016-11-04 15:20:43 -04:00
b385ba7bf4
Merge branch 'master' into improve_filter
2016-10-18 09:59:45 -04:00
6814bcc791
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:38 -04:00
b10c79b4f7
Add translation for 'Montage Review'
2016-09-09 13:26:19 +02:00
7277283659
rename AttrServerId to AttrServer, because that is the text that is returned
2016-05-27 10:12:46 -04:00
277fdafa85
Remove entry for Server Name, making Server Id just say Server. The filters will be populated with a dropdown, so no need to go by Id or Name
2016-05-24 16:45:55 -04:00
804ac1de81
Clone feature added
2016-04-14 13:53:10 -04:00
247cb3d0b2
Merge pull request #1360 from schrorg/monitornames-spaces
...
Allow spaces in monitor names
2016-03-30 09:17:57 -04:00
ab05d52a0a
Update en_gb.php
...
typo
2016-03-28 08:35:34 -05:00
af68fd20a8
Some Translations for Monitor names with spaces
2016-03-24 14:51:24 +01:00
9c98ccbb75
Fix spelling in ffmpeg options help: s/verbosiy/verbosity/
2016-03-20 16:13:53 +00:00
020731a89e
Fix typo in ffmpeg options help: s/passwd/passed/
2016-03-20 16:10:49 +00:00
d48ec1cfbe
Add AddNewServer and Hostname entries
2016-01-08 10:15:41 -05:00
1aa79c306b
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-22 09:47:45 -05:00
6f5c70dd5d
Add Attr lines for ServerId and ServerName
2015-12-21 10:10:11 -05:00
e5f243a9f8
Merge branch 'maxfps' of https://github.com/knnniggett/ZoneMinder into knnniggett-maxfps
2015-12-19 08:16:20 -06:00
23b549a471
recaptcha fixes to avoid lockout
2015-09-24 15:44:35 -04:00
a995d72ebd
add warning and help text for maxfps fields
2015-08-22 12:36:49 -05:00
2fbf79674b
Add RTSP Describe checkbox to web console
2015-08-21 10:32:50 -05:00
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
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
c17de4a00f
add Exif checkbox to monitor
2015-08-16 17:56:03 -05:00
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
649a39b372
Replace analysis interval parameter by analysis framerate
2015-07-23 16:36:30 -04:00
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
a6b7c6e99f
Add analysis interval parameter to monitors
2015-07-21 22:52:52 +02: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
Andrew Bauer
SteveGilvarry
Isaac Connor
klemens
Andy Bauer
Isaac Connor
corax
Isaac Connor
arjunrc
Isaac Connor
Robin Daermann
Jon Burgess
Isaac Connor
Andrew Bauer
Emmanuel Papin
Lihis
Jan M. Hochstein
m-bene
Kfir Itzhak
Sune1337
Edward Barnard