Commit Graph

20 Commits

Author SHA1 Message Date
mrFq1 fe814bf803 Merge remote-tracking branch 'origin/master' into meta-dev
# Conflicts:
#	.github/workflows/main.yml
#	ClashX.xcodeproj/project.pbxproj
#	ClashX/goClash/go.mod
#	ClashX/goClash/go.sum
2023-04-28 18:14:43 +08:00
yicheng dd5143bea8 fix: temp remove swiftlint for ci fail 2023-04-26 14:14:19 +08:00
mrFq1 251504887a Merge remote-tracking branch 'origin/master' into meta-dev
# Conflicts:
#	ClashX/goClash/go.mod
#	ClashX/goClash/go.sum
2022-11-30 12:50:47 +08:00
yicheng d1fb0d6315 feat: check require approve only when no found helper 2022-11-28 18:38:51 +08:00
yichengchen 08f2b1120c feat: support remove helper 2022-11-28 18:38:51 +08:00
yicheng d4a5c58a1b misc: allow continue if SMAppService.statusForLegacyPlist return .requiresApproval 2022-11-28 18:38:51 +08:00
mrFq1 aa536d01aa Merge remote-tracking branch 'origin/master' into meta-dev
# Conflicts:
#	.github/workflows/main.yml
#	.gitignore
#	ClashX.xcodeproj/project.pbxproj
#	ClashX/AppDelegate.swift
#	ClashX/Base.lproj/Main.storyboard
#	ClashX/General/ApiRequest.swift
#	ClashX/Support Files/en.lproj/Localizable.strings
#	ClashX/Support Files/zh-Hans.lproj/Localizable.strings
#	ClashX/goClash/go.mod
#	ClashX/goClash/go.sum
#	ClashX/goClash/main.go
#	ClashX/zh-Hans.lproj/Main.strings
#	Podfile
#	Podfile.lock
#	ProxyConfigHelper/Helper-Info.plist
#	README.md
2022-11-27 12:08:04 +08:00
yicheng cca41bbaed misc: disable old daemon when update 2022-11-23 21:37:31 +08:00
yicheng 43b88c6286 feat: show alert if user disable daemon permission on macos13 2022-11-20 17:10:26 +08:00
mrFq1 e3794539a4 Auto fix. 2022-07-26 09:14:58 +08:00
mrFq1 fae608101b Install helper only legacy. 2022-07-03 19:35:09 +08:00
mrFq1 1a173d8d3f Merge remote-tracking branch 'origin/master' into meta 2022-06-25 11:17:19 +08:00
yicheng c6c74dd888 misc: swift lint
# Conflicts:
#	ClashX.xcodeproj/project.pbxproj
#	ClashX/General/ApiRequest.swift
#	ClashX/General/Managers/ProManager.swift
#	ClashX/General/Managers/Settings.swift
#	ClashX/General/Managers/TunManager.swift
#	ClashX/General/Utils/NetworkChangeNotifier.swift
#	ClashX/ViewControllers/ClashWebViewContoller.swift
2022-06-20 21:03:12 +08:00
yicheng 91a02b020e misc: simplify proxy helper creation 2022-06-20 21:01:19 +08:00
mrFq1 4bcbb467c6 Update meta helper identifier. 2022-06-15 22:20:36 +08:00
mrFq1 6d27835bfb useLegacyInstall. 2022-06-14 22:12:53 +08:00
Kid f46d743401 Fix typos 2021-04-01 20:09:21 +08:00
yicheng 2aebc851e3
fix: async install proxy helper 2020-12-17 09:25:49 +08:00
yicheng aeef5261dd feature: local auth & backup way to install proxy helper 2020-04-22 18:25:20 +08:00
yicheng 60691df9c3 chore: split PrivilegedHelper 2020-04-22 00:03:47 +08:00