From d2ce0a2470b6b2c9bc52b9fa453d793c9f9f09db Mon Sep 17 00:00:00 2001 From: icret Date: Sat, 12 Mar 2022 14:19:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E5=AD=97=E6=B0=B4?= =?UTF-8?q?=E5=8D=B0=E9=80=8F=E6=98=8E=E5=BA=A6=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + admin/admin.inc.php | 20 ++++++++++++++++++-- application/WaterMask.php | 3 ++- application/process.php | 2 +- config/config.php | 6 +++--- public/static/jscolor/jscolor.js | 2 -- public/static/jscolor/jscolor.min.js | 1 + 7 files changed, 26 insertions(+), 9 deletions(-) delete mode 100755 public/static/jscolor/jscolor.js create mode 100755 public/static/jscolor/jscolor.min.js diff --git a/README.md b/README.md index 0e47cd0..d62bff7 100755 --- a/README.md +++ b/README.md @@ -107,6 +107,7 @@ $HTTP["url"] =~ "^/(i|public)/" { * 2022-3-10 v2.5.6 dev - 修复加密删除后不能正确提示 - 修复webp转换其他格式失败 +- 修复文字水印透明度不生效 * 2022-3-4 v2.5.5 - 增加设置页面检测是否开启登录上传 diff --git a/admin/admin.inc.php b/admin/admin.inc.php index 0e10470..441cc2b 100755 --- a/admin/admin.inc.php +++ b/admin/admin.inc.php @@ -329,7 +329,7 @@ if (isset($_GET['recycle_reimg'])) {
- +
@@ -988,13 +988,29 @@ if (isset($_GET['recycle_reimg'])) {
- +