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

350 Commits

Author SHA1 Message Date
mrFq1 a9d1bd4c26 misc: Mihomo 2023-12-02 20:28:40 +08:00
mrFq1 c2bb3f570f feat: meta setting view 2023-10-08 15:36:07 +08:00
mrFq1 bc0a38c27d fix: LaunchAtLogin 2023-09-25 18:07:17 +08:00
mrFq1 847d3f1d8d fix: remote controller 2023-09-25 15:18:29 +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
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 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 0603074902 misc: sync core between ClashX and ClashXPro 2023-09-05 10:53:22 +08:00
yicheng 5b8911f942 misc: do swift format 2023-09-05 10:07:46 +08:00
yicheng 2dc0f0d4b5 misc: remove swiftui 2023-09-05 09:30:03 +08:00
yicheng 1d2abc3bb1 feat: add update external resources action 2023-09-05 08:34:55 +08:00
mrFq1 6b40b9ad91 misc: geo updater 2023-08-14 21:21:04 +08:00
mrFq1 dddfa3b858 misc: fix merge 2023-08-07 23:57:24 +08:00
mrFq1 9f4ab7ca02 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/Extensions/DateFormatter+.swift
#	ClashX/General/ApiRequest.swift
#	ClashX/General/Managers/ClashResourceManager.swift
#	ClashX/General/Managers/ConfigManager.swift
#	ClashX/General/Managers/MenuItemFactory.swift
#	ClashX/General/Utils/JSBridgeHandler.swift
#	ClashX/Support Files/en.lproj/Localizable.strings
#	ClashX/Support Files/zh-Hans.lproj/Localizable.strings
#	ClashX/Views/ProxyGroupSpeedTestMenuItem.swift
#	ClashX/goClash/go.mod
#	ClashX/goClash/go.sum
#	ClashX/goClash/main.go
#	ClashX/zh-Hans.lproj/Main.strings
#	Podfile.lock
#	fastlane/Fastfile
 2023-08-07 23:24:27 +08:00
