cd2c977ed8
Merge branch 'master' into replace_function_concept
2022-02-16 14:25:38 -05:00
f3d3cad419
Remove non-translations
2022-02-16 09:59:48 -05:00
93ab345a3a
DefaultCodec is for event view, not live
2022-02-16 09:59:48 -05:00
23bfbcd6ce
Merge branch 'master' into multistream
2022-01-26 10:13:20 -05:00
fb832e7d1b
Adds janus_enable_audio, a switch to try to enable audio in live stream viewing.
2022-01-19 00:14:52 -06:00
3835087c9d
Merge branch 'master' into multistream
2022-01-18 20:16:08 -05:00
c97db738a3
fix OPTIONS_CAPTURING
2022-01-11 10:44:42 -05:00
0728c04bf4
rough in options help for capturing
2022-01-11 06:58:10 -05:00
3a9c16aeea
First working Janus build
2022-01-10 23:22:37 -06:00
f110afa6ec
Remove Function language entries
2022-01-10 18:52:13 -05:00
78a803abf8
Add Model and Manufacturer to telemetry listing
2021-11-16 09:47:34 -05:00
dcd2c16774
Define Date formats
...
Set Locale for time to en_GB.utf8, changed STRF_FMT_DATETIME_SHORTER to %x which is locale aware short date, but does include year. Makes event table wider, not sure if that is a problem for others
2021-09-27 00:58:34 +10:00
6d07c7ce9f
specify the invalid characters
2021-05-04 15:56:47 -04:00
24d9bfa257
Add a test for invalid characters in Path for Ffmpeg monitors
2021-05-04 10:45:27 -04:00
0213c67236
add MinSectionLength
2021-04-27 15:25:09 -04:00
f4837d72ee
add text for ModectDuringPTZ
2021-04-23 14:52:29 -04:00
1a5d87b3b8
Add GetCurrentLocation
2021-04-19 15:45:55 -04:00
d598edc7df
Implement duplicate RTSPSTreamName check
2021-04-17 12:50:26 -04:00
2d64c616ba
Add help for BadEncoderParameters
2021-04-01 11:53:57 -04:00
617264432e
Add help for ImageBUfferCount and MaxImageBUfferCount
2021-03-26 17:02:03 -04:00
105eff7a21
Remove references to zma
2021-02-01 17:29:16 -05:00
ae41998d7c
Add a check for passthrough and not ffmpeg
2021-01-29 09:53:11 -05:00
69626651ff
ImageBufferCount can now be as low as 2
2021-01-26 15:33:38 -05:00
1e59c5bbde
Merge branch 'release-1.34'
2021-01-15 18:46:07 -05:00
b019a759a3
ffmpeg options doesn't support loglevel setting. SO remove it from help. Fixes #3109
2021-01-15 18:43:49 -05:00
4667e21636
Add DecodingEnabled to Function modal
2020-12-10 14:06:40 -05:00
37d4b3472f
Add useful help for function modal describing each mode and the purpose of the Enabled checkbox
2020-12-10 13:43:28 -05:00
ffc5249a66
add LockRows to Filters
2020-10-26 18:47:55 -04:00
031b41f78a
remove the english word popup from lang files
2020-10-13 07:59:34 -05:00
637551b7e7
Add english for FilterUnarchiveEvents
2020-10-12 10:54:38 -04:00
6c0f61ebbd
rework devices view, remove inline onclick
2020-10-02 12:39:05 -05:00
e2fb5ae9ea
use br html tag to break the text
2020-09-26 09:24:17 -05:00
9d1c24234b
add ConfirmDeleteControl to lang
2020-09-26 08:58:26 -05:00
c831f16d92
add EditControl to lang
2020-09-26 08:05:00 -05:00
5b1d6331e4
make the delconfirm modal generic
2020-09-26 07:53:22 -05:00
6a77591237
Add lang for Event DiskSpace and FileSystem ISKSpace
2020-09-17 15:15:28 -04:00
344f586f19
Add language entry for ExistsInFileSystem
2020-08-16 13:03:18 -04:00
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
d8cd4386cf
rename GetOptEncoderParams to GetOptEncoderParams to GetOptEncoderParamsVec so that we can get at the std::string if we want to.
...
Use EncoderParams when setting movflags in VideoStore.
Move the content of this option to a help popup so that we can remove the comments from it. av_dict_parse doesn't handle the hash tag as a comment.
2020-07-30 15:06:05 -04:00
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
9f821c74f6
Add tooltip on Add Monitor button explaining that the user doesn't have permission to add a monitor
2020-07-03 19:16:41 -04:00
0905655377
Merge branch 'master' into add_user_to_filters
2020-06-05 17:08:14 -04:00
75082064fd
Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream
2020-05-09 16:40:17 -04:00
732bb5416f
Merge branch 'master' into onvif_updated
2020-05-09 16:26:29 -04:00
e01538419f
Add FilterUser to language
2020-05-07 10:59:50 -04:00
571ff260cc
Merge branch 'release-1.34'
2020-04-04 16:35:09 -04:00
f81cfc0513
add 1 month as an option to the version popup dropdown
2020-04-04 11:46:31 -04:00
dab5c520fe
Merge branch 'master' into add_alarmed_zone_to_filters
2020-02-19 14:20:08 -05:00
289bde869d
use a better language for unset value
2020-02-11 14:31:48 -05:00
29a04dc1b9
Merge branch 'improve_filter_emails' into add_alarmed_zone_to_filters
2020-01-24 09:50:53 -05:00
Isaac Connor
Isaac Connor
Jonathan Bennett
Steve Gilvarry
Andrew Bauer
Isaac Connor