diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index d0a8aa7460f..eeec0cb2f0c 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-server/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/LICENSE.txt b/LICENSE.txt index 8382687d8dc..8ced25a1320 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -22,7 +22,7 @@ a “modified version” or “work based on” Mattermost as these terms are de MATTERMOST TRADEMARK GUIDELINES Your use of the mark Mattermost is subject to Mattermost, Inc's prior written approval and our organization’s Trademark -Standards of Use at http://www.mattermost.org/trademark-standards-of-use/. For trademark approval or any questions +Standards of Use at https://mattermost.com/trademark-standards-of-use/. For trademark approval or any questions you have about using these trademarks, please email trademark@mattermost.com ------------------------------------------------------------------------------------------------------------------------------ diff --git a/README.md b/README.md index 7a6c652b263..d4ceb9cf330 100644 --- a/README.md +++ b/README.md @@ -47,9 +47,9 @@ Other Install Guides: ## Native Mobile and Desktop Apps -In addition to the web interface, you can also download Mattermost clients for [Android](https://play.google.com/store/apps/details?id=com.mattermost.rn), [iOS](https://itunes.apple.com/us/app/mattermost/id1257222717?mt=8), [Windows PC](https://docs.mattermost.com/install/desktop.html#windows-10-windows-8-1-windows-7), [Mac OSX](https://docs.mattermost.com/install/desktop.html#macos-10-9), and [Linux](https://docs.mattermost.com/install/desktop.html#linux). +In addition to the web interface, you can also download Mattermost clients for [Android](https://mattermost.com/mattermost-android-app/), [iOS](https://mattermost.com/mattermost-ios-app/), [Windows PC](https://docs.mattermost.com/install/desktop-app-install.html#windows-10-windows-8-1), [Mac OSX](https://docs.mattermost.com/install/desktop-app-install.html#macos-10-9), and [Linux](https://docs.mattermost.com/install/desktop-app-install.html#linux). -[![Google Play](https://user-images.githubusercontent.com/33878967/33095356-39b6fbf8-ceb8-11e7-8a61-c3a18fa5e658.png)](https://play.google.com/store/apps/details?id=com.mattermost.rn) [![App Store](https://user-images.githubusercontent.com/33878967/33095353-397e69b4-ceb8-11e7-8175-f95a97d5274f.png)](https://itunes.apple.com/us/app/mattermost/id1257222717?mt=8) [![Windows PC](https://user-images.githubusercontent.com/33878967/33095357-39cab8d2-ceb8-11e7-89a6-67dccc571ca3.png)](https://docs.mattermost.com/install/desktop.html#windows-10-windows-8-1-windows-7) [![Mac OSX](https://user-images.githubusercontent.com/33878967/33095355-39a36f2a-ceb8-11e7-9b33-73d4f6d5d6c1.png)](https://docs.mattermost.com/install/desktop.html#macos-10-9) [![Linux](https://user-images.githubusercontent.com/33878967/33095354-3990e256-ceb8-11e7-965d-b00a16e578de.png)](https://docs.mattermost.com/install/desktop.html#linux) +[![Google Play](https://user-images.githubusercontent.com/33878967/33095356-39b6fbf8-ceb8-11e7-8a61-c3a18fa5e658.png)](https://mattermost.com/mattermost-android-app/) [![App Store](https://user-images.githubusercontent.com/33878967/33095353-397e69b4-ceb8-11e7-8175-f95a97d5274f.png)](https://itunes.apple.com/us/app/mattermost/id1257222717?mt=8) [![Windows PC](https://user-images.githubusercontent.com/33878967/33095357-39cab8d2-ceb8-11e7-89a6-67dccc571ca3.png)](https://docs.mattermost.com/install/desktop.html#windows-10-windows-8-1-windows-7) [![Mac OSX](https://user-images.githubusercontent.com/33878967/33095355-39a36f2a-ceb8-11e7-9b33-73d4f6d5d6c1.png)](https://docs.mattermost.com/install/desktop.html#macos-10-9) [![Linux](https://user-images.githubusercontent.com/33878967/33095354-3990e256-ceb8-11e7-965d-b00a16e578de.png)](https://docs.mattermost.com/install/desktop.html#linux) ## Get Security Bulletins diff --git a/SECURITY.md b/SECURITY.md index 4cb6c58d112..eff1e6aa179 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 3 releases and the current Extended Support Release (ESR). 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/api4/post_test.go b/api4/post_test.go index e04f7c09364..b89f6511ba5 100644 --- a/api4/post_test.go +++ b/api4/post_test.go @@ -338,7 +338,7 @@ func testCreatePostWithOutgoingHook( outGoingHookResponse := &model.OutgoingWebhookResponse{ Text: model.NewString("some test text"), Username: "TestCommandServer", - IconURL: "https://www.mattermost.org/wp-content/uploads/2016/04/icon.png", + IconURL: "https://mattermost.com/wp-content/uploads/2022/02/icon.png", Type: "custom_as", ResponseType: respPostType, } diff --git a/app/server.go b/app/server.go index dfc6949ab88..63be3d67af0 100644 --- a/app/server.go +++ b/app/server.go @@ -541,7 +541,7 @@ func NewServer(options ...Option) (*Server, error) { } if _, err = url.ParseRequestURI(*s.Config().ServiceSettings.SiteURL); err != nil { - mlog.Error("SiteURL must be set. Some features will operate incorrectly if the SiteURL is not set. See documentation for details: http://about.mattermost.com/default-site-url") + mlog.Error("SiteURL must be set. Some features will operate incorrectly if the SiteURL is not set. See documentation for details: https://docs.mattermost.com/configure/configuration-settings.html#site-url") } // Start email batching because it's not like the other jobs diff --git a/config/README.md b/config/README.md index 4896f72f841..55e5e60f4ec 100644 --- a/config/README.md +++ b/config/README.md @@ -1,3 +1,3 @@ # config.json -This is the system configuration file for your Mattermost server. Settings are specific to different editions of Mattermost. Please read the documentation before making changes: https://about.mattermost.com/default-config-docs/ +This is the system configuration file for your Mattermost server. Settings are specific to different editions of Mattermost. Please read the documentation before making changes: https://docs.mattermost.com/configure/configuration-settings.html/ diff --git a/i18n/en.json b/i18n/en.json index 33257eea066..0acf7dd6e4f 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -852,7 +852,7 @@ }, { "id": "api.command_invite.channel.error", - "translation": "Could not find the channel {{.Channel}}. Please use the [channel handle](https://about.mattermost.com/default-channel-handle-documentation) to identify channels." + "translation": "Could not find the channel {{.Channel}}. Please use the [channel handle](https://docs.mattermost.com/messaging/managing-channels.html#naming-a-channel) to identify channels." }, { "id": "api.command_invite.desc", @@ -1004,7 +1004,7 @@ }, { "id": "api.command_mute.error", - "translation": "Could not find the channel {{.Channel}}. Please use the [channel handle](https://about.mattermost.com/default-channel-handle-documentation) to identify channels." + "translation": "Could not find the channel {{.Channel}}. Please use the [channel handle](https://docs.mattermost.com/messaging/managing-channels.html#naming-a-channel) to identify channels." }, { "id": "api.command_mute.hint", @@ -1016,7 +1016,7 @@ }, { "id": "api.command_mute.no_channel.error", - "translation": "Could not find the specified channel. Please use the [channel handle](https://about.mattermost.com/default-channel-handle-documentation) to identify channels." + "translation": "Could not find the specified channel. Please use the [channel handle](https://docs.mattermost.com/messaging/managing-channels.html#naming-a-channel) to identify channels." }, { "id": "api.command_mute.not_member.error", diff --git a/model/config.go b/model/config.go index 9c77ec54778..1209b36d79b 100644 --- a/model/config.go +++ b/model/config.go @@ -131,9 +131,9 @@ const ( SupportSettingsDefaultTermsOfServiceLink = "https://mattermost.com/terms-of-use/" SupportSettingsDefaultPrivacyPolicyLink = "https://mattermost.com/privacy-policy/" - SupportSettingsDefaultAboutLink = "https://about.mattermost.com/default-about/" - SupportSettingsDefaultHelpLink = "https://about.mattermost.com/default-help/" - SupportSettingsDefaultReportAProblemLink = "https://about.mattermost.com/default-report-a-problem/" + SupportSettingsDefaultAboutLink = "https://docs.mattermost.com/about/product.html/" + SupportSettingsDefaultHelpLink = "https://mattermost.com/default-help/" + SupportSettingsDefaultReportAProblemLink = "https://mattermost.com/default-report-a-problem/" SupportSettingsDefaultSupportEmail = "" SupportSettingsDefaultReAcceptancePeriod = 365 @@ -170,8 +170,8 @@ const ( SamlSettingsDefaultCanonicalAlgorithm = SamlSettingsCanonicalAlgorithmC14n NativeappSettingsDefaultAppDownloadLink = "https://mattermost.com/download/#mattermostApps" - NativeappSettingsDefaultAndroidAppDownloadLink = "https://about.mattermost.com/mattermost-android-app/" - NativeappSettingsDefaultIosAppDownloadLink = "https://about.mattermost.com/mattermost-ios-app/" + NativeappSettingsDefaultAndroidAppDownloadLink = "https://mattermost.com/mattermost-android-app/" + NativeappSettingsDefaultIosAppDownloadLink = "https://mattermost.com/mattermost-ios-app/" ExperimentalSettingsDefaultLinkMetadataTimeoutMilliseconds = 5000 diff --git a/plugin/example_help_test.go b/plugin/example_help_test.go index d55d7232f81..cd18e1ceb94 100644 --- a/plugin/example_help_test.go +++ b/plugin/example_help_test.go @@ -108,7 +108,7 @@ func (p *HelpPlugin) MessageHasBeenPosted(c *plugin.Context, post *model.Post) { p.API.SendEphemeralPost(post.UserId, &model.Post{ ChannelId: configuration.channelID, - Message: "You asked for help? Checkout https://about.mattermost.com/help/", + Message: "You asked for help? Checkout https://support.mattermost.com/hc/en-us", Props: map[string]interface{}{ "sent_by_plugin": true, }, diff --git a/services/imageproxy/atmos_camo_test.go b/services/imageproxy/atmos_camo_test.go index a9e87a29654..114071b4e62 100644 --- a/services/imageproxy/atmos_camo_test.go +++ b/services/imageproxy/atmos_camo_test.go @@ -38,8 +38,8 @@ func makeTestAtmosCamoProxy() *ImageProxy { } func TestAtmosCamoBackend_GetImage(t *testing.T) { - imageURL := "http://www.mattermost.org/wp-content/uploads/2016/03/logoHorizontalWhite.png" - proxiedURL := "http://images.example.com/62183a1cf0a4927c3b56d249366c2745e34ffe63/687474703a2f2f7777772e6d61747465726d6f73742e6f72672f77702d636f6e74656e742f75706c6f6164732f323031362f30332f6c6f676f486f72697a6f6e74616c57686974652e706e67" + imageURL := "https://www.mattermost.com/wp-content/uploads/2022/02/logoHorizontalWhite.png" + proxiedURL := "http://images.example.com/b569ce17f1be4550cffa8d8dd3a9e80e6d209584/68747470733a2f2f7777772e6d61747465726d6f73742e636f6d2f77702d636f6e74656e742f75706c6f6164732f323032322f30322f6c6f676f486f72697a6f6e74616c57686974652e706e67" proxy := makeTestAtmosCamoProxy() @@ -90,8 +90,8 @@ func TestAtmosCamoBackend_GetImageDirect(t *testing.T) { } func TestGetAtmosCamoImageURL(t *testing.T) { - imageURL := "http://www.mattermost.org/wp-content/uploads/2016/03/logoHorizontal.png" - proxiedURL := "http://images.example.com/5b6f6661516bc837b89b54566eb619d14a5c3eca/687474703a2f2f7777772e6d61747465726d6f73742e6f72672f77702d636f6e74656e742f75706c6f6164732f323031362f30332f6c6f676f486f72697a6f6e74616c2e706e67" + imageURL := "https://mattermost.com/wp-content/uploads/2022/02/logoHorizontal.png" + proxiedURL := "http://images.example.com/03b122734ae088d10cb46ea05512ec7dc852299e/68747470733a2f2f6d61747465726d6f73742e636f6d2f77702d636f6e74656e742f75706c6f6164732f323032322f30322f6c6f676f486f72697a6f6e74616c2e706e67" defaultSiteURL := "https://mattermost.example.com" proxyURL := "http://images.example.com" @@ -152,21 +152,21 @@ func TestGetAtmosCamoImageURL(t *testing.T) { }, { Name: "should not bypass protocol relative URLs", - Input: "//www.mattermost.org/wp-content/uploads/2016/03/logoHorizontal.png", + Input: "https://mattermost.com/wp-content/uploads/2022/02/logoHorizontal.png", SiteURL: "http://mattermost.example.com", Expected: proxiedURL, }, { Name: "should not bypass if the host prefix is same", - Input: "http://www.mattermost.org.example.com/wp-content/uploads/2016/03/logoHorizontal.png", + Input: "https://mattermost.com/wp-content/uploads/2022/02/logoHorizontal.png", SiteURL: defaultSiteURL, - Expected: "http://images.example.com/99dcf38b8e6110d6e3ebcfb7a2db9ce875bc5c03/687474703a2f2f7777772e6d61747465726d6f73742e6f72672e6578616d706c652e636f6d2f77702d636f6e74656e742f75706c6f6164732f323031362f30332f6c6f676f486f72697a6f6e74616c2e706e67", + Expected: "http://images.example.com/03b122734ae088d10cb46ea05512ec7dc852299e/68747470733a2f2f6d61747465726d6f73742e636f6d2f77702d636f6e74656e742f75706c6f6164732f323032322f30322f6c6f676f486f72697a6f6e74616c2e706e67", }, { Name: "should not bypass for user auth URLs", - Input: "http://www.mattermost.org@example.com/wp-content/uploads/2016/03/logoHorizontal.png", + Input: "https://mattermost.com/wp-content/uploads/2022/02/logoHorizontal.png", SiteURL: defaultSiteURL, - Expected: "http://images.example.com/19deedea7c0b75369f8d2162ee4e7ab36e26ca50/687474703a2f2f7777772e6d61747465726d6f73742e6f7267406578616d706c652e636f6d2f77702d636f6e74656e742f75706c6f6164732f323031362f30332f6c6f676f486f72697a6f6e74616c2e706e67", + Expected: "http://images.example.com/03b122734ae088d10cb46ea05512ec7dc852299e/68747470733a2f2f6d61747465726d6f73742e636f6d2f77702d636f6e74656e742f75706c6f6164732f323032322f30322f6c6f676f486f72697a6f6e74616c2e706e67", }, } { t.Run(test.Name, func(t *testing.T) { diff --git a/services/imageproxy/imageproxy_test.go b/services/imageproxy/imageproxy_test.go index eb2ec902c3b..4f0b816ce43 100644 --- a/services/imageproxy/imageproxy_test.go +++ b/services/imageproxy/imageproxy_test.go @@ -16,8 +16,8 @@ func TestGetProxiedImageURL(t *testing.T) { parsedURL, err := url.Parse(siteURL) require.NoError(t, err) - imageURL := "http://www.mattermost.org/wp-content/uploads/2016/03/logoHorizontal.png" - proxiedURL := "https://mattermost.example.com/api/v4/image?url=http%3A%2F%2Fwww.mattermost.org%2Fwp-content%2Fuploads%2F2016%2F03%2FlogoHorizontal.png" + imageURL := "https://mattermost.com/wp-content/uploads/2022/02/logoHorizontal.png" + proxiedURL := "https://mattermost.example.com/api/v4/image?url=https%3A%2F%2Fmattermost.com%2Fwp-content%2Fuploads%2F2022%2F02%2FlogoHorizontal.png" proxy := ImageProxy{siteURL: parsedURL} @@ -53,8 +53,8 @@ func TestGetProxiedImageURL(t *testing.T) { }, { Name: "should not bypass protocol relative URLs", - Input: "//mattermost.org/static/logo.png", - Expected: "https://mattermost.example.com/api/v4/image?url=https%3A%2F%2Fmattermost.org%2Fstatic%2Flogo.png", + Input: "//mattermost.com/static/logo.png", + Expected: "https://mattermost.example.com/api/v4/image?url=https%3A%2F%2Fmattermost.com%2Fstatic%2Flogo.png", }, { Name: "should not bypass if the host prefix is same", @@ -76,8 +76,8 @@ func TestGetProxiedImageURL(t *testing.T) { func TestGetUnproxiedImageURL(t *testing.T) { siteURL := "https://mattermost.example.com" - imageURL := "http://www.mattermost.org/wp-content/uploads/2016/03/logoHorizontal.png" - proxiedURL := "https://mattermost.example.com/api/v4/image?url=http%3A%2F%2Fwww.mattermost.org%2Fwp-content%2Fuploads%2F2016%2F03%2FlogoHorizontal.png" + imageURL := "https://mattermost.com/wp-content/uploads/2022/02/logoHorizontal.png" + proxiedURL := "https://mattermost.example.com/api/v4/image?url=https%3A%2F%2Fmattermost.com%2Fwp-content%2Fuploads%2F2022%2F02%2FlogoHorizontal.png" for _, test := range []struct { Name string diff --git a/tests/test-config.json b/tests/test-config.json index 1dd94970fa6..f7320602dbc 100644 --- a/tests/test-config.json +++ b/tests/test-config.json @@ -180,11 +180,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" }, "AnnouncementSettings": { @@ -292,9 +292,9 @@ "LoginButtonTextColor": "" }, "NativeAppSettings": { - "AppDownloadLink": "https://about.mattermost.com/downloads/", - "AndroidAppDownloadLink": "https://about.mattermost.com/mattermost-android-app/", - "IosAppDownloadLink": "https://about.mattermost.com/mattermost-ios-app/" + "AppDownloadLink": "https://mattermost.com/download/", + "AndroidAppDownloadLink": "https://mattermost.com/mattermost-android-app/", + "IosAppDownloadLink": "https://mattermost.com/mattermost-ios-app/" }, "ClusterSettings": { "Enable": false, diff --git a/tests/test-link-preview.md b/tests/test-link-preview.md index 86deab9d09f..fd6561d3396 100644 --- a/tests/test-link-preview.md +++ b/tests/test-link-preview.md @@ -48,6 +48,6 @@ If "Account Settings > Display > Default appearance of image link previews" is s Link 1 example: https://www.yahoo.com/news/panasonic-unveils-solar-roof-may-212400917.html -Link 2 example: https://about.mattermost.com +Link 2 example: https://mattermost.com ```