Commit Graph

272 Commits

Author SHA1 Message Date
Isaac Connor 7e6fbe1ab4 Fix ControlTypes dropdown. 2020-09-05 08:46:18 -04:00
Isaac Connor a6ad57b393 fix html validation errors 2020-09-02 17:32:24 -04:00
Isaac Connor 3d3966b1ea use xhtmlFooter as it now contains the javascript instead of xhtmlHeader 2020-09-02 14:45:40 -04:00
Andrew Bauer 990b5bd9dc monitor view - convert links to buttons 2020-08-28 15:22:57 -05:00
Andrew Bauer 9c56cd223f move header right to shift pill list up 2020-08-28 13:32:46 -05:00
Andrew Bauer 47732e2469 right align monitor item names 2020-08-28 13:18:01 -05:00
Andrew Bauer a919be7b2d replace tabs with vert pills 2020-08-28 13:09:49 -05:00
Andrew Bauer d69b3e7f43 make cancel go back to console 2020-08-28 10:56:09 -05:00
Andrew Bauer 1e78307735 add navigation buttons to monitor view 2020-08-27 16:30:49 -05:00
Andrew Bauer 1f5f964ae3 add navbar to monitor view 2020-08-27 15:53:24 -05:00
Isaac Connor 610f73a835 Merge branch 'release-1.34' 2020-08-17 19:30:32 -04:00
Isaac Connor c87886f5a5 Fix v4l2 channel and palette dropdowns allowing the saving of local monitors. 2020-08-15 12:31:30 -04:00
Isaac Connor a19990f4d7 Merge branch 'release-1.34' 2020-08-06 11:57:35 -04:00
Isaac Connor 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
Andrew Bauer aa8662f311
fix copy/paste typo 2020-07-28 10:37:10 -05:00
Andrew Bauer b88f0c3991 display user:port@ip when controladdress is empty 2020-07-28 10:08:24 -05:00
Isaac Connor 64e4363302 update code populating DeviceChannel, DeviceFormat, CapturePalette 2020-07-21 13:40:04 -04:00
Isaac Connor 2db65d3821 Merge branch 'release-1.34' 2020-07-04 09:09:24 -04:00
Isaac Connor 8a35ae2daf Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-07-04 09:04:38 -04:00
Isaac Connor 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
Isaac Connor 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 eb41e4fb39 Fix the array for the de-interlacing options 2020-05-24 11:09:13 -04:00
Isaac Connor 85e1dcadf4 Fix the array for the de-interlacing options 2020-05-24 11:07:52 -04:00
Isaac Connor 992ac144a9 Fix ONVIF_User => ONVIF_Username 2020-05-13 16:04:26 -04:00
Isaac Connor 880b456d93 Rrename MetaConfig to ONVIF 2020-05-13 15:30:56 -04:00
Isaac Connor c83621822f Rename Config* to ONVIF_* 2020-05-12 15:46:07 -04:00
Isaac Connor 89939efc9b Fixup my updates to the MetaConfig tab of monitor view 2020-05-12 11:15:29 -04:00
Isaac Connor 75082064fd Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream 2020-05-09 16:40:17 -04:00
Isaac Connor 732bb5416f Merge branch 'master' into onvif_updated 2020-05-09 16:26:29 -04:00
Isaac Connor c99db3a03f Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate 2020-05-01 18:47:10 -04:00
Isaac Connor 5503458874 correct label_size array and add translations 2020-04-23 16:32:19 -04:00
Isaac Connor 2fe0096b21 correct label_size array and add translations 2020-03-30 18:34:43 -04:00
Isaac Connor ff061bd48e Fixup VNC input options. Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate 2020-03-30 10:09:53 -04:00
hax0kartik a781cc2c87 WIP scaling 2020-03-27 14:32:50 -04:00
hax0kartik ae80b3b859 Start implementing VNC 2020-03-27 14:32:50 -04:00
Isaac Connor 4ce944da23 Merge branch 'release-1.34' 2020-03-26 15:38:35 -04:00
Isaac Connor b354641df3 fix syntax errors in triggers in monitor view 2020-03-26 13:57:19 -04:00
Isaac Connor 3d993eef80 Fix triggers code 2020-03-09 14:39:57 -04:00
Isaac Connor f056f787c5 Merge branch 'release-1.34' 2020-03-08 17:24:06 -04:00
Isaac Connor e56976c800 Triggers cannot be null, it is '' instead 2020-03-08 17:23:48 -04:00
Isaac Connor ac00ca0ad8 Only list enabled Storage Areas 2020-03-04 10:46:59 -05:00
Isaac Connor 0c70c5c2a4 Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value 2020-02-25 18:14:27 -05:00
Isaac Connor e82ed3a098 Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value 2020-02-25 18:13:42 -05:00
Isaac Connor 74b3ad6dd9 add options help for HWACCEL options 2020-01-16 14:33:37 -05:00
PrplHaz4 6a4b66a792
add 3840x2160 4k UHD to monitor dropdown
I think this is fairly common in consumer IP cams now...
2020-01-10 19:44:06 -05:00
Isaac Connor 714d304528 Change WebColour to a colour selector input and add a random colour icon. Select a random colour on new Monitor creation 2019-12-31 19:10:29 -05:00
Isaac Connor 34354f5871 Add Notes field to monitors to store random info in. Bump version to 1.33.16. use htmlSElect for savejpegs. Move storage area under Storage tab. 2019-12-18 12:13:00 -05:00
Isaac Connor 72cb5bd1bb add missing </select> 2019-12-02 15:49:42 -05:00
Isaac Connor 7e92900542 Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code 2019-11-29 13:50:02 -05:00
Isaac Connor 54c11bc0d1 define monitor_options as an empty array instead of php implicitly dealing with it 2019-11-01 13:42:01 -04:00