luci-app-xfrpc: add subdomain to http&https config

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
(cherry picked from commit ca9def41a47075209d460e5c599e1cd987242dd6)

luci-app-xfrpc: add luci-app-xfrpc

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
(cherry picked from commit 283ac0513f5c84005c5b3b87f243a5b597b0497e)

luci-base: form.js: reuse JSONMap data provider in GridSection modals

Reuse the same data provider as the parent JSONMap instance in order
to avoid inadvertently mangling the form data when saving the modal
edit dialog.

Fixes: bb9ede238a ("luci-base: form.js: reuse JSONMap data provider in GridSection modals")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit dd47f3f6742a6d80221b75aa7b6ea27eca2bb535)

luci-base: form.js: fix GridSection modals in JSONMap instances

Since grid section edit modals construct a new Map instance internally,
we must take care of using the correct map constructor type for the
internal copy in order to end up with the correct data provider.

Ensure that the extended option modal of GridSection instances uses a
JSONMap when the grid section's owner map is a JSONMap to avoid stray
uci related errors.

Ref: https://forum.openwrt.org/t/luci-save-apply/149658/5
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 6fe34990265a02dac20f7b352e4039a90fed45ca)

treewide: Backport translations - sync

Backport translations and sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-app-wireguard: trivial fix to separate a peer's multiple IPs

Attempts to address issue #6003

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit a53fc7711cc067e7fca5f9f5df926ba929569863)

luci-app-dockerman: add minor version

The package has static versioning, based on the original upstream
versioning. Add date as a minor version to signal later changes.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit eda3c14e9fa062bd829d02aebb8b27344a68ac8e)

luci-app-dockerman:  Update to play nice with recent changes

https://github.com/openwrt/luci/commit/180d39dcd2427e3c32c0ec7ecc3c7bfb48c0d0ab broke dockerman's appearance in the menus

Make a small change to dockerman's index entry to make it play nice with the new architecture, firstchild() was obtained using DAWN's controller/dawn.lua as an example

Signed-off-by: Andrew Dodd <atd7@cornell.edu>
(cherry picked from commit 0c1fc7f64566bd5da643eadc6b817bb0f5f591e7)
Fixes #6168

luci-app-nlbwmon: validate date input

Fixes: #6188
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7c7ac8bf0d9d554d19f5d21226110743899b8802)

luci-app-openvpn: fix potential XSS in pageswitch template

Ensure to escape URL instance parameter displayed in the heading.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 25983b9fa572a640a7ecd077378df2790266cd61)

luci-mod-system: fix potential stored XSS

Make sure to escape the key contents in the delete confirmation dialog.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0186d7eae0e123a409e9919a83fdfecc7945c984)

Merge pull request #6182 from stangri/openwrt-22.03-luci-app-pbr

[22.03] luci-app-pbr: additional error messages

luci-app-pbr: additional error messages

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit a748f86fec61d7c390ff0f9ee4a007fadfa936f7)

luci-app-statistics: provide defaul minimal scale for some graphs

Avoid cryptic "200m" axis items for really small values by setting
a default minimal y-axis max value for some of the conntrack, cpu,
cpufreq, load and ping graphs (mainly percentages). The axis
automatically scales upward if necessary, so this just provides
a minimal "at least" scale for the y-axis.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit d9e548fe0c619c0935926a1dfe4a8f8b9ff810a2)

luci-app-statistics: Adjust also default_timespan to 2hour

Adjust also default_timespan option to be 2hour, as that change was
forgotten in 4b49b456. (That seems to have no practical relevance, as
LuCI seems to offer the first item from the period list in any case.)

Fixes: 4b49b456 luci-app-statistics: set shortest period data/graph to 2 hours
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 3aedb609cea9df548fe8a21a0b98e3f01a801200)

treewide: Backport translations from master - i18n

Backport translations.
Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-base: ui.js: support div based table markup in UITable.update()

Constructing UITable instances from existing, div based markup is
supported but the UITable.update() implementation did not account
for that, leading to defunct data updates on tables built from div
based markup.

