Skip to content

Commit

Permalink
Merge branch 'master' into openwrt-24.10
Browse files Browse the repository at this point in the history
  • Loading branch information
@systemcrash
systemcrash committed Nov 24, 2024
2 parents 2670fc4 + cb767dc commit 2ce8529
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion applications/luci-app-adblock-fast/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PKG_NAME:=luci-app-adblock-fast
PKG_LICENSE:=AGPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <[email protected]>
PKG_VERSION:=1.1.2
PKG_RELEASE:=10
PKG_RELEASE:=16

LUCI_TITLE:=AdBlock-Fast Web UI
LUCI_URL:=https://github.com/stangri/luci-app-adblock-fast/
Expand Down
2 changes: 1 addition & 1 deletion applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ var status = baseclass.extend({
"Use of external dnsmasq config file detected, please set '%s' option to '%s'"
).format("dns", "dnsmasq.conf"),
warningMissingRecommendedPackages: _(
"Some recommended packages are missing"
"Missing recommended package: '%s'"
),
warningOutdatedLuciPackage: _(
"The WebUI application (luci-app-adblock-fast) is outdated, please update it"
Expand Down
8 changes: 4 additions & 4 deletions applications/luci-app-adblock-fast/po/templates/adblock-fast.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,10 @@ msgstr ""
msgid "Let local devices use their own DNS servers if set"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:201
msgid "Missing recommended package: '%s'"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:524
msgid "Name"
msgstr ""
Expand Down Expand Up @@ -530,10 +534,6 @@ msgstr ""
msgid "Some output"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:201
msgid "Some recommended packages are missing"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:357
msgid "Start"
msgstr ""
Expand Down
2 changes: 1 addition & 1 deletion applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# ubus -S call luci.adblock-fast setInitAction '{"name": "adblock-fast", "action": "pause" }'
# ubus -S call luci.adblock-fast setInitAction '{"name": "adblock-fast", "action": "stop" }'

readonly luciCompat='3'
readonly luciCompat='4'
readonly adbFunctionsFile='/etc/init.d/adblock-fast'
if [ -s "$adbFunctionsFile" ]; then
# shellcheck source=../../../../../adblock-fast/files/etc/init.d/adblock-fast
Expand Down

2 comments on commit 2ce8529

@hnyman
Copy link
Contributor

@hnyman hnyman commented on 2ce8529 Nov 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@systemcrash
Please don't do merges between master and 24.10 branches
As 24.10 and master start to deviate, we need to go into cherry-picking/backporting into 24.10.

@systemcrash
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At what point do we decide they deviate? O do we let that decision be made for us by some commit?

I thought about it before doing a merge commit, but it was the cleanest way to manage both branches in parallel before this "deviation". I'll avoid any future merges, but your fast-forward/rebase method is indeed the cleanest method.

Please sign in to comment.