MetaCubeX
/
ClashX.Meta
mirror of https://github.com/MetaCubeX/ClashX.Meta
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,325 Commits 7 Branches 55 Tags 1.8 GiB
Commit Graph

1325 Commits

Author SHA1 Message Date
mrFq1 6e66c63c10 misc: merge 2023-11-02 16:06:11 +08:00
mrFq1 710f0c5e6b Merge remote-tracking branch 'origin/master' into meta-dev 
# Conflicts:
#	ClashX.xcodeproj/project.pbxproj
#	ClashX/General/Utils/JSBridgeHandler.swift
#	ClashX/Models/ClashProxy.swift
#	ClashX/Support Files/en.lproj/Localizable.strings
#	ClashX/Support Files/zh-Hans.lproj/Localizable.strings
#	ClashX/ViewControllers/ClashWebViewContoller.swift
#	ClashX/ViewControllers/Connections/Views/Cell/ConnectionTextCellView.swift
#	ClashX/goClash/go.mod
#	ClashX/goClash/go.sum
#	Gemfile
#	Gemfile.lock
#	Podfile
#	Podfile.lock
 2023-11-02 15:59:10 +08:00
yicheng 498c6d79b8 misc: sometimes dashboard won't popup to front, recall activate command 2023-10-18 11:28:00 +08:00
yicheng b3234a4cc7 fix: macos 14 connection dashboard overlap issue 2023-10-18 11:12:22 +08:00
yicheng e5b191c9e7 feat: mark proxy group speedtestable 2023-10-17 14:16:29 +08:00
yicheng 233bc80b39 misc: update deps 2023-10-16 15:59:30 +08:00
yicheng 1528477fb1 feat: use custom jsbridge, remove WebViewJavascriptBridge for xcode 15 issue 2023-10-16 15:53:25 +08:00
yicheng 6a2b7274de fix: should request location permission on macOS14 2023-10-14 19:33:05 +08:00
mrFq1 68b950ccee Merge branch 'meta-dev' into meta 2023-10-08 16:02:22 +08:00
mrFq1 df1ff5049f misc: restart tips 2023-10-08 15:57:14 +08:00
mrFq1 c2bb3f570f feat: meta setting view 2023-10-08 15:36:07 +08:00
mrFq1 d938c62c40 misc: builds 2023-10-07 17:04:21 +08:00
mrFq1 f497008435 misc: fix ci 2023-10-07 16:50:23 +08:00
mrFq1 6b0da117b0 misc: swiftui target 2023-10-07 16:11:37 +08:00
mrFq1 bc0a38c27d fix: LaunchAtLogin 2023-09-25 18:07:17 +08:00
mrFq1 a853766150 Merge branch 'meta-dev' into meta 2023-09-25 15:40:19 +08:00
mrFq1 f5f42ea2a9 misc: disable Built-in clash api button 2023-09-25 15:32:12 +08:00
mrFq1 847d3f1d8d fix: remote controller 2023-09-25 15:18:29 +08:00
mrFq1 69e40fe5e4 revert: log msg 2023-09-25 14:48:00 +08:00
mrFq1 833da04223 misc: spm 2023-09-25 14:46:16 +08:00
mrFq1 81667306de misc: sync files 2023-09-25 14:34:56 +08:00
mrFq1 1ff880abfe misc: bump v1.16.0 2023-09-25 14:25:15 +08:00
mrFq1 c868261954 misc: fix merge 2023-09-25 14:23:43 +08:00
mrFq1 6c5b6847bc Merge remote-tracking branch 'origin/master' into meta-dev 
# Conflicts:
#	.github/workflows/main.yml
#	ClashX.xcodeproj/project.pbxproj
#	ClashX.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	ClashX/AppDelegate.swift
#	ClashX/Base.lproj/Main.storyboard
#	ClashX/General/ApiRequest.swift
#	ClashX/General/Managers/AutoUpgardeManager.swift
#	ClashX/General/Managers/ClashResourceManager.swift
#	ClashX/General/Managers/ConfigManager.swift
#	ClashX/General/Managers/PrivilegedHelperManager.swift
#	ClashX/General/Utils/JSBridgeHandler.swift
#	ClashX/Macro/Paths.swift
#	ClashX/Models/ClashProxy.swift
#	ClashX/Support Files/en.lproj/Localizable.strings
#	ClashX/Support Files/zh-Hans.lproj/Localizable.strings
#	ClashX/ViewControllers/ClashWebViewContoller.swift
#	ClashX/ViewControllers/Connections/ConnectionsViewController.swift
#	ClashX/ViewControllers/Connections/DashboardSubViewControllerProtocol.swift
#	ClashX/ViewControllers/Connections/DashboardViewController.swift
#	ClashX/ViewControllers/Connections/Requests/ConnectionsReq.swift
#	ClashX/ViewControllers/Connections/Requests/StructedLogReq.swift
#	ClashX/ViewControllers/Connections/ViewModels/ConnectionDetailViewModel.swift
#	ClashX/ViewControllers/Connections/ViewModels/ConnectionLeftPannelViewModel.swift
#	ClashX/ViewControllers/Connections/ViewModels/ConnectionTopListViewModel.swift
#	ClashX/ViewControllers/Connections/ViewModels/ConnectionsViewModel.swift
#	ClashX/ViewControllers/Connections/Views/Cell/ConnectionCellProtocol.swift
#	ClashX/ViewControllers/Connections/Views/Cell/ConnectionLeftTextCellView.swift
#	ClashX/ViewControllers/Connections/Views/Cell/ConnectionProxyClientCellView.swift
#	ClashX/ViewControllers/Connections/Views/Cell/ConnectionStatusIconCellView.swift
#	ClashX/ViewControllers/Connections/Views/Cell/ConnectionTextCellView.swift
#	ClashX/ViewControllers/Connections/Views/ConnectionColume.swift
#	ClashX/ViewControllers/Connections/Views/ConnectionDetailInfoGeneralView.swift
#	ClashX/ViewControllers/Connections/Views/ConnectionDetailInfoView.swift
#	ClashX/ViewControllers/Connections/Views/ConnectionLeftPannelView.swift
#	ClashX/ViewControllers/Connections/Views/ConnectionTopListView.swift
#	ClashX/ViewControllers/Connections/Views/SectionedTableView.swift
#	ClashX/ViewControllers/Settings/DebugSettingViewController.swift
#	ClashX/ViewControllers/Settings/GlobalShortCutViewController.swift
#	ClashX/Views/StatusItem/StatusItemTool.swift
#	ClashX/Views/StatusItem/StatusItemView.swift
#	ClashX/Views/StatusItem/StatusItemView.xib
#	ClashX/goClash/go.mod
#	ClashX/goClash/go.sum
#	ClashX/goClash/main.go
#	ClashX/zh-Hans.lproj/Main.strings
#	Podfile
#	Podfile.lock
 2023-09-24 19:22:08 +08:00