Fix this issue by extending UITable.update() to consider a div based
table structure as well, like we do in UITable.initFromMarkup() already.

Fixes: #5713
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit deed6827b2eb0b58ee8c1d810a584a9589108eac)

luci-app-natmap: add forward_port option and update stun_server description

Signed-off-by: Richard Yu <yurichard3839@gmail.com>
(cherry picked from commit 1a4ac922829aa8088608374a3bd7445fbf2a6f96)

Merge pull request #6160 from stangri/openwrt-22.03-luci-app-pbr

[22.03] luci-app-pbr: update to 1.0.1-1

luci-app-natmap: add new package

Signed-off-by: Richard Yu <yurichard3839@gmail.com>
(cherry picked from commit cc01c0bffa9030318c39cf493c42c48d22500ec3)

luci-proto-autoip: fix protocol name

Fixes: 2965e527f5 ("luci-proto-autoip: add protocol support for avahi-autoipd")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit ae47caf383c6da53f2345bd225c49b875cb0d514)

luci-proto-autoip: add protocol support for avahi-autoipd

Fixes: #6162
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2965e527f578abda1dc58dd540343422455be3ac)

luci-app-pbr: update to 1.0.1-1

* add more error/warning messages
* better error/ubus error handling

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 54c3ba32f9a2327ca4fdb9c419fb842108b17894)

luci-base: fix button handling for named sections

If more than one named section is added to the page, it is currently the
case, that the first button is always switched on or off during input
validation of the uci section name. This is because the usage of the
'document.querySelector' function is to imprecise. Changing the search
start to the element to be created, fixes this.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 440a2e79a762b4152ccb7e41c90a2826d9fb3538)

Merge pull request #6143 from stangri/openwrt-22.03-luci-app-pbr

[22.03] luci-app-pbr: Detect missing iptables & error-proofing WebUI

luci-app-pbr: Detect missing iptables & error-proofing WebUI

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit f8cbfa11c6583f298f505b103c73781f6349eba8)

luci-mod-network: (wireless) Expose 802.11v settings.

Tested on: 21.02.1

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 82595509093ae1e538c23f131d468766c00092f2)

luci-mod-network: (wireless) Expose 802.11k settings.

Tested on: 21.02.1

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit b88156961f14a2b5a14fce8db3d54817a0cc686f)

luci-mod-network: (wireless) Expose multicast_to_unicast setting.

From https://w1.fi/cgit/hostap/commit/?id=34f7c699a6bcb5c45f82ceb6743354ad79296078
add support for multicast_to_unicast conversion in the wireless settings

Tested on: 21.02.1

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit b2101a23a9116c65c903df6c1d02db16d6da579f)

luci-app-statistics: set shortest period data/graph to 2 hours

Change the shortest defined statistics period from 1 hour to 2 hours.

In practice, this only changes the graph for the shortest period
to show 2 hours of data instead of 1 hour.

The underlying database is not changed:
there are currently 288 data items for each period,
so with the 30 seconds default step, the shortest data series
contains 288 x 0.5 min = 144 min > 2 hours of data.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 4b49b45641b34094bd3be8b34de026303dc70f4a)

treewide: resync and merge master translations

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

luci-base: ui.js: table enhancements

 - Gracefully handle cells without innerText
 - Properly handle `DocumentFragment` call values on table update
 - Introduce ability to fetch actual cell value for sorting purposes from
   `data-value` attribute

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 90a2b1eaeb58b7169b31fdc097c5bfe6f557c778)

luci-base: cbi.js: await L.ui load before updating tables

On legacy views, the `L.ui` JavaScript class is not automatically loaded,
so request it before updating tables.

Fixes: e0e6989a4a ("luci-base: introduce new LuCI.ui.Table class")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit bdfdd95a273f6fc73017795805dcfe6ee1ae8a8e)

luci-base: revise array sorting

Refactor various sort operations throughout luci-base to use the new
L.naturalCompare() comparator function.

This primarily ensures that embedded numbers are sorted numerically and
not in a lexicographical way.

