From a1f9c3ff08d55ed96d5e93a83c55461d250298ee Mon Sep 17 00:00:00 2001 From: Student Main Date: Wed, 21 Oct 2020 17:17:04 +0000 Subject: [PATCH 1/2] Update abp.js --- shadowsocks-csharp/Data/abp.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shadowsocks-csharp/Data/abp.js b/shadowsocks-csharp/Data/abp.js index 1d5bcdcf..432a6385 100644 --- a/shadowsocks-csharp/Data/abp.js +++ b/shadowsocks-csharp/Data/abp.js @@ -10,15 +10,16 @@ var userrules = []; var rules = []; // convert to abp grammar +var re = /^(@@)?\|\|.*?[^\^]$/; for (var i = 0; i < __RULES__.length; i++) { var s = __RULES__[i]; - if (s.substring(0, 2) == "||") s += "^"; + if (s.match(re)) s += "^"; rules.push(s); } for (var i = 0; i < __USERRULES__.length; i++) { var s = __USERRULES__[i]; - if (s.substring(0, 2) == "||") s += "^"; + if (s.match(re)) s += "^"; userrules.push(s); } From b2b19fe92de87060141108b578ccb74b7770f4d2 Mon Sep 17 00:00:00 2001 From: database64128 Date: Sun, 25 Oct 2020 14:33:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=86=99=20Update=20docs=20and=20bump?= =?UTF-8?q?=20version=20to=204.3.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES | 6 ++++++ appveyor.yml | 2 +- shadowsocks-csharp/Controller/Service/UpdateChecker.cs | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 1ad329a5..59a3741b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +4.3.1.0 2020-10-25 +- Update abp.js (#2999) +- Separate QR code scanning from MenuViewController (#2995) +- Remove statistics strategy (#2994) +- Other minor bug fixes and improvements + 4.3.0.0 2020-10-19 - Cleanup and update dependencies (#2983) - Geosite group validation + PAC regeneration on version update (#2988) diff --git a/appveyor.yml b/appveyor.yml index 04d25c38..dca480c5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ # version format # Build version format is taken from UI if it is not set -# version: 1.0.{build} +version: 4.3.1.{build} # # branches to build # branches: diff --git a/shadowsocks-csharp/Controller/Service/UpdateChecker.cs b/shadowsocks-csharp/Controller/Service/UpdateChecker.cs index 977ad65e..9cdac0de 100644 --- a/shadowsocks-csharp/Controller/Service/UpdateChecker.cs +++ b/shadowsocks-csharp/Controller/Service/UpdateChecker.cs @@ -33,7 +33,7 @@ namespace Shadowsocks.Controller public event EventHandler CheckUpdateCompleted; - public const string Version = "4.3.0.0"; + public const string Version = "4.3.1.0"; private readonly Version _version; public UpdateChecker()