diff --git a/.circleci/config.yml b/.circleci/config.yml index 2feba79c..41f78254 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,7 +49,7 @@ commands: default: "MattermostRelease" icon: type: string - default: "https://www.mattermost.org/wp-content/uploads/2016/04/icon.png" + default: "https://mattermost.com/wp-content/uploads/2022/02/icon.png" steps: - run: command: | diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c64c0aa8..781e36cb 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -6,7 +6,7 @@ about: Create a report about an issue you found I confirm (by marking "x" in the [ ] below: [x]): -- [ ] This is not a troubleshooting question. [Troubleshooting questions go here: http://www.mattermost.org/troubleshoot/](http://www.mattermost.org/troubleshoot/). +- [ ] This is not a troubleshooting question. [Troubleshooting questions go here: https://docs.mattermost.com/install/troubleshooting.html](https://docs.mattermost.com/install/troubleshooting.html). - [ ] This doesn't reproduce on web browsers (such as in Chrome). If it does, [issue reports go to the Mattermost Server repository](https://github.com/mattermost/platform/issues). - [ ] I have read [contributing guidelines](https://github.com/mattermost/desktop/blob/master/CONTRIBUTING.md). diff --git a/.github/ISSUE_TEMPLATE/troubleshooting-question.md b/.github/ISSUE_TEMPLATE/troubleshooting-question.md index 4287bb62..550f8106 100644 --- a/.github/ISSUE_TEMPLATE/troubleshooting-question.md +++ b/.github/ISSUE_TEMPLATE/troubleshooting-question.md @@ -4,4 +4,4 @@ about: Ask a question to solve installation and configuration issues --- -For troubleshooting, see [https://www.mattermost.org/troubleshoot/](https://www.mattermost.org/troubleshoot/). +For troubleshooting, see [https://docs.mattermost.com/install/troubleshooting.html](https://docs.mattermost.com/install/troubleshooting.html). diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 5868c260..e3e3dce9 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -26,7 +26,7 @@ Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fie - [ ] Added or updated unit tests (required for all new features) - [ ] Has UI changes - [ ] read and understood our [Contributing Guidelines](https://github.com/mattermost/desktop/blob/master/CONTRIBUTING.md) -- [ ] completed [Mattermost Contributor Agreement](http://www.mattermost.org/mattermost-contributor-agreement/) +- [ ] completed [Mattermost Contributor Agreement](https://mattermost.com/contribute/) - [ ] executed `npm run lint:js` for proper code formatting #### Device Information diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dc10e0f8..a9f02ba7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,4 +43,4 @@ npm run check-types npm run test ``` 2. If you are fixing a bug, consider writing a unit test for the change so that the issue does not resurface. If you are adding a new feature, consider additionally writing end-to-end (E2E) tests to thoroughly test the changes. -3. Please complete the [Mattermost CLA](http://www.mattermost.org/mattermost-contributor-agreement/) prior to submitting a PR. +3. Please complete the [Mattermost CLA](https://mattermost.com/contribute/) prior to submitting a PR. diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 36f6a845..0f134e5e 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,6 @@ Before submitting, please confirm you've - [ ] read and understood our [Contributing Guidelines](https://github.com/mattermost/desktop/blob/master/CONTRIBUTING.md) - - [ ] completed [Mattermost Contributor Agreement](http://www.mattermost.org/mattermost-contributor-agreement/) + - [ ] completed [Mattermost Contributor Agreement](https://mattermost.com/contribute/) - [ ] executed `npm run lint:js` for proper code formatting - [ ] executed `npm run check-types` for proper type checking - [ ] executed `npm run test` to ensure all automated tests pass diff --git a/SECURITY.md b/SECURITY.md index 02c20dd0..a239bf49 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -17,7 +17,7 @@ Security updates Mattermost has a mandatory upgrade policy, and updates are only provided for the latest release. Critical updates are delivered as dot releases. Details on security updates are announced 30 days after the availability of the update. -For more details about the security content of past releases, see the [Security Updates](https://mattermost.com/security-updates/) page on the Mattermost website. For timely notifications about new security updates, subscribe to the [Security Bulletins Mailing List](https://about.mattermost.com/security-bulletin). +For more details about the security content of past releases, see the [Security Updates](https://mattermost.com/security-updates/) page on the Mattermost website. For timely notifications about new security updates, subscribe to the [Security Bulletins Mailing List](https://mattermost.com/security-updates/#sign-up). Contributing to this policy --------------------------- diff --git a/package.json b/package.json index ba1652eb..2c8f21b1 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "author": "Mattermost, Inc. ", "license": "Apache-2.0", "desktopName": "Mattermost.Desktop", - "homepage": "https://about.mattermost.com", + "homepage": "https://mattermost.com", "engines": { "node": ">=4.2.0" }, diff --git a/scripts/generate_release_markdown.sh b/scripts/generate_release_markdown.sh index 6251ae9b..de4c2115 100755 --- a/scripts/generate_release_markdown.sh +++ b/scripts/generate_release_markdown.sh @@ -17,7 +17,7 @@ BASE_URL="https://releases.mattermost.com/desktop/${VERSION}" cat <<-MD ### Mattermost Desktop v${VERSION} has been cut! -Release notes can be found here: https://docs.mattermost.com/help/apps/desktop-changelog.html +Release notes can be found here: https://docs.mattermost.com/install/desktop-app-changelog.html The download links can be found below. diff --git a/src/assets/linux/README.md b/src/assets/linux/README.md index 4155b577..2b5aed76 100644 --- a/src/assets/linux/README.md +++ b/src/assets/linux/README.md @@ -56,7 +56,7 @@ After launching, you need to configure the application to interact with your tea 4. Click **Add**. 5. Click **Save**. -More guides are available at [Mattermost Documentation](https://about.mattermost.com/default-desktop-app-documentation/). +More guides are available at [Mattermost Documentation](https://docs.mattermost.com/messaging/managing-desktop-app-servers.html). ## Contributing diff --git a/src/common/config/buildConfig.ts b/src/common/config/buildConfig.ts index 31332154..70d439f3 100644 --- a/src/common/config/buildConfig.ts +++ b/src/common/config/buildConfig.ts @@ -26,7 +26,7 @@ const buildConfig: BuildConfig = { url: 'https://example.com' } */], - helpLink: 'https://about.mattermost.com/default-desktop-app-documentation/', + helpLink: 'https://docs.mattermost.com/messaging/managing-desktop-app-servers.html', enableServerManagement: true, enableAutoUpdater: true, managedResources: ['trusted'],