It also simplifies some code as a side effect.

Ref: #5899
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 37422e891a47f15659356ce75b6f6cce831e0041)

luci-base: luci.js: add array sort utilities

Add two new utility functions L.naturalCompare() and L.sortedArray() to
simplify sorting arrays naturally.

Ref: #5899
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8199b2ce9a7d36359aedea1ad9dab157134a46c2)

luci-base: optimized icons filesizes

Optimized PNG filesize without any quality loss.

Signed-off-by: Alexander Semukhin <semukhin@mail.com>
(cherry picked from commit 37477ca6142c6e9e96f210c3a1973a44f814de09)

luci-base: ui.js: add required CSS class to dynlist widget

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d6dbedd9e2c77f44be0f64ee8128401a293f77f4)

luci-base: luci.js: remove wrong CSS class from page footer

The `control-group` class is meant for gapless grouping of inputs with
buttons, while the page actions are just distinct buttons in a row.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4e090e38d2cb606936768847ab0f5526f95be793)

luci-theme-material: fix typo in recovery mode message

Fix the message from "Sytem" to "System" and merge with the existing
message on the other themes.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
(cherry picked from commit 2a558393636e1775f0c9b64ab9fe62a6a43b833e)

luci-theme-material: optimized image filesize

Optimized PNG filesize from 6280 to 3939 bytes. Visually looks the same, technically the image is 99.9% identical.

Signed-off-by: Alexander Semukhin <semukhin@mail.com>
(cherry picked from commit ec8bdab76c1c25f36d13f0053357417aec82dd14)

luci-theme-material: CSS Fix for previous update

Commit b0f13ef Changed the color of a CSS element from a bright blue to
a dark blue. This resulted in a modal with difficult-to-read text (black
text on dark blue).

This commit sets the modal text-color to #000, in line with style
guidelines.

Signed-off-by: Quentin Baker <opensource@quentb.com>
(cherry picked from commit 4ee2bc644acc4bd112f870cf1e689f86f99c5736)

luci-theme-material: Update brand logo/colors

I have updated the brand.png logo to the 2020 version, and I have
made a small adjustment to the CSS to reflect its slightly larger
vertical height.

I also have made small tweaks to the system theme colors to use
the brand colors as recommended on page 5 of the logo usage
guidelines document avalible at
openwrt/branding/blob/master/openwrt-styleguide.pdf

Signed-off-by: Quentin Baker <opensource@quentb.com>
(cherry picked from commit b0f13efa9ce45e7b0ad096e0c1bd5e55bec23b8e)

luci-material-theme: replace margin by gap in ifacebadge

Material is a "flex" theme. Better to use "gap" in place of "margin" to
add some space between elements inside "flex" elements.

This fixes the problem specially when there are text elements inside the
"flex" and don't hurt when there are images.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit 1cd615787a648e3a8fda5d8c20b38b42a62a6d16)

luci-material-theme: fix localizated left menu

The latest fix to fix the logout worked, but it was not applied to all
the resolutions, and I have observed the same problem exists for the
dasboard optional component.
Looking at the code, it seems only the components without submenu, have the
data-title element, so this fix modifies the style for all of them, not
relying on the position or text content.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit 56aeaa8ac8b2a8a9864f3c8290fb10c39ed3173a)

luci-material-theme: align text buttons center

The text inside the buttons is aligned to the top. This change mades
it aligned to the center.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit 9e73a04adbff4dcebd643400da689291b8320d74)

luci-material-theme: make control-group flex

The control-group div does not flex. The buttons overflow the screen.

This change mades them flex.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit 17ddeb7b579160b5367047bbfaa079090090b888)

luci-material-theme: align td text width 33%

The CSS applies a different padding for td elements with 33% width. This
misaligns the text from this td to the others td.

This change modifies the CSS to apply the same padding to all of the
sibling td.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit 3333fd6695cbd2e7a6055f01542242a3b7c111ec)

luci-material-theme: adjust data-title for logout

