diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 4f6d1acd1..007de6dbe 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,12 +1,12 @@ -Per Mattermost guidelines, GitHub issues are for bug reports: . +Per Mattermost guidelines, GitHub issues are for bug reports: . -For troubleshooting see: http://forum.mattermost.org/. -For feature proposals see: http://www.mattermost.org/feature-requests/ +For troubleshooting see: https://forum.mattermost.com/. +For feature proposals see: https://www.mattermost.com/feature-ideas/ If you've found a bug--something appears unintentional--please follow these steps: 1. Confirm you’re filing a new issue. [Search existing tickets in Jira](https://mattermost.atlassian.net/jira/software/c/projects/MM/issues/) to ensure that the ticket does not already exist. -2. Confirm your issue does not involve security. Otherwise, please see our [Responsible Disclosure Policy](https://about.mattermost.com/report-security-issue/). +2. Confirm your issue does not involve security. Otherwise, please see our [Responsible Disclosure Policy](https://mattermost.com/security-vulnerability-report/). 3. [File a new issue](https://github.com/mattermost/mattermost-mobile/issues/new) using the format below. Mattermost will confirm steps to reproduce and file in Jira, or ask for more details if there is trouble reproducing it. If there's already an existing bug in Jira, it will be linked back to the GitHub issue so you can track when it gets fixed. #### Summary diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 3065d8f3d..a901ec067 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -1,4 +1,4 @@ -Submit feature requests to http://www.mattermost.org/feature-requests/. File non-security related bugs here in the following format: +Submit feature requests to https://www.mattermost.com/feature-ideas/. File non-security related bugs here in the following format: #### Summary Issue in one concise sentence. diff --git a/SECURITY.md b/SECURITY.md index 63611adef..dd81287fb 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/app/constants/about_links.js b/app/constants/about_links.js index 0081ad848..98a5afef2 100644 --- a/app/constants/about_links.js +++ b/app/constants/about_links.js @@ -2,6 +2,6 @@ // See LICENSE.txt for license information. export default { - TERMS_OF_SERVICE: 'https://about.mattermost.com/default-terms/', - PRIVACY_POLICY: 'https://about.mattermost.com/default-privacy-policy/', + TERMS_OF_SERVICE: 'https://mattermost.com/terms-of-use/', + PRIVACY_POLICY: 'https://mattermost.com/privacy-policy/', }; diff --git a/assets/base/config.json b/assets/base/config.json index 789e7c735..1fd7d9789 100644 --- a/assets/base/config.json +++ b/assets/base/config.json @@ -2,12 +2,12 @@ "DefaultServerUrl": "", "TestServerUrl": "http://localhost:8065", "ShowErrorsList": false, - "EELearnURL": "about.mattermost.com", + "EELearnURL": "mattermost.com", "TeamEditionLearnURL": "mattermost.org", - "AboutTeamURL": "http://www.mattermost.org/", + "AboutTeamURL": "https://mattermost.com/", "AboutEnterpriseURL": "https://mattermost.com/", - "PlatformNoticeURL": "https://mattermost.com/platform-notice-txt/", - "MobileNoticeURL": "https://about.mattermost.com/mobile-notice-txt/", + "PlatformNoticeURL": "https://github.com/mattermost/mattermost-server/blob/master/NOTICE.txt", + "MobileNoticeURL": "https://github.com/mattermost/mattermost-mobile/blob/master/NOTICE.txt", "RudderApiKey": "", "AutoSelectServerUrl": false, diff --git a/detox/e2e/support/server_api/default_config.json b/detox/e2e/support/server_api/default_config.json index 8c2e3f70a..bc6cc76d9 100644 --- a/detox/e2e/support/server_api/default_config.json +++ b/detox/e2e/support/server_api/default_config.json @@ -189,11 +189,11 @@ "ShowFullName": true }, "SupportSettings": { - "TermsOfServiceLink": "https://about.mattermost.com/default-terms/", - "PrivacyPolicyLink": "https://about.mattermost.com/default-privacy-policy/", - "AboutLink": "https://about.mattermost.com/default-about/", - "HelpLink": "https://about.mattermost.com/default-help/", - "ReportAProblemLink": "https://about.mattermost.com/default-report-a-problem/", + "TermsOfServiceLink": "https://mattermost.com/terms-of-use/", + "PrivacyPolicyLink": "https://mattermost.com/privacy-policy/", + "AboutLink": "https://mattermost.com/default-about/", + "HelpLink": "https://mattermost.com/default-help/", + "ReportAProblemLink": "https://mattermost.com/default-report-a-problem/", "SupportEmail": "feedback@mattermost.com", "CustomTermsOfServiceEnabled": false, "CustomTermsOfServiceReAcceptancePeriod": 365, @@ -233,8 +233,8 @@ }, "NativeAppSettings": { "AppDownloadLink": "https://mattermost.com/download/#mattermostApps", - "AndroidAppDownloadLink": "https://about.mattermost.com/mattermost-android-app/", - "IosAppDownloadLink": "https://about.mattermost.com/mattermost-ios-app/" + "AndroidAppDownloadLink": "https://mattermost.com/mattermost-android-app/", + "IosAppDownloadLink": "https://mattermost.com/mattermost-ios-app/" }, "ClusterSettings": { "Enable": false diff --git a/detox/e2e/utils/webhook_utils.js b/detox/e2e/utils/webhook_utils.js index dfc86a554..0a3c16d33 100644 --- a/detox/e2e/utils/webhook_utils.js +++ b/detox/e2e/utils/webhook_utils.js @@ -9,7 +9,7 @@ function getFullDialog(triggerId, webhookBaseUrl) { callback_id: 'somecallbackid', title: 'Title for Full Dialog Test', icon_url: - 'http://www.mattermost.org/wp-content/uploads/2016/04/icon.png', + 'https://mattermost.com/wp-content/uploads/2022/02/icon.png', elements: [ { display_name: 'Display Name', @@ -181,7 +181,7 @@ function getSimpleDialog(triggerId, webhookBaseUrl) { callback_id: 'somecallbackid', title: 'Title for Dialog Test without elements', icon_url: - 'http://www.mattermost.org/wp-content/uploads/2016/04/icon.png', + 'https://mattermost.com/wp-content/uploads/2022/02/icon.png', submit_label: 'Submit Test', notify_on_cancel: true, state: 'somestate', @@ -197,7 +197,7 @@ function getUserAndChannelDialog(triggerId, webhookBaseUrl) { callback_id: 'somecallbackid', title: 'Title for Dialog Test with user and channel element', icon_url: - 'http://www.mattermost.org/wp-content/uploads/2016/04/icon.png', + 'https://mattermost.com/wp-content/uploads/2022/02/icon.png', submit_label: 'Submit Test', notify_on_cancel: true, state: 'somestate', @@ -243,7 +243,7 @@ function getBooleanDialog(triggerId, webhookBaseUrl) { callback_id: 'somecallbackid', title: 'Title for Dialog Test with boolean element', icon_url: - 'http://www.mattermost.org/wp-content/uploads/2016/04/icon.png', + 'https://mattermost.com/wp-content/uploads/2022/02/icon.png', submit_label: 'Submit Test', notify_on_cancel: true, state: 'somestate', diff --git a/fastlane/metadata/en-US/support_url.txt b/fastlane/metadata/en-US/support_url.txt index 5e88882c4..0f8a43fa0 100644 --- a/fastlane/metadata/en-US/support_url.txt +++ b/fastlane/metadata/en-US/support_url.txt @@ -1 +1 @@ -https://forum.mattermost.org/c/general/trouble-shoot +https://forum.mattermost.com/c/trouble-shoot/16