From 4e4b44d41dc752e3e407a8c9005e59143181359b Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 29 Jun 2020 06:43:53 +0200 Subject: [PATCH] Move to main branch. --- .env.example | 2 +- .github/contributing.md | 2 +- .github/pull_request_template.md | 5 +++-- .github/security.md | 2 +- app.json | 2 +- app/Helpers/Help/Help.php | 2 +- changelog.md | 2 +- readme.md | 4 ++-- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.env.example b/.env.example index 7888a92370..ef0ce5c29a 100644 --- a/.env.example +++ b/.env.example @@ -17,7 +17,7 @@ APP_KEY=SomeRandomStringOf32CharsExactly # # Firefly III will launch using this language (for new users and unauthenticated visitors) -# For a list of available languages: https://github.com/firefly-iii/firefly-iii/tree/master/resources/lang +# For a list of available languages: https://github.com/firefly-iii/firefly-iii/tree/main/resources/lang # # If text is still in English, remember that not everything may have been translated. DEFAULT_LANGUAGE=en_US diff --git a/.github/contributing.md b/.github/contributing.md index 19d1dd073d..84bb35da58 100644 --- a/.github/contributing.md +++ b/.github/contributing.md @@ -8,7 +8,7 @@ I am always interested in expanding Firefly III's many features. Just open a tic ## Pull requests -When contributing to Firefly III, please first discuss the change you wish to make via issue, email, or any other method. I can only accept pull requests against the `develop` branch, never the `master` branch. +When contributing to Firefly III, please first discuss the change you wish to make via issue, email, or any other method. I can only accept pull requests against the `develop` branch, never the `main` branch. ## Translations :us: :fr: :de: diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index f152c20230..9e2987ea14 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,8 +1,9 @@ diff --git a/.github/security.md b/.github/security.md index 54944644aa..044dd0fe8a 100644 --- a/.github/security.md +++ b/.github/security.md @@ -8,5 +8,5 @@ Only the latest version of Firefly III is supported. If you're not running the l If you find something that compromises the security of Firefly III, you should [send me a message](mailto:james@firefly-iii.org) as soon as possible. These issues will be fixed immediately. You can also open an issue, but if you feel the issue is sensitive, please drop me a message instead. -You can use my [GPG key](https://keybase.io/jc5) for extra security. My [GitHub commits](https://github.com/firefly-iii/firefly-iii/commits/master) are almost always signed with this key. +You can use my [GPG key](https://keybase.io/jc5) for extra security. My [GitHub commits](https://github.com/firefly-iii/firefly-iii/commits/main) are almost always signed with this key. diff --git a/app.json b/app.json index 366ce7bf04..e3efababf0 100644 --- a/app.json +++ b/app.json @@ -3,7 +3,7 @@ "description": "A free and open source personal finances manager", "repository": "https://github.com/firefly-iii/firefly-iii", "website": "https://firefly-iii.org/", - "logo": "https://raw.githubusercontent.com/firefly-iii/firefly-iii/master/public/mstile-150x150.png", + "logo": "https://raw.githubusercontent.com/firefly-iii/firefly-iii/main/public/mstile-150x150.png", "keywords": [ "finance", "finances", diff --git a/app/Helpers/Help/Help.php b/app/Helpers/Help/Help.php index 23366712a4..359b37294d 100644 --- a/app/Helpers/Help/Help.php +++ b/app/Helpers/Help/Help.php @@ -77,7 +77,7 @@ class Help implements HelpInterface */ public function getFromGitHub(string $route, string $language): string { - $uri = sprintf('https://raw.githubusercontent.com/firefly-iii/help/master/%s/%s.md', $language, $route); + $uri = sprintf('https://raw.githubusercontent.com/firefly-iii/help/main/%s/%s.md', $language, $route); Log::debug(sprintf('Trying to get %s...', $uri)); $opt = ['headers' => ['User-Agent' => $this->userAgent]]; $content = ''; diff --git a/changelog.md b/changelog.md index 6a9dd2032b..d5d7feb1ba 100644 --- a/changelog.md +++ b/changelog.md @@ -1424,7 +1424,7 @@ This version was superseeded by v4.7.5.3 because of a critical bug in the proxy- - Improve attachment support and view capabilities (suggested by [trinhit](https://github.com/trinhit) in [issue 1146](https://github.com/firefly-iii/firefly-iii/issues/1146)) ### Changed -- Whole new [read me file](https://github.com/firefly-iii/firefly-iii/blob/master/readme.md), [new end user documentation](https://firefly-iii.readthedocs.io/en/latest/) and an [updated website](https://www.firefly-iii.org/)! +- Whole new [read me file](https://github.com/firefly-iii/firefly-iii/blob/main/readme.md), [new end user documentation](https://firefly-iii.readthedocs.io/en/latest/) and an [updated website](https://www.firefly-iii.org/)! - Many charts and info-blocks now scale property ([issue 989](https://github.com/firefly-iii/firefly-iii/issues/989) and [issue 1040](https://github.com/firefly-iii/firefly-iii/issues/1040)) ### Fixed diff --git a/readme.md b/readme.md index bf9be1ccbd..1648a89e6f 100644 --- a/readme.md +++ b/readme.md @@ -131,7 +131,7 @@ There are many ways to run Firefly III Your help is always welcome! Feel free to open issues, ask questions, talk about it and discuss this tool. I've created several social media accounts and I invite you to follow them, tweet at them and post to them. There's [reddit](https://www.reddit.com/r/FireflyIII/) and [Twitter](https://twitter.com/Firefly_III). -Of course, there are some [contributing guidelines](https://github.com/firefly-iii/firefly-iii/blob/master/.github/contributing.md) and a [code of conduct](https://github.com/firefly-iii/firefly-iii/blob/master/.github/code_of_conduct.md), which I invite you to check out. +Of course, there are some [contributing guidelines](https://github.com/firefly-iii/firefly-iii/blob/main/.github/contributing.md) and a [code of conduct](https://github.com/firefly-iii/firefly-iii/blob/main/.github/code_of_conduct.md), which I invite you to check out. I can always use your help [squashing bugs](https://docs.firefly-iii.org/support/contribute#bugs), thinking about [new features](https://docs.firefly-iii.org/support/contribute#feature-requests) or [translating Firefly III](https://docs.firefly-iii.org/support/contribute#translations) into other languages. @@ -147,7 +147,7 @@ Thank you for considering donating to Firefly III! ## License -This work [is licensed](https://github.com/firefly-iii/firefly-iii/blob/master/LICENSE) under the [GNU Affero General Public License v3](https://www.gnu.org/licenses/agpl-3.0.html). +This work [is licensed](https://github.com/firefly-iii/firefly-iii/blob/main/LICENSE) under the [GNU Affero General Public License v3](https://www.gnu.org/licenses/agpl-3.0.html). ## Contact