997a05eb8b
AV_CODEC_ID for H264 is 27 not 220
2020-12-15 16:56:27 -05:00
e123322d06
Merge branch 'master' into rtsp_server
2020-12-15 11:00:13 -05:00
99e7ae3505
Merge branch 'master' into rtsp_server
2020-12-15 10:14:19 -05:00
bc07c38dc8
add 704x576 PAL D1
2020-12-14 12:57:59 -05:00
43d0b0fd55
Add D1-PAL resolution
2020-12-13 16:47:51 -05:00
8bda0b5504
fix element name on DecodingEnabled
2020-12-10 16:24:45 -05:00
5c1135b2a7
Merge branch 'master' into no_decode
2020-12-10 15:15:32 -05:00
eb00cf405a
Add DecodingEnabled to monitor view
2020-12-10 15:14:37 -05:00
b12f1cce5b
add Function help text to monitor view
2020-12-10 14:32:17 -05:00
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
9b8f63b36f
EstimatedRamUse to Estimated Ram Use so we don't an en_gb translation
2020-12-05 10:23:29 -05:00
528699f942
Use ctzll + new font format for improving drawing speed
2020-11-28 18:46:20 +05:30
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04:00
3fdbae7761
add 1440p to the resolution list
2020-10-16 14:54:54 -04:00
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
0a4a144bbc
Merge branch 'location'
2020-09-28 09:33:28 -04:00
f4e7e264f0
fix makelink
2020-09-25 16:18:44 -05:00
582d85f083
unpopup the controlcaps views
2020-09-25 16:12:05 -05:00
f9d28ddabe
stick a map on the location tab
2020-09-24 20:31:22 -04:00
624bcdcde0
Add Latitude and Longitude to Monitors and monitor edit as well as using the geolocation api to auto-populate them
2020-09-24 09:01:30 -04:00
70be6bc84c
Add an estimated ram use to buffer tabs
2020-09-22 16:21:59 -04:00
fbc15c8109
Fix FPS Report Interval label
2020-09-22 15:51:44 -04:00
ed6d5a55a5
put an onchange on the monitorType causing a form submit so that Source and Storage tabs update. Rename action to save and put it on the submit button
2020-09-22 14:33:26 -04:00
b1dd42dd8b
Use bootstrap nav pills to just hide/show the tab instead of doing form submits in monitor editing
2020-09-22 14:05:11 -04:00
7196eaf0d0
Minimum value for label position is 0, not 1.
2020-09-22 13:14:25 -04:00
d2b2291721
deploy optionhelp to monitor view
2020-09-11 13:10:18 -05:00
7e6fbe1ab4
Fix ControlTypes dropdown.
2020-09-05 08:46:18 -04:00
a6ad57b393
fix html validation errors
2020-09-02 17:32:24 -04:00
3d3966b1ea
use xhtmlFooter as it now contains the javascript instead of xhtmlHeader
2020-09-02 14:45:40 -04:00
990b5bd9dc
monitor view - convert links to buttons
2020-08-28 15:22:57 -05:00
9c56cd223f
move header right to shift pill list up
2020-08-28 13:32:46 -05:00
47732e2469
right align monitor item names
2020-08-28 13:18:01 -05:00
a919be7b2d
replace tabs with vert pills
2020-08-28 13:09:49 -05:00
d69b3e7f43
make cancel go back to console
2020-08-28 10:56:09 -05:00
1e78307735
add navigation buttons to monitor view
2020-08-27 16:30:49 -05:00
1f5f964ae3
add navbar to monitor view
2020-08-27 15:53:24 -05:00
610f73a835
Merge branch 'release-1.34'
2020-08-17 19:30:32 -04:00
c87886f5a5
Fix v4l2 channel and palette dropdowns allowing the saving of local monitors.
2020-08-15 12:31:30 -04:00
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -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
aa8662f311
fix copy/paste typo
2020-07-28 10:37:10 -05:00
b88f0c3991
display user:port@ip when controladdress is empty
2020-07-28 10:08:24 -05:00
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
64e4363302
update code populating DeviceChannel, DeviceFormat, CapturePalette
2020-07-21 13:40:04 -04:00
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
8a35ae2daf
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-07-04 09:04:38 -04:00
ff265d2f17
replace buildSelect with htmlSelect. Update number inputs to take floats. Remove fixed sizes on various text inputs
2020-07-04 09:00:30 -04:00
cc0624eb3f
Don't allow viewing of monitor setting if monitor permissions are set to View
2020-07-03 19:19:13 -04:00
Isaac Connor
hax0kartik
Isaac Connor
Andrew Bauer