ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,842 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

124 Commits

Author SHA1 Message Date
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 3368d4f474 Removed untranslated "Font size" from language files, corrected white 
space and make font size a const int
 2015-08-10 15:35:19 +02: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
root a9df82256b Change encoding of web/lang/de_de.php from ISO-8859-1 to UTF-8 2015-07-17 14:24:46 +02:00
Sebastian Kaminski f3a8217651 resolve conflicts from merge by seebaer1976 2015-06-05 19:34:52 +02:00
seebaer1976 4cf1e61197 Update de_de.php 2015-05-31 17:43:21 +02:00
Sebastian Kaminski ba980ae4ae update german translation 2015-05-27 15:38:47 +02: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 e92fb40c84 Set date and time format in french lang file 2015-04-18 19:08:03 +02:00
Emmanuel Papin 955237d6ac Translate new strings in french file 2015-04-18 17:51:08 +02:00
Emmanuel Papin ac8ace33f8 Remove hardcoded localized strings and update lang files 2015-04-18 17:14:14 +02:00
Emmanuel Papin 5d0d5dadc7 Fix translations after first review 2015-04-17 22:58:51 +02:00
Emmanuel Papin 1674675da4 Translation of a bunch of english text 2015-04-16 22:32:47 +02:00
seebaer1976 750420d42f Update de_de.php 2015-04-05 09:52:34 +02:00
seebaer1976 35ba2a2107 Update de_de.php 2015-04-05 09:03:41 +02:00
seebaer1976 2522537184 Update de_de.php 2015-04-04 22:38:12 +02:00
seebaer1976 4aa9b0e802 Update de_de.php 2015-04-04 18:03:25 +02:00
seebaer1976 da48b0ea4a Update de_de.php 2015-04-04 09:21:43 +02:00
seebaer1976 5c35bc5acb Update de_de.php 2015-04-03 21:04:24 +02:00
seebaer1976 2a3fdf3695 Update de_de.php 2015-04-03 19:12:15 +02:00
Emmanuel Papin 039cf09da9 Fix bad translations (first checking before tests) 2015-03-30 21:16:33 +02:00
Emmanuel Papin c0b41ed6a8 Readd translations from Jypy 2015-03-30 20:50:42 +02:00
Emmanuel Papin ca041a3ce5 Revert "Update fr_fr.php" 
This reverts commit 3b9c3f0776.
 2015-03-30 20:06:59 +02:00
Andrew Bauer 20107ac1e6 remove NETPBM dependency from autotools 2015-03-01 10:51:04 -06:00
Jean-Philippe Bouillot 3b9c3f0776 Update fr_fr.php 2015-02-20 12:30:33 +01: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
Hannes 4508c541ef Update et_ee.php 
Fixing Some problems 
Parse error: syntax error, unexpected 'Parameters' (T_STRING) in /usr/share/zoneminder/lang/et_ee.php
 2015-01-06 17:10:58 +02:00
Isaac Connor d7e08559d6 Merge pull request #582 from hanzese/patch-1 
Update et_ee.php
 2014-12-01 15:34:53 -05:00
Hannes e60919f19a Update et_ee.php 
Translating some code comments.
 2014-11-27 03:51:40 +02:00
Hannes 92b65c553e Update et_ee.php 
Changing back charset-utf-8.
 2014-11-27 03:43:59 +02:00
Isaac Connor 641c94d5be add CSSDescription which is used on the options tab for skin 2014-11-26 11:57:01 -05:00
Emmanuel Papin 4e9c3494b8 Convert french lang file to UTF-8 2014-11-20 20:51:49 +01:00
hanzese 993a186d06 Update et_ee.php 
ZoneMinder Estonian Translation by Hannes
 2014-11-19 10:25:35 +02:00
hanzese db86ac7b40 Update et_ee.php 
ZoneMinder Estonian Translation by Hannes
 2014-11-17 18:06:37 +02:00
hanzese 79ca3dd736 Update et_ee.php 
ZoneMinder Estonian Translation
 2014-11-17 02:53:50 +02: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 de107f77ba fix option help text for overlooked languages 2014-05-17 04:51:01 +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