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
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
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
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
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
