mirror of
https://github.com/Ranchero-Software/NetNewsWire
synced 2025-08-12 06:26:36 +00:00
Merge pull request #2300 from noelleleigh/fix-branch-name-references
Fix GitHub URLs that point to `master` instead of `main`
This commit is contained in:
Maurice Parker
File diff suppressed because one or more lines are too long
@@ -569,7 +569,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
|
||||
|
||||
@IBAction func openHowToSupport(_ sender: Any?) {
|
||||
|
||||
Browser.open("https://github.com/brentsimmons/NetNewsWire/blob/master/Technotes/HowToSupportNetNewsWire.markdown", inBackground: false)
|
||||
Browser.open("https://github.com/brentsimmons/NetNewsWire/blob/main/Technotes/HowToSupportNetNewsWire.markdown", inBackground: false)
|
||||
}
|
||||
|
||||
@IBAction func openRepository(_ sender: Any?) {
|
||||
@@ -588,7 +588,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
|
||||
|
||||
@IBAction func openTechnotes(_ sender: Any?) {
|
||||
|
||||
Browser.open("https://github.com/brentsimmons/NetNewsWire/tree/master/Technotes", inBackground: false)
|
||||
Browser.open("https://github.com/brentsimmons/NetNewsWire/tree/main/Technotes", inBackground: false)
|
||||
}
|
||||
|
||||
@IBAction func showHelp(_ sender: Any?) {
|
||||
|
||||
@@ -21,13 +21,13 @@ class SettingsModel: ObservableObject {
|
||||
case .netNewsWire:
|
||||
return URL(string: "https://ranchero.com/netnewswire/")!
|
||||
case .supportNetNewsWire:
|
||||
return URL(string: "https://github.com/brentsimmons/NetNewsWire/blob/master/Technotes/HowToSupportNetNewsWire.markdown")!
|
||||
return URL(string: "https://github.com/brentsimmons/NetNewsWire/blob/main/Technotes/HowToSupportNetNewsWire.markdown")!
|
||||
case .github:
|
||||
return URL(string: "https://github.com/brentsimmons/NetNewsWire")!
|
||||
case .bugTracker:
|
||||
return URL(string: "https://github.com/brentsimmons/NetNewsWire/issues")!
|
||||
case .technotes:
|
||||
return URL(string: "https://github.com/brentsimmons/NetNewsWire/tree/master/Technotes")!
|
||||
return URL(string: "https://github.com/brentsimmons/NetNewsWire/tree/main/Technotes")!
|
||||
case .netNewsWireSlack:
|
||||
return URL(string: "https://ranchero.com/netnewswire/slack")!
|
||||
case .none:
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
# NetNewsWire Continuous Integration
|
||||
|
||||
CI for NetNewsWire is enabled through Github Actions. The CI workflow configuration (hosted in
|
||||
[`.github/workflows/build.yml`](https://github.com/brentsimmons/NetNewsWire/blob/master/.github/workflows/build.yml)
|
||||
[`.github/workflows/build.yml`](https://github.com/brentsimmons/NetNewsWire/blob/main/.github/workflows/build.yml)
|
||||
uses `xcodebuild` to build the project after syncing the repository and the various submodules.
|
||||
|
||||
The build itself focuses on the scheme NetNewsWire for macOS and NetNewsWire-iOS for iOS. Also it leverages the
|
||||
`NetNewsWire.xcworkspace` configuration.
|
||||
|
||||
Private keys, certificates and provisioning profiles are stored in Github under `buildscripts` folder. Decrypting neccessary certificates, copy to build machine keychain and delete the certificates are handled by the [`buildscripts/ci-build.sh`](https://github.com/Ranchero-Software/NetNewsWire/blob/master/buildscripts/ci-build.sh) script.
|
||||
Private keys, certificates and provisioning profiles are stored in Github under `buildscripts` folder. Decrypting neccessary certificates, copy to build machine keychain and delete the certificates are handled by the [`buildscripts/ci-build.sh`](https://github.com/Ranchero-Software/NetNewsWire/blob/main/buildscripts/ci-build.sh) script.
|
||||
|
||||
Each submodule also has it's own CI configuration, which are set up and built from
|
||||
their own repositories. The submodule CI systems are entirely independent so that
|
||||
|
||||
@@ -18,4 +18,4 @@ Slack
|
||||
GitHub
|
||||
------
|
||||
|
||||
The [NetNewsWire project on GitHub](https://github.com/brentsimmons/NetNewsWire) is the place to raise formal issues like bugs and feature requests. If you want to make contributions to NetNewsWire’s code or documentation, please refer to our [contribution guidelines](https://github.com/brentsimmons/NetNewsWire/blob/master/CONTRIBUTING.md) page on GitHub.
|
||||
The [NetNewsWire project on GitHub](https://github.com/brentsimmons/NetNewsWire) is the place to raise formal issues like bugs and feature requests. If you want to make contributions to NetNewsWire’s code or documentation, please refer to our [contribution guidelines](https://github.com/brentsimmons/NetNewsWire/blob/main/CONTRIBUTING.md) page on GitHub.
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
# NetNewsWire and your privacy
|
||||
|
||||
[The NetNewsWire Privacy Policy](https://github.com/brentsimmons/NetNewsWire/blob/master/Technotes/privacypolicy.markdown)
|
||||
[The NetNewsWire Privacy Policy](https://github.com/brentsimmons/NetNewsWire/blob/main/Technotes/privacypolicy.markdown)
|
||||
|
||||
NetNewsWire has a very strict privacy policy – we don’t want any private information about you.
|
||||
|
||||
@@ -13,4 +13,4 @@ The only data we collect about how you use NetNewsWire, *only if you agree and o
|
||||
Changes to the Privacy Policy
|
||||
-----------------------------
|
||||
|
||||
The [full privacy policy](https://github.com/brentsimmons/NetNewsWire/blob/master/Technotes/privacypolicy.markdown) is stored in the NetNewsWire GitHub repository, where you can track any changes we might make.
|
||||
The [full privacy policy](https://github.com/brentsimmons/NetNewsWire/blob/main/Technotes/privacypolicy.markdown) is stored in the NetNewsWire GitHub repository, where you can track any changes we might make.
|
||||
@@ -64,5 +64,5 @@ NetNewsWire displays HTML that comes from feeds from other sites. Some of these
|
||||
|
||||
If you have questions or comments about this privacy policy, please contact <a href="mailto:brent@ranchero.com">brent@ranchero.com</a>.
|
||||
|
||||
This [policy](https://github.com/brentsimmons/NetNewsWire/blob/master/Technotes/privacypolicy.markdown) is stored in the NetNewsWire GitHub repository, where you can track any changes we might make.
|
||||
This [policy](https://github.com/brentsimmons/NetNewsWire/blob/main/Technotes/privacypolicy.markdown) is stored in the NetNewsWire GitHub repository, where you can track any changes we might make.
|
||||
|
||||
|
||||
@@ -233,7 +233,7 @@ class SettingsViewController: UITableViewController {
|
||||
openURL("https://ranchero.com/netnewswire/")
|
||||
tableView.selectRow(at: nil, animated: true, scrollPosition: .none)
|
||||
case 2:
|
||||
openURL("https://github.com/brentsimmons/NetNewsWire/blob/master/Technotes/HowToSupportNetNewsWire.markdown")
|
||||
openURL("https://github.com/brentsimmons/NetNewsWire/blob/main/Technotes/HowToSupportNetNewsWire.markdown")
|
||||
tableView.selectRow(at: nil, animated: true, scrollPosition: .none)
|
||||
case 3:
|
||||
openURL("https://github.com/brentsimmons/NetNewsWire")
|
||||
@@ -242,7 +242,7 @@ class SettingsViewController: UITableViewController {
|
||||
openURL("https://github.com/brentsimmons/NetNewsWire/issues")
|
||||
tableView.selectRow(at: nil, animated: true, scrollPosition: .none)
|
||||
case 5:
|
||||
openURL("https://github.com/brentsimmons/NetNewsWire/tree/master/Technotes")
|
||||
openURL("https://github.com/brentsimmons/NetNewsWire/tree/main/Technotes")
|
||||
tableView.selectRow(at: nil, animated: true, scrollPosition: .none)
|
||||
case 6:
|
||||
openURL("https://ranchero.com/netnewswire/slack")
|
||||
|
||||
Reference in New Issue
Block a user