e7a43b2618
fix, don't set the storage path to NULL
2017-12-06 10:11:59 -08:00
3e7c573da5
Add download video option to events view
...
Creates a new popup window for downloading event video files with no directory structure in the archive
2017-12-03 14:42:07 -05:00
207b66c8fa
add Edit Layout
2017-10-30 16:29:46 -04:00
82fbec697f
add IS and IS NOT as filter operators so that we can do IS NULL and IS NOT NULL because = NULL and !=NULL are not valid
2017-10-27 08:37:53 -07:00
653d213d62
Add EndTime and DiskSpace to Filters
2017-10-25 11:11:19 -07:00
354262c557
wip nvsocket
2017-10-03 13:28:56 -07:00
4be133ed09
remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin
2017-09-30 14:19:32 -04:00
bc1b770c14
add translation for AddNewStorage
2017-09-26 11:27:55 -04:00
d9c665b021
Merge branch 'fix_crash_with_invalid_zones' into storageareas
2017-03-17 09:35:11 -04: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
899b1b82b9
Merge branch 'filter_by_runstate' into storageareas
2017-01-14 17:07:20 -05:00
242e5a56d8
rough in the ability to filter on RunState
2017-01-14 16:55:28 -05:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -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
96b5af9021
Merge branch 'fix_onvif' into storageareas
2016-10-04 15:00:28 -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
2b4bad86cb
Merge branch 'master' into storageareas
2016-09-13 10:21:10 -04:00
0adbaafd98
Merge branch 'master' into storageareas
2016-04-26 13:10:37 -04:00
804ac1de81
Clone feature added
2016-04-14 13:53:10 -04:00
6816a4c75b
Merge branch 'iconnor_video' into storageareas
2016-04-01 11:35:38 -04:00
e7ee464a17
Add a RecordAudio setting to the Storage Tab
2016-03-31 15:50:44 -04:00
c9a1a9020d
Merge h264
2016-03-31 11:03:36 -04:00
ea49dc20d1
Merge branch 'master' into storageareas
2016-03-30 10:58:07 -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
ae58da31ea
Changed WSDiscovery from 1.1 to 1.0
2016-03-19 19:04:09 +01:00
e67f247374
add ConcurrentFilter translation
2016-02-05 11:58:20 -05:00
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
818cd614eb
Merge branch 'multi-server' into storageareas
2016-01-08 10:17:37 -05: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
c03088e1b5
Just say Storage Area instead of Storage Id /Name. Same with Server
2015-12-21 14:32:42 -05:00
ca07b951cb
Merge branch 'master' into newpointone
...
Conflicts:
docs/installationguide/ubuntu.rst
2015-12-21 12:41:25 -05:00
872e5eff15
Merge branch 'multi-server' into newpointone
...
Conflicts:
web/lang/en_gb.php
web/skins/classic/views/filter.php
2015-12-21 11:35:16 -05:00
2548ec3bc0
Add Attr lines for StrageId and StorageName
2015-12-21 10:10:53 -05:00
6f5c70dd5d
Add Attr lines for ServerId and ServerName
2015-12-21 10:10:11 -05:00
e28e3c2b75
Merge branch 'master' into feature-h264-videostorage
2015-12-20 14:13:30 +11:00
e5f243a9f8
Merge branch 'maxfps' of https://github.com/knnniggett/ZoneMinder into knnniggett-maxfps
2015-12-19 08:16:20 -06:00
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
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
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
2bf9080ca9
ensure captures_per_frame >0
...
add missing lang entries for MultiBuffer and CapturesPerFrame
2014-11-14 17:17:09 +01:00
5c6fe54265
Persistance and UI for ONVIF monitor options
2014-11-14 17:17:09 +01:00
fb31f7f15f
Added basic ONVIF support
2014-11-14 17:00:16 +01: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
Isaac Connor
digital-gnome
Isaac Connor
APHW2 MFGENG
Isaac Connor
SteveGilvarry
klemens
Andy Bauer
Isaac Connor
corax
arjunrc
Robin Daermann
Jon Burgess
Jan M. Hochstein
Isaac Connor
SteveGilvarry
Andrew Bauer
Emmanuel Papin
Lihis
m-bene
Kfir Itzhak
Sune1337
Edward Barnard
nagyrobi
Isaac Connor
nextime
stan
stagecoach