mrFq1 7c8eab8046 Merge branch 'meta-dev' into meta 2023-09-21 11:38:58 +08:00
mrFq1 879a8c2f3a misc: SPM 2023-09-21 11:35:21 +08:00
mrFq1 9cc114b646 misc: add hy2 type 2023-09-21 11:35:13 +08:00
yicheng ec117e5055 fix: disable menu width limit on macOS 14, preventing display issue 2023-09-09 15:03:19 +08:00
yicheng e98a6c3104 feat: add DiagnosticReports folder open button in debug view controller 2023-09-06 11:04:01 +08:00
yicheng 61582e3f80 feat: allow edit config file directly when reload with an error 2023-09-05 22:01:05 +08:00
yicheng a8d6f53ca7 feat: show alert when user try to quit clashx with active window displaying 2023-09-05 21:19:08 +08:00
yicheng 6e40d06df3 fix: setting shortcut page layout conflict 2023-09-05 19:25:57 +08:00
yicheng 73362acd75 fix status menu display color issue 2023-09-05 19:25:28 +08:00
yicheng 3d210e3f0b misc: add ipv6 enable button 2023-09-05 19:25:04 +08:00
yicheng 38341d7fda fix: status menu color on startup 2023-09-05 15:11:04 +08:00
yicheng 0603074902 misc: sync core between ClashX and ClashXPro 2023-09-05 10:53:22 +08:00
yicheng 87c42602d9 fix: update usage of DDLog 2023-09-05 10:15:23 +08:00
yicheng 5b8911f942 misc: do swift format 2023-09-05 10:07:46 +08:00
yicheng 14f1f38b69 misc: add swift format config 2023-09-05 10:07:34 +08:00
yicheng 4df2c0bec6 misc: sync core between ClashX and ClashXPro 2023-09-05 09:46:04 +08:00
yicheng 35fd4716bc misc: update packages 2023-09-05 09:35:31 +08:00
yicheng 2dc0f0d4b5 misc: remove swiftui 2023-09-05 09:30:03 +08:00
yicheng a8e1df6cf4 misc: update setting icon config on os below 10.11 2023-09-05 09:29:14 +08:00
yicheng 1d2abc3bb1 feat: add update external resources action 2023-09-05 08:34:55 +08:00
yicheng 6cf0b5e424 ci: update go version 2023-09-04 16:47:14 +08:00
yicheng 8346f2aeba misc: update core 2023-09-04 16:45:49 +08:00
yicheng d1c69185d7 misc: add vless enum 2023-08-24 16:14:36 +08:00
mrFq1 ee461dceb3 misc: about infos 2023-08-15 11:09:00 +08:00
mrFq1 aa7feaa749 Merge branch 'meta-dev' into meta 2023-08-14 21:22:08 +08:00
mrFq1 94e666b625 misc: SPM 2023-08-14 21:21:12 +08:00