diff --git a/luci-app-quickfile/Makefile b/luci-app-quickfile/Makefile index 61c820ae..a0fcb23b 100644 --- a/luci-app-quickfile/Makefile +++ b/luci-app-quickfile/Makefile @@ -7,7 +7,7 @@ LUCI_DEPENDS:=+luci-nginx +quickfile PKG_LICENSE:=Apache-2.0 PKG_VERSION:=1.0.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=sbwml include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-quickfile/root/etc/uci-defaults/luci-quickfile b/luci-app-quickfile/root/etc/uci-defaults/luci-quickfile new file mode 100644 index 00000000..8420216d --- /dev/null +++ b/luci-app-quickfile/root/etc/uci-defaults/luci-quickfile @@ -0,0 +1,3 @@ +#!/bin/sh + +/etc/init.d/nginx restart diff --git a/luci-theme-aurora/.dev/public/aurora/images/pwa/app-icon-192x192.png b/luci-theme-aurora/.dev/public/aurora/images/app-icon-192x192.png similarity index 100% rename from luci-theme-aurora/.dev/public/aurora/images/pwa/app-icon-192x192.png rename to luci-theme-aurora/.dev/public/aurora/images/app-icon-192x192.png diff --git a/luci-theme-aurora/.dev/public/aurora/images/pwa/app-icon-512x512.png b/luci-theme-aurora/.dev/public/aurora/images/app-icon-512x512.png similarity index 100% rename from luci-theme-aurora/.dev/public/aurora/images/pwa/app-icon-512x512.png rename to luci-theme-aurora/.dev/public/aurora/images/app-icon-512x512.png diff --git a/luci-theme-aurora/.dev/public/aurora/images/pwa/app.webmanifest b/luci-theme-aurora/.dev/public/aurora/images/app.webmanifest similarity index 100% rename from luci-theme-aurora/.dev/public/aurora/images/pwa/app.webmanifest rename to luci-theme-aurora/.dev/public/aurora/images/app.webmanifest diff --git a/luci-theme-aurora/.dev/public/aurora/images/pwa/apple-touch-icon.png b/luci-theme-aurora/.dev/public/aurora/images/apple-touch-icon.png similarity index 100% rename from luci-theme-aurora/.dev/public/aurora/images/pwa/apple-touch-icon.png rename to luci-theme-aurora/.dev/public/aurora/images/apple-touch-icon.png diff --git a/luci-theme-aurora/.dev/public/aurora/images/favicon-16x16.png b/luci-theme-aurora/.dev/public/aurora/images/favicon-16x16.png deleted file mode 100644 index 6b7e867f..00000000 Binary files a/luci-theme-aurora/.dev/public/aurora/images/favicon-16x16.png and /dev/null differ diff --git a/luci-theme-aurora/.dev/public/aurora/images/favicon-32x32.png b/luci-theme-aurora/.dev/public/aurora/images/favicon-32x32.png deleted file mode 100644 index 759b8b87..00000000 Binary files a/luci-theme-aurora/.dev/public/aurora/images/favicon-32x32.png and /dev/null differ diff --git a/luci-theme-aurora/.dev/public/aurora/images/logo_32.png b/luci-theme-aurora/.dev/public/aurora/images/logo_32.png deleted file mode 100644 index 2fe04a02..00000000 Binary files a/luci-theme-aurora/.dev/public/aurora/images/logo_32.png and /dev/null differ diff --git a/luci-theme-aurora/Makefile b/luci-theme-aurora/Makefile index 86a413b7..020c7d8b 100644 --- a/luci-theme-aurora/Makefile +++ b/luci-theme-aurora/Makefile @@ -9,7 +9,7 @@ LUCI_TITLE:=Aurora Theme (A modern browser theme built with Vite and Tailwind CS LUCI_DEPENDS:=+luci-base PKG_VERSION:=0.11.11 -PKG_RELEASE:=14 +PKG_RELEASE:=15 PKG_LICENSE:=Apache-2.0 LUCI_MINIFY_CSS:= diff --git a/luci-theme-aurora/htdocs/luci-static/aurora/images/pwa/app-icon-192x192.png b/luci-theme-aurora/htdocs/luci-static/aurora/images/app-icon-192x192.png similarity index 100% rename from luci-theme-aurora/htdocs/luci-static/aurora/images/pwa/app-icon-192x192.png rename to luci-theme-aurora/htdocs/luci-static/aurora/images/app-icon-192x192.png diff --git a/luci-theme-aurora/htdocs/luci-static/aurora/images/pwa/app-icon-512x512.png b/luci-theme-aurora/htdocs/luci-static/aurora/images/app-icon-512x512.png similarity index 100% rename from luci-theme-aurora/htdocs/luci-static/aurora/images/pwa/app-icon-512x512.png rename to luci-theme-aurora/htdocs/luci-static/aurora/images/app-icon-512x512.png diff --git a/luci-theme-aurora/htdocs/luci-static/aurora/images/pwa/app.webmanifest b/luci-theme-aurora/htdocs/luci-static/aurora/images/app.webmanifest similarity index 100% rename from luci-theme-aurora/htdocs/luci-static/aurora/images/pwa/app.webmanifest rename to luci-theme-aurora/htdocs/luci-static/aurora/images/app.webmanifest diff --git a/luci-theme-aurora/htdocs/luci-static/aurora/images/pwa/apple-touch-icon.png b/luci-theme-aurora/htdocs/luci-static/aurora/images/apple-touch-icon.png similarity index 100% rename from luci-theme-aurora/htdocs/luci-static/aurora/images/pwa/apple-touch-icon.png rename to luci-theme-aurora/htdocs/luci-static/aurora/images/apple-touch-icon.png diff --git a/luci-theme-aurora/htdocs/luci-static/aurora/images/favicon-16x16.png b/luci-theme-aurora/htdocs/luci-static/aurora/images/favicon-16x16.png deleted file mode 100644 index 6b7e867f..00000000 Binary files a/luci-theme-aurora/htdocs/luci-static/aurora/images/favicon-16x16.png and /dev/null differ diff --git a/luci-theme-aurora/htdocs/luci-static/aurora/images/favicon-32x32.png b/luci-theme-aurora/htdocs/luci-static/aurora/images/favicon-32x32.png deleted file mode 100644 index 759b8b87..00000000 Binary files a/luci-theme-aurora/htdocs/luci-static/aurora/images/favicon-32x32.png and /dev/null differ diff --git a/luci-theme-aurora/htdocs/luci-static/aurora/images/logo_32.png b/luci-theme-aurora/htdocs/luci-static/aurora/images/logo_32.png deleted file mode 100644 index 2fe04a02..00000000 Binary files a/luci-theme-aurora/htdocs/luci-static/aurora/images/logo_32.png and /dev/null differ diff --git a/luci-theme-aurora/ucode/template/themes/aurora/header.ut b/luci-theme-aurora/ucode/template/themes/aurora/header.ut index b501a8ab..c8195598 100644 --- a/luci-theme-aurora/ucode/template/themes/aurora/header.ut +++ b/luci-theme-aurora/ucode/template/themes/aurora/header.ut @@ -20,6 +20,9 @@ const toolbar_enabled = tokens.toolbar_enabled ? tokens.toolbar_enabled == '1' : true; const icon_cache_version = tokens.icon_cache_version || '0'; const logo_svg = tokens.logo_svg || 'logo.svg'; + const favicon_png = tokens.favicon_png || ''; + const favicon_ico = tokens.favicon_ico || 'favicon.ico'; + const pwa_apple_touch = tokens.pwa_apple_touch || 'apple-touch-icon.png'; let toolbar_items = [ { url: '/cgi-bin/luci/admin/status/overview', icon: 'overview.svg', title: 'Overview' }, @@ -127,9 +130,12 @@ {% endif %} - - - + {% if (favicon_png): %} + + {% endif %} + + + diff --git a/torrserver/Makefile b/torrserver/Makefile index 4a4a1231..8721b5d4 100644 --- a/torrserver/Makefile +++ b/torrserver/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=torrserver -PKG_VERSION:=MatriX.141.2 -PKG_RELEASE:=3 +PKG_VERSION:=MatriX.141.3 +PKG_RELEASE:=4 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/YouROK/TorrServer.git -PKG_SOURCE_VERSION:=a104f57a5aafa4eea3d1eea38f20fe7a4fddef74 +PKG_SOURCE_VERSION:=4e46af97e699b2a32ac664c30ee749eea383ca54 PKG_MIRROR_HASH:=skip PKG_MAINTAINER:=Konstantine Shevlakov