From 1b3febe40eb3bf64f8668bf218b02cf0282017bd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 7 Mar 2026 23:37:46 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20Sync=202026-03-07=2023:37:46?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- filebrowser/Makefile | 2 +- luci-app-taskplan/Makefile | 2 +- .../luci-static/resources/view/taskplan/scheduled.js | 1 - .../htdocs/luci-static/resources/view/taskplan/startup.js | 1 - luci-app-taskplan/po/zh_Hans/taskplan.po | 1 - .../root/usr/share/luci/menu.d/luci-app-taskplan.json | 7 +++++++ 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/filebrowser/Makefile b/filebrowser/Makefile index 2e39bb4b6..73db0e1a9 100644 --- a/filebrowser/Makefile +++ b/filebrowser/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=filebrowser -PKG_VERSION:=1.2.1-stable +PKG_VERSION:=1.2.2-stable PKG_RELEASE=1 ifeq ($(ARCH),aarch64) diff --git a/luci-app-taskplan/Makefile b/luci-app-taskplan/Makefile index f36706f2f..9d1c7cf8b 100644 --- a/luci-app-taskplan/Makefile +++ b/luci-app-taskplan/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-taskplan PKG_VERSION:=3.0.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0 diff --git a/luci-app-taskplan/htdocs/luci-static/resources/view/taskplan/scheduled.js b/luci-app-taskplan/htdocs/luci-static/resources/view/taskplan/scheduled.js index 0bf415e65..fe36ab103 100644 --- a/luci-app-taskplan/htdocs/luci-static/resources/view/taskplan/scheduled.js +++ b/luci-app-taskplan/htdocs/luci-static/resources/view/taskplan/scheduled.js @@ -44,7 +44,6 @@ return view.extend({ ss.template = 'cbi/tblsection'; var remarks = ss.option(form.Value, 'remarks', _('Remarks')); - remarks.description = _('Task description'); remarks.optional = false; var enable = ss.option(form.Flag, 'enable', _('Enable')); diff --git a/luci-app-taskplan/htdocs/luci-static/resources/view/taskplan/startup.js b/luci-app-taskplan/htdocs/luci-static/resources/view/taskplan/startup.js index b91950670..b85b309fe 100644 --- a/luci-app-taskplan/htdocs/luci-static/resources/view/taskplan/startup.js +++ b/luci-app-taskplan/htdocs/luci-static/resources/view/taskplan/startup.js @@ -44,7 +44,6 @@ return view.extend({ ls.template = 'cbi/tblsection'; var remarks = ls.option(form.Value, 'remarks', _('Remarks')); - remarks.description = _('Task description'); remarks.optional = false; var enable = ls.option(form.Flag, 'enable', _('Enable')); diff --git a/luci-app-taskplan/po/zh_Hans/taskplan.po b/luci-app-taskplan/po/zh_Hans/taskplan.po index d7542faf1..db6eb3e90 100644 --- a/luci-app-taskplan/po/zh_Hans/taskplan.po +++ b/luci-app-taskplan/po/zh_Hans/taskplan.po @@ -10,7 +10,6 @@ msgstr "" "Language: zh_Hans\n" "Content-Type: text/plain; charset=UTF-8\n" - msgid "Control" msgstr "管控" diff --git a/luci-app-taskplan/root/usr/share/luci/menu.d/luci-app-taskplan.json b/luci-app-taskplan/root/usr/share/luci/menu.d/luci-app-taskplan.json index 2d6110f55..c0b8c3a27 100644 --- a/luci-app-taskplan/root/usr/share/luci/menu.d/luci-app-taskplan.json +++ b/luci-app-taskplan/root/usr/share/luci/menu.d/luci-app-taskplan.json @@ -1,4 +1,11 @@ { + "admin/control": { + "title": "Control", + "order": 44, + "action": { + "type": "firstchild" + } + }, "admin/control/taskplan": { "title": "Task Plan", "order": 60,