The data-title attribute style depends on the content in the css rule.
When translated to other language, the css rule fails.
This change uses the position and not the content to apply the style.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit f8e52aa85d305a73a276b45805d758ba20d759fe)

luci-theme-material: fix size of progressbar text

The text of the progressbar is bigger than the progressbar height. This removes the font-size element that produced that.

Signed-off-by: Miguel Angel Mulero <mcgivergim@gmail.com>
(cherry picked from commit 35fb253adb482d1f485245b0f8858b6713a99151)

luci-base: ui: resolve aliases and rewrites on obtaining menu node children

Extend LuCI.ui.menu.getChildren() to resolve aliases and rewrites prior to
returning the menu nodes. This allows aliasing entire menu trees instead of
just single pages.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 180d39dcd2427e3c32c0ec7ecc3c7bfb48c0d0ab)

luci-app-advanced-reboot: Add support for Linksys EA7500 v2

Signed-off-by: Russell Morris <rmorris@rkmorris.us>
(cherry picked from commit d56f6bb3af6ed02b587cc3c69eb94b9e0ed8d109)

luci-app-rp-pppoe-server: use netlist template

pppoe-server init script is expecting an interface name,
not a physical device name in the pppoe config.

Signed-off-by: Daniell Crossman <dc@dx.id.au>
(cherry picked from commit f2eb7275249d3e0c5cf5cc21ec77bab885ad19ff)

luci-mod-system: mount sections are always mounted unless they are explicitly not mounted

fixes #4862

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 5abb2847ba7267a2c9cdbcb8ef506f0be7015047)

luci-base: ucitrack: fix broken affects logic

Changes on a given configuration should trigger change events on affected
configurations, not the other way around.

Fixes: #5745
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 71106351344ea390e0f510e3f9ad34685bacc1ee)

luci-app-openvpn: fix openvpn config corruption on upload

Signed-off-by: Anna Tikhomirova <vamp@vampik.ru>
(cherry picked from commit 64b80b8f118753930357a236ce96ed5e4d720cda)

luci-app-ddns: gracefully handle missing control file

In case `pcall()` fails, `ctrl` will contain an error message.

Fixes: 3395656b9f ("luci-app-ddns: get rid of luci-lib-ipkg depdency")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 74283264a34083725a71a0f62de423a514efa402)

luci-app-ddns: get rid of luci-lib-ipkg depdency

Invoking opkg to obtain the installed package version is very slow and
resource intensive, parse the related control file directly to avoid
the extraneous dependency and resource consumption.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3395656b9f687fd5e071a7805e0ba4c83f62906d)

luci-app-ddns: string fix

Attempts to address issue #6028
Also made proximate strings more clear.

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(backported from commit 3f81a06c0aeef198f6f5dc73d78ea24716ba3b5d)

Merge pull request #6127 from stangri/openwrt-22.03-luci-app-pbr

[22.03] luci-app-pbr: initial commit

luci-app-pbr: initial commit

Depends on https://github.com/openwrt/packages/pull/20010

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit eb21c74b6f7c96226bdf3ca3601e628599041a45)

Merge pull request #6122 from stangri/openwrt-22.03-luci-app-simple-adblock

[22.03] luci-app-simple-adblock: localizable error/warning messages

timezone data: update to 2022g

Update timezone data to 2022g.

* https://mm.icann.org/pipermail/tz-announce/2022-November/000076.html

- In the Mexican state of Chihuahua, the border strip near the US
  will change to agree with nearby US locations on 2022-11-30.
  The strip's western part, represented by Ciudad Juárez, switches
  from -06 all year to -07/-06 with US DST rules, like El Paso, TX.
  The eastern part, represented by Ojinaga, will observe US DST next
  year, like Presidio, TX.
- A new Zone America/Ciudad_Juarez splits from America/Ojinaga.

- Much of Greenland, represented by America/Nuuk, stops observing
  winter time after March 2023, so its daylight saving time becomes
  standard time.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
[adapt the commit in master, lua instead of ucode]

luci-app-simple-adblock: localizable error/warning messages

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 6a4251ff9ad5832e861f9582a88cfd053dcbc436)