mrFq1 228e54358e fix: helper check status 2023-08-07 00:20:25 +08:00
yicheng bbe83be779 fix: crash when sort by network 2023-07-20 08:52:28 +08:00
Yicheng 425044b20d
feat: add new native connection panel (#1181) 
* feat: add base connection window

* feat: listen to clash connection api and get process information

* misc: add top list tableview

* fix: get no-app process

* feat: add status icon

* feat: add detail view

* misc: init left pannel view

* misc: update window background

* feat: support top tableview sort

* feat: support left pannelView search

* feat: update left panel bg color and apply application filter

* feat: add top searchfield

* feat: add host and sourceIp list datasource

* misc: unify window controller

* feat: support speed sort

* misc: add connection translations

* feat: add left pannel view section display.

* misc: Rename ConnectionApplicationClientCellView to ApplicationClientCellView.swift

* feat: Refactor SectionedTableView.swift

* feat: update left panel view

* feat: add right click to close conn

* feat: support sort by host

* feat: add top segment control

* feat: add active connection support

* misc: Rename `ConnectionsLeftPannelView` to `ConnectionLeftPannelView`

* misc: add parent controller for ConnectionsViewController

* misc: update localization

* misc: recover failed request from log to connections

* misc: filter application by path

* misc: swiftlint enable empty_count rule

* feat: add global shortcut for connections

* fix: unknown filter

* feat: add close button

* misc: fix multi selection

* fix: remove force unwarp

* misc: fix beta ci [beta]

---------

Co-authored-by: miniLV <liangyuhangapple@gmail.com>
 2023-07-16 12:16:15 +08:00
yicheng 860c1f82b8 feat: reduce exp menu item 2023-07-12 15:09:41 +08:00
yicheng bb896b79dd misc: revert macOS 14 workaround 2023-07-08 09:31:02 +08:00
mrFq1 5b8fea2d5d Revert "feat: migrated to ~/.config/ClashMeta" 
This reverts commit 9f3bf507b7.
 2023-06-30 15:23:08 +08:00
mrFq1 0e23ab8b04 misc: update tips 2023-06-30 13:36:45 +08:00
mrFq1 9f3bf507b7 feat: migrated to ~/.config/ClashMeta 2023-06-30 13:36:27 +08:00
mrFq1 be531ac033 Merge remote-tracking branch 'origin/master' into meta-dev 
# Conflicts:
#	ClashX.xcodeproj/project.pbxproj
#	ClashX/Vendor/Safe/NSMutableArray+Safe.m
 2023-06-25 22:37:49 +08:00
yicheng 8807dacab3 fix: try fix macos14 issue 2023-06-25 21:09:25 +08:00
mrFq1 4457c3e750 misc: ignore ports check 2023-06-25 12:15:43 +08:00
mrFq1 bf45240159 Merge remote-tracking branch 'origin/master' into meta-dev 
# Conflicts:
#	.github/workflows/main.yml
#	ClashX.xcodeproj/project.pbxproj
#	ClashX/AppDelegate.swift
#	ClashX/Base.lproj/Main.storyboard
#	ClashX/General/Managers/AutoUpgardeManager.swift
#	ClashX/Resources/sampleConfig.yaml
#	ClashX/ViewControllers/ClashWebViewContoller.swift
#	ClashX/ViewControllers/Settings/GlobalShortCutViewController.swift
#	ClashX/goClash/go.mod
#	ClashX/goClash/go.sum
#	ClashX/goClash/main.go
#	Gemfile.lock
#	Podfile
#	Podfile.lock
#	fastlane/Fastfile
#	fastlane/README.md
#	install_dependency.sh
 2023-06-25 11:48:25 +08:00
yicheng b28af782bb misc: add reset userdefault entry 2023-06-15 14:24:00 +08:00
yicheng 8d586f3ae6 misc: update logger to log called function and update sample config 2023-06-15 14:10:15 +08:00
yicheng cf2008a265 misc: disable dashboard in macos 10.14 due to webkit support 2023-06-14 13:40:35 +08:00
miniLV dabbb5bb95
misc: upgrade Sparkle version to 2.0 (#1162) 
* misc: upgrade Sparkle version to 2.0

* ci: fix ci on pull request

* misc: remove sparkle codesign script and optimize github action script add export step

* misc: fix checkForUpdates don't work issue

* misc: Using `SPUStandardUpdaterController.checkForUpdates(_:)` replace `ontroller?.checkForUpdates(_:)`

* misc: Since SUUpdater is init by code, remove this judge ment

* misc: move judgement

---------

Co-authored-by: yicheng <11733500+yichengchen@users.noreply.github.com>
 2023-06-14 13:37:53 +08:00
yicheng 209c1db1fa misc: enable swiftlint 2023-06-14 11:34:08 +08:00
mrFq1 23060aa0f5 misc: helper log 2023-06-13 14:46:41 +08:00
mrFq1 9e094e8c1f feat: useYacdDashboardMenuItem 
(cherry picked from commit f5fe33cd285d846d068d3c2a2bb4b8982401aaea)
 2023-06-13 14:13:11 +08:00
yicheng c3f4e15a60 feat: add default api password [appcenter] [notarize] 2023-06-12 17:06:33 +08:00
mrFq1 282e2bffa6 feat: tun global short cut 
(cherry picked from commit b972aad0481784bf796e6d629c986c1f3f519de8)
 2023-06-09 19:47:32 +08:00
mrFq1 58b28b6837 misc: helper retry time 2023-06-09 19:47:26 +08:00
mrFq1 a35a3205ad Merge remote-tracking branch 'origin/master' into meta-dev 
# Conflicts:
#	ClashX.xcodeproj/project.pbxproj
#	ClashX/AppDelegate.swift
#	ClashX/Base.lproj/Main.storyboard
#	ClashX/General/Managers/Settings.swift
#	ClashX/Support Files/en.lproj/Localizable.strings
#	ClashX/Support Files/zh-Hans.lproj/Localizable.strings
#	ClashX/ViewControllers/Settings/GeneralSettingViewController.swift
#	ClashX/goClash/go.mod
#	ClashX/goClash/go.sum
#	ClashX/zh-Hans.lproj/Main.strings
#	Podfile.lock
#	README.md
 2023-06-07 00:10:12 +08:00
mrFq1 343c87dd86 feat: clashx swiftui project 2023-06-05 21:53:53 +08:00
yicheng 2dc1003f36 feat: support global shortcut 2023-05-26 15:59:06 +08:00
yicheng 1c7bebae71 feat: add switcher for swiftui menu bar 2023-05-25 14:27:56 +08:00
yicheng 51053055c9 feat: ssid suspend 2023-05-25 14:26:14 +08:00
mrFq1 2797dd8313 fix: helper not found 2023-04-28 22:54:15 +08:00
mrFq1 b963eb6248 misc: core logger 2023-04-01 22:13:59 +08:00
mrFq1 5223994b6d misc: fix alpha version 2023-04-01 21:13:42 +08:00
mrFq1 360e1ce09f chore: AlphaMetaDownloader 2023-04-01 15:23:13 +08:00
mrFq1 1b064f40c7 misc: fix core date 2023-04-01 13:52:11 +08:00
mrFq1 11496a80db misc: fix alpha downloader 
(cherry picked from commit 33fe7ed2d6d15c9127cfd778318cf7b34a3f50a8)
 2023-04-01 13:42:12 +08:00