Isaac Connor
fd44ff4e60
Merge branch 'master' into storageareas
2017-05-10 13:16:08 -04:00
Andrew Bauer
3e550e1461
remove "Actual" key from ru lang file since that word is too common.
2017-05-10 07:59:04 -05:00
Andrew Bauer
ef6a3b63af
Merge branch 'Ru_Translation' of https://github.com/IDDQDesnik/ZoneMinder into IDDQDesnik-Ru_Translation
2017-05-10 07:58:31 -05:00
Andrew Bauer
e6c60737e9
Merge pull request #1756 from SteveGilvarry/zmf_goodbye
...
Remove zmf
2017-05-10 07:07:22 -05:00
Isaac Connor
f1f54205fb
Merge branch 'remove_BOM' into storageareas
2017-04-16 09:28:35 -04:00
Isaac Connor
5e0012569f
use dos2unix to remove BOM
2017-04-16 09:22:37 -04:00
IDDQDesnik
6081374ace
Updated Russian translation
2017-03-21 17:39:22 +03:00
Andrew Bauer
2dcd95bc7f
Merge pull request #1504 from ZoneMinder/improve_filter
...
Improve filter
2017-03-18 21:12:58 -05:00
Isaac Connor
d9c665b021
Merge branch 'fix_crash_with_invalid_zones' into storageareas
2017-03-17 09:35:11 -04:00
SteveGilvarry
b791504598
Wording of help text fixes
2017-02-06 08:01:04 +11:00
SteveGilvarry
9716c4ef89
Add Option help
2017-02-05 18:43:47 +11:00
SteveGilvarry
2f3ebd80da
Remove zmf, die..die..die
2017-01-16 13:20:05 -08:00
Isaac Connor
899b1b82b9
Merge branch 'filter_by_runstate' into storageareas
2017-01-14 17:07:20 -05:00
Isaac Connor
242e5a56d8
rough in the ability to filter on RunState
2017-01-14 16:55:28 -05:00
Isaac Connor
b4bddee337
Merge branch 'master' into improve_filter
2017-01-03 08:49:56 -05:00
Isaac Connor
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
klemens
0d549f1db3
spelling fixes
2016-12-29 10:31:05 +01:00
Andy Bauer
25ab1bee18
more fixed to gpl license text
2016-12-26 10:40:09 -06:00
Andy Bauer
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
Isaac Connor
7f2bf04c2f
Merge branch 'cookie_http_only' into storageareas
2016-12-08 14:26:13 -05:00
Isaac Connor
857b4e8345
Merge branch 'master' into improve_filter
2016-12-06 11:58:41 -05:00
Bernardus Jansen
986567839e
Additional minor changes
2016-12-02 10:08:49 +01:00
Bernardus Jansen
e27639f599
Updated dutch translation
2016-12-02 09:49:50 +01:00
Isaac Connor
1e233c0ce5
Merge branch 'master' into improve_filter
2016-11-04 15:20:43 -04:00
Isaac Connor
53166fabf5
Merge branch 'master' into storageareas
2016-11-03 14:59:06 -04:00
Steve Gilvarry
d504043a9e
Update ru_ru.php
...
Remote extra line
2016-11-01 00:32:46 +11:00
Isaac Connor
b385ba7bf4
Merge branch 'master' into improve_filter
2016-10-18 09:59:45 -04:00
Isaac Connor
96b5af9021
Merge branch 'fix_onvif' into storageareas
2016-10-04 15:00:28 -04:00
Isaac Connor
6814bcc791
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:38 -04:00
Andrew Bauer
e35ef3ce83
Merge pull request #1617 from coracis/master
...
Update German translation
2016-09-09 08:55:19 -05:00
corax
6fab2e97b1
Update German translation of Buffer
2016-09-09 13:32:20 +02:00
corax
b10c79b4f7
Add translation for 'Montage Review'
2016-09-09 13:26:19 +02:00
corax
430ecd8e32
Fix some too direct translations into German
2016-09-09 11:51:53 +02:00
corax
d017138550
Fix a 'false friend' in German translation
2016-09-09 11:25:12 +02:00
David Sabbath Grits
2d44531d1f
add some more translation
2016-08-25 14:24:14 +02:00
Disassembler
883b323528
Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8
2016-05-29 22:16:00 +02:00
Isaac Connor
7277283659
rename AttrServerId to AttrServer, because that is the text that is returned
2016-05-27 10:12:46 -04:00
Isaac Connor
2b4bad86cb
Merge branch 'master' into storageareas
2016-09-13 10:21:10 -04:00
Isaac Connor
e29a0ebe71
Merge branch 'feature-h264-videostorage' into storageareas
2016-06-21 13:48:32 -04:00
Isaac Connor
26bba58c56
Merge branch 'master' into feature-h264-videostorage
2016-06-17 11:09:47 -04:00
Isaac Connor
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
Steve Gilvarry
da157f5a1a
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-04-30 22:27:10 +10:00
Isaac Connor
0adbaafd98
Merge branch 'master' into storageareas
2016-04-26 13:10:37 -04: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
60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
Isaac Connor
238a25a302
Merge branch 'master' into iconnor_video
2016-04-05 09:38:59 -04:00
SteveGilvarry
4d7ded5ef0
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
configure.ac
src/Makefile.am
web/js/Makefile.am
2016-04-05 22:06:14 +10:00
Andy Bauer
4e9a925933
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
2016-04-04 20:52:49 -05:00
Isaac Connor
82b32578ec
Merge branch 'master' into iconnor_video
2016-04-01 12:54:09 -04:00
Isaac Connor
6816a4c75b
Merge branch 'iconnor_video' into storageareas
2016-04-01 11:35:38 -04:00
Isaac Connor
abcf48b65c
Merge branch 'master' into feature-h264-videostorage
2016-04-01 08:53:45 -04:00
Isaac Connor
e7ee464a17
Add a RecordAudio setting to the Storage Tab
2016-03-31 15:50:44 -04:00
Isaac Connor
c9a1a9020d
Merge h264
2016-03-31 11:03:36 -04:00
Isaac Connor
e5a36c02bd
Merge remote-tracking branch 'origin/master' into video_remote
2016-03-30 16:55:24 -04:00
Isaac Connor
ea49dc20d1
Merge branch 'master' into storageareas
2016-03-30 10:58:07 -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
Jan M. Hochstein
ae58da31ea
Changed WSDiscovery from 1.1 to 1.0
2016-03-19 19:04:09 +01:00
SteveGilvarry
3ce620eb89
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-02-27 19:46:56 +11:00
SteveGilvarry
5ff427d9e9
Removed Autotools Makefile.am
...
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
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-02-26 22:19:02 +11:00
Isaac Connor
e67f247374
add ConcurrentFilter translation
2016-02-05 11:58:20 -05:00
Isaac Connor
89cff287cd
Merge branch 'master' into storageareas
2016-02-04 12:14:16 -05:00
Andrew Bauer
1c142a48a6
Merge pull request #1212 from RBxx/patch-1
...
Convert ru_ru.php to UTF-8
2016-02-04 10:16:24 -06: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
818cd614eb
Merge branch 'multi-server' into storageareas
2016-01-08 10:17:37 -05:00
Isaac Connor
d48ec1cfbe
Add AddNewServer and Hostname entries
2016-01-08 10:15:41 -05:00
RBxx
0ccce76ef8
Convert ru_ru.php to UTF-8
...
In koi8-r encoding, some menu items are not displayed in the web interface. With UTF-8 encoding all displayed correctly.
2015-12-31 16:58:56 +03: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
c03088e1b5
Just say Storage Area instead of Storage Id /Name. Same with Server
2015-12-21 14:32:42 -05:00
Isaac Connor
ca07b951cb
Merge branch 'master' into newpointone
...
Conflicts:
docs/installationguide/ubuntu.rst
2015-12-21 12:41:25 -05:00
Isaac Connor
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
Isaac Connor
2548ec3bc0
Add Attr lines for StrageId and StorageName
2015-12-21 10:10:53 -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
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
SteveGilvarry
f09a551d6a
Merge branch 'master' into feature-h264-videostorage
2015-07-28 21:06:52 +10: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
SteveGilvarry
b6af731400
Add translate options for h264 Storage options in Monitor and update en_gb file
2015-06-10 23:41:17 +10: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
Isaac Connor
2bf9080ca9
ensure captures_per_frame >0
...
add missing lang entries for MultiBuffer and CapturesPerFrame
2014-11-14 17:17:09 +01:00
Jan M. Hochstein
5c6fe54265
Persistance and UI for ONVIF monitor options
2014-11-14 17:17:09 +01:00
Jan M. Hochstein
fb31f7f15f
Added basic ONVIF support
2014-11-14 17:00:16 +01: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
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
03ded1edd0
Merge remote branch 'nagyrobi/patch-2' into nagyrobi
...
Conflicts:
web/lang/hu_hu.php
2014-02-26 09:37:41 -06: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
c119c49cd9
Merge remote branch 'nagyrobi/patch-25' into nagyrobi
2014-02-26 09:21:38 -06:00
Andrew Bauer
5ac8a5cc99
New localization strings from Nagyrobi copied verbatim from en_gb
2014-02-26 08:38:47 -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
Kyle Johnson
7bf4de37de
Merge pull request #211 from kylejohnson/master
...
ZoneMinder Dutch Translation updates by Alco (a.k. nightcrawler)
2013-10-15 13:23:57 -07:00
kjohnson
dff5b3aeb0
ZoneMinder Dutch Translation updates by Alco (a.k. nightcrawler)
2013-10-14 09:27:01 -04:00
Isaac Connor
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
Kyle Johnson
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04:00
nagyrobi
9f1268df38
Update hu_hu.php
...
This one contains updates related to all the earlier pull requests.
Had to change the entire file due to charset encoding reasons.
2013-08-16 15:40:50 +02: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
Kyle Johnson
4d6b9f7276
More updates to the Hungarian translation. #Fixes #45
2013-08-15 09:39:45 -04:00
nagyrobi
1fa04cc104
Update hu_hu.php
2013-08-14 22:38:37 +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
Isaac Connor
3a8481a591
cleanup
2013-05-10 14:02:22 -04:00
Isaac Connor
a468baf9eb
cleanup
2013-05-10 13:55:45 -04:00
Isaac Connor
7cf5475542
Merge ../ZoneMinder-kfir into kfir-proper
...
Conflicts:
configure
src/Makefile.am
src/Makefile.in
2013-05-02 21:28:51 -04:00
nextime
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
stan
4996dd0a51
Recreated generated files.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 09:46:18 +00:00
Kfir Itzhak
63122ab9bc
Undo translations in es_es.php because its not available in the ZM 1.24.4 package.
2012-02-01 07:33:20 +02: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
b40669dc75
Updated Spanish translation
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3476 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-07-07 08:30:12 +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
a20180aded
Updated to process other sections on top of SLANG
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3362 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-25 09:13:47 +00:00
stan
a1ccff276f
Auto-updated.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3310 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-03-02 12:35:17 +00:00
stan
0327f0f751
Added Spanish translation
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3309 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-03-02 12:34:58 +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
8048c1c355
Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 21:59:06 +00:00
stan
e1a9514262
Added Estonian language
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3274 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:27:32 +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
828e316885
Updated SVN header
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3226 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-17 18:20:54 +00:00
stan
46358c84e9
Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-07 11:10:18 +00:00
stan
dc9e2755b0
Added sample apache config file.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-03 23:27:58 +00:00
jaidhar
192b1310b8
Adding Display language item to hungarian file. Other languages need this
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3212 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-12-03 17:47:00 +00:00
stagecoach
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
stan
70aee2ad56
Regenerated
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3160 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 15:50:41 +00:00
stan
5696516092
Updated Italian translation.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3010 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-01-14 10:12:11 +00:00
stan
d77c2a48bd
Updated from forum.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2934 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-29 09:52:48 +00:00
stan
8cad0dbd6a
Updated.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2933 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-24 10:27:28 +00:00
stan
11a1cc2d41
Now supports custom perl install path
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-08 09:11:56 +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
6d19aa8742
Removed blank lines.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2872 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-13 10:58:00 +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
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
stan
75c654e654
Downgraded to support autoconf 2.59
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2812 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-23 21:59:13 +00:00
stan
3069dc2402
Final timestamp update
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2802 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:45:32 +00:00
stan
429884741a
Updated for timestamps
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2801 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:32:04 +00:00
stan
8613dc8f81
Updated
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2796 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-08 11:14:41 +00:00
stan
e6530eda40
Added/update Chinese language files.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2792 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-03 17:48:41 +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
22f22baa32
Updated
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2745 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-08 17:38:43 +00:00
stan
c3fcf0a1e9
Added to SVN
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2744 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-08 17:24:07 +00:00
stan
8560a5811c
Corrected sub-reference to language file.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2743 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-08 17:17:26 +00:00
stan
e7955b81a7
Removed dodgy indentation
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2742 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-08 17:17:09 +00:00
stan
20b7b21100
Update Swedish language file.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2741 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-05 14:57:23 +00:00
stan
e14efbd493
Updated generated files.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2726 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 11:24:01 +00:00