Commit Graph

1325 Commits

Author SHA1 Message Date
mrFq1 4457c3e750 misc: ignore ports check 2023-06-25 12:15:43 +08:00
mrFq1 8b95cce203 misc: update dashboard 2023-06-25 12:05:21 +08:00
mrFq1 a70537e411 misc: merge issues 2023-06-25 12:04:55 +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 0ddaf67048 fix: temp fix macos 14 beta2 crash issue 2023-06-25 08:35:41 +08:00
mrFq1 fba1c7d6ea chore: ClashProxyType ignore case 2023-06-19 15:02:10 +08:00
yicheng 4ab50589cf feat: update core, support alive api 2023-06-17 12:51:26 +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 008c92e9c1 fix: delete webview cache when version update, remove git dir in dashboard folder, add more log in dashboard window 2023-06-15 14:08:45 +08:00
yicheng 69a5db7a2c misc: update core 2023-06-14 14:52:10 +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
mrFq1 ec304e7b56 Merge remote-tracking branch 'origin/fix/mac-os-14-issue' into meta-dev
# Conflicts:
#	Podfile
#	Podfile.lock
2023-06-14 11:47:22 +08:00
yicheng f266dbf8b7 misc: swiftlint auto fix 2023-06-14 11:34:08 +08:00
yicheng 209c1db1fa misc: enable swiftlint 2023-06-14 11:34:08 +08:00
yicheng fbe0fc4c99 feat: add open config file in settings 2023-06-14 10:57:07 +08:00
yicheng d1fb3ffab5 misc: fix localization 2023-06-14 10:42:04 +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
mrFq1 c6a4f425d7 feat: yacd switcher 2023-06-12 23:44:34 +08:00
yicheng c3f4e15a60 feat: add default api password [appcenter] [notarize] 2023-06-12 17:06:33 +08:00
yicheng 2e012da813 misc: add zh-hant 2023-06-12 17:01:24 +08:00
mrFq1 e4115c55f9 misc: disable port settings 2023-06-09 19:53:29 +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
yicheng 34f9a16aca fix: menu selecting state not update in time in mac os 14 2023-06-09 15:24:24 +08:00
mrFq1 1ecd53fae2 misc: sync code to swiftui 2023-06-09 13:59:11 +08:00
mrFq1 d26601e9fa
Merge pull request #10 from hbsgithub/meta-dev
fix support for shortcuts and add support to toggle tun mode in shortcuts
2023-06-09 13:32:25 +08:00
HB 0ccb07de3b
Merge branch 'meta' into meta-dev 2023-06-07 17:28:33 +08:00
hbsgithub af33ded690 update 2023-06-07 17:19:48 +08:00
mrFq1 f5f425a102 Merge branch 'meta-dev' into meta 2023-06-07 13:55:53 +08:00
mrFq1 8ba52a1517 misc: readme 2023-06-07 13:55:38 +08:00
mrFq1 a9c18525db chore: upload release 2023-06-07 13:04:21 +08:00
mrFq1 107cee5e89 Merge branch 'meta-dev' into meta 2023-06-07 12:13:15 +08:00
mrFq1 d1a422a7c6 misc: zip name 2023-06-07 12:13:06 +08:00
mrFq1 f31fc1eb53 Merge branch 'meta-dev' into meta 2023-06-07 10:29:18 +08:00
mrFq1 aab320b5f5 misc: zip name 2023-06-07 10:29:02 +08:00
mrFq1 5aaffa72c8 Merge branch 'meta-dev' into meta 2023-06-07 10:05:35 +08:00
mrFq1 8b7438bee3 misc: zip name 2023-06-07 10:03:37 +08:00
mrFq1 6d236f45fa fix: geo file download 2023-06-07 00:48:18 +08:00
mrFq1 f5b86e2ac7 misc: ClashX SwiftUI 2023-06-07 00:28:25 +08:00
mrFq1 bfa334641b misc: disable swiftui menubar 2023-06-07 00:11:53 +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 f017a81170 chore: archive project name 2023-06-06 11:01:20 +08:00
mrFq1 59dd25b455 chore: workflows 2023-06-06 00:00:44 +08:00
mrFq1 97a37c221e feat: clashx dashboard 2023-06-05 23:44:14 +08:00
mrFq1 8ba7dcb67b Merge branch 'SwiftUI' into meta-dev 2023-06-05 22:49:23 +08:00
mrFq1 ba9a4ae08e feat: reload dashboard 2023-06-05 22:45:13 +08:00
mrFq1 45406ccd4a misc: LoggerSwiftUI 2023-06-05 22:10:28 +08:00