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

51 Commits

Author SHA1 Message Date
mrFq1 7b71475b4c fix: tun dns 2024-09-21 12:23:37 +08:00
mrFq1 988c0cf70d feat: restore proxy 2024-04-23 21:22:29 +08:00
mrFq1 c2bb3f570f feat: meta setting view 2023-10-08 15:36:07 +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 5b8911f942 misc: do swift format 2023-09-05 10:07:46 +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
yicheng 860c1f82b8 feat: reduce exp menu item 2023-07-12 15:09:41 +08:00
yicheng 58dcc9181f feat: add port setting in setting 
# Conflicts:
#	ClashX/AppDelegate.swift
#	ClashX/Base.lproj/Main.storyboard
#	ClashX/General/Managers/Settings.swift
#	ClashX/ViewControllers/Settings/GeneralSettingViewController.swift
#	ClashX/goClash/build.sh
#	ClashX/goClash/main.go
#	ClashX/zh-Hans.lproj/Main.strings
 2023-06-26 16:07:07 +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
yicheng 51053055c9 feat: ssid suspend 2023-05-25 14:26:14 +08:00
mrFq1 6d9f29ff09 Revert "feat: add port setting in setting" 
This reverts commit d3e0f349ff.

# Conflicts:
#	ClashX/AppDelegate.swift
#	ClashX/Base.lproj/Main.storyboard
#	ClashX/goClash/build.sh
#	ClashX/goClash/main.go
 2023-02-20 19:04:49 +08:00
mrFq1 62c4d4b9dd 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/goClash/build.sh
#	ClashX/goClash/build_clash_universal.py
#	ClashX/goClash/go.mod
#	ClashX/goClash/go.sum
#	ClashX/goClash/main.go
#	ClashX/goClash/upgrade_core.py
#	Podfile.lock
 2023-02-20 18:33:01 +08:00
yicheng d3e0f349ff feat: add port setting in setting 2023-02-20 14:18:08 +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 3c86163008 misc: add setting interface 2022-11-20 17:10:26 +08:00
mrFq1 29b7779903 Prepare config file. 2022-07-31 23:48:52 +08:00
mrFq1 6ef8415c94 Status icon. 2022-07-28 13:01:58 +08:00
mrFq1 1a173d8d3f Merge remote-tracking branch 'origin/master' into meta 2022-06-25 11:17:19 +08:00
mrFq1 7827c7068b Delete builtInApiMode. 2022-06-24 21: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 2aebc851e3
fix: async install proxy helper 2020-12-17 09:25:49 +08:00
yicheng c8f594a44a optimize stream api retry logic && format code 
# Conflicts:
#	ClashX/AppDelegate.swift
 2020-07-10 20:01:00 +08:00
yicheng 562546480d add basic ui 
# Conflicts:
#	ClashX/AppDelegate.swift
#	ClashX/zh-Hans.lproj/Main.strings
 2020-07-10 19:58:55 +08:00
yicheng 351641c0ff Add file watch for iCloud 2020-06-02 19:09:30 +08:00
yicheng 0461db847c feat: add basic iCloud support 2020-05-23 21:12:00 +08:00
yicheng e9d351cc45 update default benchMarkUrl 2020-04-11 11:40:05 +08:00
yicheng 98ce79584f add appcenter 2020-03-13 19:33:21 +08:00
yicheng 16232e8140 update core 2020-03-11 13:46:50 +08:00
yicheng d5d94c49ba Optimize menu & formate 2019-11-02 11:55:18 +08:00
yicheng d61a051901 Update naming 2019-11-02 00:04:42 +08:00
yicheng 3bfaa965ba Fix proxy group selection after switching configs 2019-11-01 20:47:55 +08:00
yicheng bf49adeb7f add swift format 2019-10-20 13:40:50 +08:00
yicheng c237580475 Fix group menu item display in 10.14. disable show current proxy in menu by default in 10.14 2019-10-18 20:44:39 -07:00
yicheng 676d00f275 allow set benchmark url 2019-10-17 19:38:04 +08:00
yicheng d3b11984bf add NetworkChangeNotifier back 2019-10-15 22:40:15 +08:00
yicheng bac00153d0 Add btn for use built in api & fix utf-8 encoding issue & translations 2019-10-13 22:42:25 +08:00
yicheng 5138931c04 Revert to use api control when in develop mode 2019-10-09 20:33:57 +08:00
yicheng 5d8f3c5141 remove yams usage 2019-10-02 21:43:18 +08:00
yicheng 5a06c93975 Fix rxswift warning 2019-10-01 16:17:41 +08:00
yicheng 72600745c7 Improve: use websocket instead of stream api 2019-10-01 15:58:43 +08:00
yichengchen f51948b30f Improve: fix config file watcher and remove unused code 2019-07-28 17:37:59 +08:00
yichengchen 4ea006684c Feature: auto remove old error config after upgarde 2019-07-28 11:48:35 +08:00
yicheng 60bfa1cd52 Feature: upgrade clash core and rename all .yml to .yaml 2019-06-29 18:52:05 +08:00
yichengchen cf15f17588 Fix ci release build 2019-05-10 22:12:53 +08:00
yichengchen d75543e02b Feature: Allow show proxy group desicion in first class menuitem 2019-05-10 21:42:43 +08:00
yichengchen d4ed7b2e61 Chore: reduce warning 2019-05-10 20:40:35 +08:00
yicheng 5bb6c5d023 Improve: save remote config file with name of download url host 2019-01-11 16:09:06 +08:00
yicheng 2b21fc6234 Fix: upgrade from ini fail 2018-12-09 22:52:13 +08:00