luci-proto-wireguard: fix generated AllowedIPs

This corrects the option `AllowedIPs` in generated peer configurations,
and allows to customize it via a dropdown list.

Fixes: #5956
Signed-off-by: Julien Cassette <julien.cassette@gmail.com>
[correct fixes tag, slightly adjust option description]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 73aca68b9e35857ec155f33ca1b1fb5358d69e52)

Merge pull request #6097 from stangri/openwrt-22.03-luci-app-simple-adblock

[22.03] luci-app-simple-adblock: update to 1.9.3-1

luci-app-simple-adblock: update to 1.9.3-1

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit ec31047e357afc19806b7f3d5781389769fada81)

treewide: Backport translations from master

Backport translations from master and sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #6087 from stangri/openwrt-22.03-luci-app-simple-adblock

[22.03] luci-app-simple-adblock: bugfix: allow empty leds field

luci-app-simple-adblock: bugfix: allow empty leds field

* fixes error mentioned in https://github.com/openwrt/luci/pull/6075#issuecomment-1306581739

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 41fee33c20681d514377666515aad9d3bcbfb7f5)

Merge pull request #6084 from stangri/openwrt-22.03-luci-app-simple-adblock

[22.03] luci-app-simple-adblock: convert to js

luci-app-simple-adblock: convert to js

Thanks @dibdot, @jow-!

Signed-off-by: Stan Grishin <stangri@melmac.ca>
Update applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js

Co-authored-by: Vasili Sviridov <vsviridov@exceede.com>
Signed-off-by: Stan Grishin <stangri@melmac.ca>
Thanks @dibdot, @jow-, @vsviridov!

* this includes changes made during review

Co-authored-by: Vasili Sviridov <vsviridov@exceede.com>
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 0b895b17940089f854221b340fafae83bcbb2a99)

timezone data: update to 2022f

Update timezone data to 2022f.
* http://mm.icann.org/pipermail/tz-announce/2022-October/000075.html

 -   Mexico will no longer observe DST after 2022, except for areas
     near the US border that continue to observe US DST rules.
     On 2022-10-30 at 02:00 the Mexican state of Chihuahua moves
     from -07 (-06 with DST) to year-round -06.
 -   Fiji will not observe DST in 2022/3.
     For now, assume DST is suspended indefinitely.
 -   Simplify four Ontario zones.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
[adapt the commit in master, lua instead of ucode]

luci-mod-status: nftables.js: correct icmp display

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 6a03a884301f1acbc1cb1651a06b96ac92cc8596)

luci-mod-network: gracefully handle empty channel lists

Avoid undefined value access when the channel list is empty.

Fixes: #5937, #5951
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9af8486517e87eea837fbce0ce787fc89ab46627)

Merge pull request #6053 from stangri/openwrt-22.03-luci-app-simple-adblock

[22.03] luci-app-simple-adblock: bugfix: identify nft set support

luci-app-simple-adblock: bugfix: identify nft set support

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 4dc98fefcac468917227bd9037bf6a71cbed9b67)

timezone data: update to 2022e

Update timezone data to 2022e.
* http://mm.icann.org/pipermail/tz-announce/2022-September/000073.html
* http://mm.icann.org/pipermail/tz-announce/2022-October/000074.html

 - Palestine transitions are now Saturdays at 02:00.
 - Simplify three Ukraine zones into one.
 - Jordan and Syria switch from +02/+03 with DST to year-round +03.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 10d762eab70a9bcd233cd8cb79e32742fb2c4038)

Merge pull request #6036 from myrlyn/openwrt-22.03_dmfix

luci-app-dockerman: change default to nil if data.blkio_weight is not defined

Merge pull request #6024 from stangri/openwrt-22.03-luci-proto-nebula

[22.03] luci-proto-nebula: add nebula protocol support

luci-app-adblock: sync with adblock 4.1.5

* add a new DNS report parameter to change the top statistics dynamically in the range of 10-50, see #19622 in the package repo for reference.
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 79cbbc01ce0271490ee8f66f7cf1a9a1ca56f64d)
Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-app-dockerman: change default to nil if data.blkio_weight is not defined
Signed-off-by: Jonathon Walker <jonathon.l.walker@gmail.com>

sysauth: add autocomplete and id attributes to login inputs

this let browser automatically fill according to HTML spec for input elements.
luci-theme-bootstrap and luci-base are affected.

Signed-off-by: Viktor Tsvetkov <zwetvik@gmail.com>
[indentation fix]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3e9d9a9dbb045c24eb93643838f8e8e3b9074e4b)

treewide: resync and merge master translations

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

luci-app-nut: use filesystem dependencies for configuration files

Don't use uci dependencies for nut related config files as the nut packages
ship with completely commented out uci files. Such files do not satisfy the
uci menu dependencies as those expect at least one section within the file.

To solve this issue, use a regular file dependency on /etc/config/nut_*
instead.

Supersedes: #5964
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit bfc0fcfe6e97b1b39317f42d96debf3286c42696)

Merge pull request #6027 from neheb/apple

[22.03]backport iOS changes from master

luci-theme-openwrt-2020: quantize png image

Small size reduction.

From: 5908
To:   3896

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 54664523996e03bf99b6e4006b113d5956ec75f8)

luci-theme-openwrt-2020: add iOS webapp support

This way instead of opening a Safari tab, it opens in its own instance.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 28193247bcdd6e03ae2336f8f647f438f2713149)

luci-theme-openwrt-2020: add iOS icon support

Used when adding LuCI to Springboard. Image generated from logo.svg.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 1be885064e65f4c96189e7f63f29dcbb7040f3cb)

luci-proto-nebula: add nebula protocol support

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit d55913cfa44c81280111d093807c6830b3584d8d)

Merge pull request #6018 from pymumu/master

[openwrt-22.03] luci-app-smartdns: update to 1.2022.38

luci-app-smartdns: update to 1.2022.38

Signed-off-by: Nick Peng <pymumu@gmail.com>

Merge pull request #6017 from jcassette/issue-4926-22.03

[22.03] luci-app-ddns: fix creation of custom service (fix #4926)

luci-app-ddns: fix creation of custom service (fix #4926)

The `service_name` option must be empty for custom services,
otherwise an error is raised in `dynamic_dns_updater.sh`.

Signed-off-by: Julien Cassette <julien.cassette@gmail.com>
(cherry picked from commit 85ff9db2bffd3d2bf119300d9297f1b524608e1b)

Merge pull request #6005 from stangri/openwrt-22.03-luci-app-https-dns-proxy

[22.03] luci-app-https-dns-proxy: update to 2021-11-22-7 (settings for Canary…

luci-app-https-dns-proxy: update to 2021-11-22-7 (settings for Canary Domains)

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 060e671c82f7d9abf3e581347a5162ef8b16f63c)

treewide: Backport and sync translations

Backport translations from master.
Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-app-opkg: relax dependency parsing

Align depdendency parse logic with opkg to properly process certain
malformed dependency specifications. In particular do not require a
depdendency specification to end after the closing paren of a version
constraint and perform non-greedy matching in order to extract the
first version constraint only.

Fixes: #5997
Ref: https://forum.openwrt.org/t/x/138328
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 84ba6a5c36072f74721d535104735757b005c8d6)

luci-mod-system: sshkeys.js: prevent XSS through pubkey comments

Ensure to not display public key comments verbatim in order to prevent
injection of markup.

Reported-by: Eric McDonald <ericmcdonald@protonmail.com>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 944b55738e7f9685865d5298248b7fbd7380749e)

luci-app-adblock: sync with adblock 4.1.4

* removed the unused 'adb_dnsinotify' parameter
* removed the 'adb_maxqueue' parameter,
  the queue size will be automatically set by the number of cpu cores

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit b3e1f956e60244200a1630964e83d33217cf0091)

luci-app-upnp: make nftables compatible

Make luci.upnp rpcd backend plugin compatible with miniupnpd-nftables.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 82eec98944714c2b61f6e54291bc8f22983bb122)