From 8350f9cbcd16d443cce8d906df051ac7db1c1a7f Mon Sep 17 00:00:00 2001 From: Mattermost Build Date: Mon, 11 Jan 2021 22:30:23 +0100 Subject: [PATCH] Automated cherry pick of #7305 (#7307) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * change super to system (#7076) (#7088) Automatic Merge * MM-20465 Fix for collapse/expand of image preview (#7085) * The toggle function requires id and not post * This was most likely changed to fix a ts error * MM-20465 Revert usage of getCurrentChannel to getCurrentChannelId where possible (#7064) (#7092) (cherry picked from commit 1d7e5e983debaba04883507bccd959a9001c2cff) Co-authored-by: Harrison Healey * Automated cherry pick of #7096 (#7097) (cherry picked from commit 6c35b79ac663756b5e31f0b878531aabec68efd3) Co-authored-by: Maria A Nunez (cherry picked from commit 59cebceb669dec97fc539a3189ebc3eb94966efd) * Automated cherry pick of #7101 (#7104) (cherry picked from commit 0595ff31d9253b13ae6aa973fcb391f47b72f8cf) Co-authored-by: Nick Misasi * MM-30477 Fix for autocomplete not closing (#7093) Automatic Merge * Add GitLab jobs * Translations update from Weblate (#7122) * Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ * Translated using Weblate (Romanian) Currently translated at 93.8% (4121 of 4392 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ro/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 98.9% (4345 of 4392 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/zh_Hans/ * Translated using Weblate (Turkish) Currently translated at 100.0% (4392 of 4392 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/ * Translated using Weblate (Spanish) Currently translated at 97.7% (4292 of 4392 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/es/ * Translated using Weblate (Dutch) Currently translated at 98.8% (4341 of 4392 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ Co-authored-by: Viorel-Cosmin Miron Co-authored-by: aeomin Co-authored-by: Kaya Zeren Co-authored-by: Elias Nahum Co-authored-by: Tom De Moor * Translations update from Weblate (#7139) * Translated using Weblate (Spanish) Currently translated at 99.1% (4357 of 4393 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/es/ * Translated using Weblate (Dutch) Currently translated at 98.8% (4344 of 4393 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ * Translated using Weblate (Dutch) Currently translated at 98.9% (4349 of 4393 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 98.4% (4327 of 4393 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/pt_BR/ Co-authored-by: Elias Nahum Co-authored-by: Tom De Moor Co-authored-by: rodrigocorsi * Merge latest master into cloud branch for next release (#7144) * DOPS-243 (#7075) DOPS-243 (#7075) * [GH-13483] Migrate 'components/channel_invite_modal' module and associated tests to TypeScript (#6968) * [WIP] migration to typescript * [WIP] further typescript changes * finalized move of component to typescript * [WIP] move index file to typescript * updated test to typescript * fix for types in index file * removed failing class import * [No Ticket] Update to latest redux hash and fixing test cases with missing types (#7084) Automatic Merge * [MM-27154] Cypress tests: Incoming Webhooks (#6977) * Incoming webhooks cypress tests * Remove unused variable * PR feedback * add license * PR feedback and lint * fix import path Co-authored-by: Saturnino Abril Co-authored-by: Mattermod Co-authored-by: Saturnino Abril * fix failing tests due to announcement bar (#7077) * MM-27315 Cypress tests for Integrations > Slash command auto-complete (7 test cases) (#6909) * MM-30359: Cypress/E2E: Account Settings > Email (#7051) * MM-30359: Cypress/E2E: Account Settings > Email This PR automates the following test cases: MM-T2066 MM-T2067 MM-T2068 MM-T2069 MM-T2070 MM-T2071 MM-T2072 MM-T2073 https://mattermost.atlassian.net/browse/MM-30359 ```release-note NONE ``` * fix lint * add the other tests * Address review comments Co-authored-by: Mattermod * [MM-T561] Add e2e test for MM-T561 (#7015) * Add e2e test Add test for: Browser tab and team sidebar - direct messages don't add indicator on team icon in team sidebar (but do in browser tab) Github Issues: Fix https://github.com/mattermost/mattermost-server/issues/15700 Jira Ticket: MM-T561 * Apply suggested review * Add cleanup for MM-T560_2 * Linting * Separate test file * Linting * Add prerequisite * Rename file * Remove old test Co-authored-by: Mattermod * [MM-28255] Add tests for OAuth Apps (#6558) * Add tests for OAuth Apps * Add remaining tests * Update test names, fix typos and add explicit status codes * Add group and license check * Move tests to enterprise folder Co-authored-by: Mattermod * MM-29858: Migrate string refs to functional ones in autosize textarea component (#6885) * MM-29858: Migrate string refs to functional ones in autosize textarea component * MM-29858: Rename reference instance variable with suffix Ref * MM-29858: Use camel casing for textarea reference variable * MM-29858: Allow empty value for textarea Co-authored-by: Mattermod * Migrate errorMessage string ref (#6882) Automatic Merge * MM-T329 Image link preview (#7005) * wip * wip * finished * revision * remove log Co-authored-by: Mattermod * [MM-28150] e2e: add MM-T924, MM-T928, MM-T929, MM-T930 (#7045) * e2e: add MM-T924, MM-T928, MM-T929, MM-T930 * reflect review comments Co-authored-by: Mattermod * MM-30363: Cypress/E2E: Automate backlogs - Edit Bot Username (1 test case) (#7073) * MM-30373 - first iteration * MM-30377 - first iteration * remove spurious file * MM-30377 - further iteration * MM-30363 - first iteration * remove extra file * some cleanup * remoe extra space Co-authored-by: Catalin Tomai Co-authored-by: Mattermod * promote and demote tests to/from prod (#7080) * Cypress/E2E: Fix toast appears unread spec (#7081) * change super to system (#7076) * MM-20418: Migrate 'components/channel_selector_modal' module and associated tests to TypeScript (#6975) * DOPS-243: Fix images (#7089) DOPS-243: Fix images (#7089) * MM-T439 Town Square is not marked as unread for existing users when a new user is added to the team (#7053) Automatic Merge * [MM-20582] Migrate 'components/admin_console/team_channel_settings/ch… (#6840) * MM-20465 Fix for collapse/expand of image preview (#7085) * The toggle function requires id and not post * This was most likely changed to fix a ts error * MM-20465 Revert usage of getCurrentChannel to getCurrentChannelId where possible (#7064) * [MM-29821] Prefer TypeScript files over JavaScript in webpack (#7090) * [MM-30317] add MANAGE_REMOTE_CLUSTERS permission (#7060) * add MANAGE_REMOTE_CLUSTERS permission * Update i18n/en.json Co-authored-by: Doug Lauder Co-authored-by: Doug Lauder * MM-20416: Migrate 'components/channel_header_mobile/collapse_lhs_button' module to TypeScript (#6971) Co-authored-by: Mattermod * Remove Cloud billing flag from System Console (#7096) (cherry picked from commit 6c35b79ac663756b5e31f0b878531aabec68efd3) Co-authored-by: Maria A Nunez * Translations update from Weblate (#7100) * Translated using Weblate (Turkish) Currently translated at 100.0% (4390 of 4390 strings) Translation: mattermost-languages-shipped/mattermost-webapp_master Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/ Translated using Weblate (Turkish) Currently translated at 100.0% (4329 of 4329 strings) Translation: mattermost-languages-shipped/mattermost-webapp_master Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/ * Translated using Weblate (German) Currently translated at 90.4% (3915 of 4329 strings) Translation: mattermost-languages-shipped/mattermost-webapp_master Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ * Translated using Weblate (Korean) Currently translated at 80.1% (3468 of 4329 strings) Translation: mattermost-languages-shipped/mattermost-webapp_master Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ko/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.9% (4328 of 4329 strings) Translation: mattermost-languages-shipped/mattermost-webapp_master Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/pt_BR/ * Translated using Weblate (Russian) Currently translated at 95.0% (4113 of 4329 strings) Translation: mattermost-languages-shipped/mattermost-webapp_master Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ru/ * Translated using Weblate (Dutch) Currently translated at 98.5% (4328 of 4390 strings) Translation: mattermost-languages-shipped/mattermost-webapp_master Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ Translated using Weblate (Dutch) Currently translated at 98.4% (4322 of 4390 strings) Translation: mattermost-languages-shipped/mattermost-webapp_master Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 96.7% (4246 of 4390 strings) Translation: mattermost-languages-shipped/mattermost-webapp_master Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/zh_Hans/ * Translated using Weblate (Romanian) Currently translated at 93.8% (4119 of 4390 strings) Translation: mattermost-languages-shipped/mattermost-webapp_master Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ro/ Translated using Weblate (Romanian) Currently translated at 92.7% (4072 of 4390 strings) Translation: mattermost-languages-shipped/mattermost-webapp_master Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ro/ * Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-webapp_master Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ * Translated using Weblate (Dutch) Currently translated at 98.5% (4325 of 4390 strings) Translation: mattermost-languages-shipped/mattermost-webapp_master Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ Co-authored-by: Kaya Zeren Co-authored-by: Elisabeth Kulzer Co-authored-by: Ji-Hyeon Gim Co-authored-by: rodrigocorsi Co-authored-by: Alexey Napalkov Co-authored-by: Tom De Moor Co-authored-by: aeomin Co-authored-by: Viorel-Cosmin Miron * Migrate 'components/announcement_bar/default_announcement_bar' module and associated tests to TypeScript (#6963) * rename file * working except for test file * restore unincluded test file to jsx * pass npm make check * update snapshot * respond to review comments * checkout package-lock.json * revert package-lock.json changes * fix linting errors Co-authored-by: Mattermod * Migrate this.ref.dotMenu to functional (#6957) * Migrate this.ref.dotMenu to functional * Fixed formatting * Fix reference * rename dotMenu to dotMenuRef for consistency with other PRs, remove comments * Removed blanked line to pass lint check Co-authored-by: root Co-authored-by: Mattermod * MM-20897 Add category muting (#7033) * MM-20897 Add ability to mute categories * Increase timeout to ensure test passes * Add E2E test for moving channels into muted categories * Update mattermost-redux to branch * Fix unit tests * Fix types * Update snapshot * asdf * Add additional E2E test and API client infrastructure * MM-24293 Fix to have group channels return in quick switcher with space (#7059) * MM-24293 Fix to have group channels return in quick siwchter with space * Split the search term by spaces and match with users in group channels * Update components/suggestion/switch_channel_provider.jsx Co-authored-by: Guillermo Vayá Co-authored-by: Guillermo Vayá Co-authored-by: Mattermod * If card year is 0 return false for isExpired (#7101) * Converted 'dot_menu' to typescript. (#6825) * Migrate string refs of reset password modal (#7038) Automatic Merge * MM-20415 Migrate 'components/channel_header_mobile/unmute_channel_button' module and associated tests to TypeScript (#6972) * MM-30477 Fix for autocomplete not closing (#7093) Automatic Merge * MM-20897 Cleanup a couple missed issues (#7106) * MM-T638 Webhook posts when webhook creator is not a member of the channel (#7091) * wip * wip * wip * wip * added check * small fix * fix Co-authored-by: Mattermod * [MM-20481] Migrate 'components/post_view/post_body_additional_content' module and associated tests to TypeScript (#6668) * [MM-20481] Migrate 'components/post_view/post_body_additional_content' module and associated tests to TypeScript Fixes https://github.com/mattermost/mattermost-server/issues/15460 JIRA: https://mattermost.atlassian.net/browse/MM-20481 * Make actions attribute non nullable * Require YoutubeVideo's postId property since it really is * Fix tests * Add stages for onprem * Add build-vars stage * set isDisabled prop for site > notices (#7103) Automatic Merge * [MM-27931][MM-30158] Multi-selection and dragging of channels (#6979) * [MM-27931] Multiselection of channels * Test fix * Lint fix * Change opacity of selected state to 0.24 * Added hover state for selected channels * Tests for multiSelect * Drag and drop working (without visuals, missing redux commit) * Multi drag and drop styles (fade the selected channels, might change) * Don't allow multisellected channels to be dropped where they shouldn't be * Lint, type, test, translation fixes * Allow dragging of non matching channel groups by rejecting the channels that don't match * Redux update * Another test fix * Fixed selected count style to work off of center channel exclusively * Added really obvious styling * Style change/PR feedback * Style change * Include active channel in all initial selections * PR feedback * Add constant for shifted index Co-authored-by: Mattermod * [MM-20572] Migrate 'components/admin_console/compliance_reports' to TypeScript (#13500) (#7036) Automatic Merge * MM-30087 Remove direct dependency between Client4 and Rudder (#7056) * MM-30087 Remove direct dependency between Client4 and Rudder * Update tests * Switch mattermost-redux to master * Fix missing types * Change how we mock and import rudder * Remove test that checks if events are sent to Rudder * [MM_20423]'external_image'module to ts (#16151) (#7025) - migrate ts index.js file - migrate ts for external_image.tsx - migrate ts for external_images.test.jsx Co-authored-by: Hossein Ahmadian-Yazdi * Fix issue 16144: migrate components/claim module and tests to TypeScript (#7043) Automatic Merge * MM-T2056 e2e to test, Username change reflecting for other users (#7074) Co-authored-by: Mattermod * [MM-26334] Fixes direct messages loading screen misalignment (#6813) Summary: Reduces the height of the loading screen so it is more centered and/or unintrusive(small screens) enough to remove the scroll bar during loading. Ticket Link: Fixes https://github.com/mattermost/mattermost-server/issues/15926 * Translations update from Weblate (#7122) * Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ * Translated using Weblate (Romanian) Currently translated at 93.8% (4121 of 4392 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ro/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 98.9% (4345 of 4392 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/zh_Hans/ * Translated using Weblate (Turkish) Currently translated at 100.0% (4392 of 4392 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/ * Translated using Weblate (Spanish) Currently translated at 97.7% (4292 of 4392 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/es/ * Translated using Weblate (Dutch) Currently translated at 98.8% (4341 of 4392 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ Co-authored-by: Viorel-Cosmin Miron Co-authored-by: aeomin Co-authored-by: Kaya Zeren Co-authored-by: Elias Nahum Co-authored-by: Tom De Moor * MM-28153: Cypress/E2E: Automate backlogs - System Console > Environment (8 test cases) (#7049) * MM-30377: Cypress/E2E: Automate backlogs - Messaging > Channel and Post Links (6 test cases) (#7072) * MM-30355: Cypress/E2E: Automate backlogs - Account Settings > Username (6 test cases) (#7062) * MM-27208 Add tests for MM-T1684, MM-T1687, and MM-T1688 (#7124) * MM-27208 MM-T1684 Add test number to existing test case * Fix makeClient for requests without a body * MM-27208 MM-T1687 Add test for another user archiving a channel * MM-27208 MM-T1688 Add test for searching in archived channels * Translations update from Weblate (#7139) * Translated using Weblate (Spanish) Currently translated at 99.1% (4357 of 4393 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/es/ * Translated using Weblate (Dutch) Currently translated at 98.8% (4344 of 4393 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ * Translated using Weblate (Dutch) Currently translated at 98.9% (4349 of 4393 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 98.4% (4327 of 4393 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/pt_BR/ Co-authored-by: Elias Nahum Co-authored-by: Tom De Moor Co-authored-by: rodrigocorsi Co-authored-by: Elisabeth Kulzer Co-authored-by: Tobias Weichart Co-authored-by: Hossein Ahmadian-Yazdi Co-authored-by: Michael Kochell <6913320+mickmister@users.noreply.github.com> Co-authored-by: Mattermod Co-authored-by: Saturnino Abril Co-authored-by: Jason Frerich Co-authored-by: Agniva De Sarker Co-authored-by: seongwon-kang <56567660+seongwon-kang@users.noreply.github.com> Co-authored-by: Daniel Espino García Co-authored-by: sowmiyamuthuraman <32141844+sowmiyamuthuraman@users.noreply.github.com> Co-authored-by: Sridhar Co-authored-by: Michael Leonard Co-authored-by: Ibrahim Serdar Acikgoz Co-authored-by: catalintomai <56169943+catalintomai@users.noreply.github.com> Co-authored-by: Catalin Tomai Co-authored-by: Joseph Baylon Co-authored-by: Revanth M <7revanth47@gmail.com> Co-authored-by: Clément Collin Co-authored-by: Sudheer Co-authored-by: Harrison Healey Co-authored-by: Devin Binnie <52460000+devinbinnie@users.noreply.github.com> Co-authored-by: Doug Lauder Co-authored-by: Mattermost Build Co-authored-by: Maria A Nunez Co-authored-by: Weblate (bot) Co-authored-by: Kaya Zeren Co-authored-by: Elisabeth Kulzer Co-authored-by: Ji-Hyeon Gim Co-authored-by: rodrigocorsi Co-authored-by: Alexey Napalkov Co-authored-by: Tom De Moor Co-authored-by: aeomin Co-authored-by: Viorel-Cosmin Miron Co-authored-by: Morgan Connolly Co-authored-by: Ekaterina Grinberg <46496977+egrinberg@users.noreply.github.com> Co-authored-by: root Co-authored-by: Guillermo Vayá Co-authored-by: Nick Misasi Co-authored-by: Vijay Raghavan Aravamudhan Co-authored-by: Nicolas Le Cam Co-authored-by: Daniel Shuy Co-authored-by: dizkek <41262168+dizkek@users.noreply.github.com> Co-authored-by: Hossein Ahmadian-Yazdi Co-authored-by: Luciano Lim Co-authored-by: Elias Nahum * MM-30972 Add proper padding to code preview line numbers (#7155) (#7167) Automatic Merge * Automated cherry pick of #7133 (#7178) * Drop aria-label from Marketplace item description * Add general aria-label (cherry picked from commit 01b80cabcfb8fc6155139e2d243abdaf5010cd99) Co-authored-by: Ben Schumacher * Update NOTICE.txt (#7102) (#7179) Automatic Merge * Automated cherry pick of #7183 (#7184) (cherry picked from commit 22793b4cb49d3114a5ff2330370cef62af22f46f) Co-authored-by: Maria A Nunez * Translations update from Weblate (#7182) * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.9% (4390 of 4391 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/pt_BR/ Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (4383 of 4391 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/pt_BR/ Translated using Weblate (Portuguese (Brazil)) Currently translated at 98.9% (4344 of 4391 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/pt_BR/ Translated using Weblate (Portuguese (Brazil)) Currently translated at 98.9% (4346 of 4393 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/pt_BR/ * Translated using Weblate (Romanian) Currently translated at 100.0% (4391 of 4391 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ro/ Translated using Weblate (Romanian) Currently translated at 100.0% (4391 of 4391 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ro/ Translated using Weblate (Romanian) Currently translated at 100.0% (4393 of 4393 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ro/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 99.9% (4390 of 4391 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/zh_Hans/ Translated using Weblate (Chinese (Simplified)) Currently translated at 99.2% (4356 of 4391 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/zh_Hans/ Translated using Weblate (Chinese (Simplified)) Currently translated at 99.1% (4356 of 4393 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/zh_Hans/ * Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ * Translated using Weblate (Dutch) Currently translated at 99.9% (4390 of 4391 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ Translated using Weblate (Dutch) Currently translated at 99.2% (4359 of 4391 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ * Translated using Weblate (Japanese) Currently translated at 99.9% (4390 of 4391 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ja/ * Translated using Weblate (Russian) Currently translated at 93.9% (4125 of 4391 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ru/ * Translated using Weblate (Turkish) Currently translated at 100.0% (4391 of 4391 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/ Co-authored-by: rodrigocorsi Co-authored-by: Viorel-Cosmin Miron Co-authored-by: aeomin Co-authored-by: Tom De Moor Co-authored-by: kaakaa Co-authored-by: Lev Co-authored-by: Kaya Zeren * Translations update from Weblate (#7220) * Translated using Weblate (French) Currently translated at 93.2% (4096 of 4391 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/fr/ * Translated using Weblate (Dutch) Currently translated at 99.9% (4424 of 4425 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ Translated using Weblate (Dutch) Currently translated at 99.7% (4413 of 4425 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ Translated using Weblate (Dutch) Currently translated at 99.4% (4401 of 4425 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ Translated using Weblate (Dutch) Currently translated at 99.2% (4393 of 4425 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ Translated using Weblate (Dutch) Currently translated at 99.2% (4389 of 4424 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ Translated using Weblate (Dutch) Currently translated at 99.9% (4390 of 4391 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ * Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ * Translated using Weblate (Romanian) Currently translated at 100.0% (4424 of 4424 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ro/ * Translated using Weblate (Spanish) Currently translated at 99.3% (4397 of 4425 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/es/ Translated using Weblate (Spanish) Currently translated at 98.7% (4368 of 4425 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/es/ Translated using Weblate (Spanish) Currently translated at 98.4% (4357 of 4424 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/es/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.9% (4424 of 4425 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/pt_BR/ Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.2% (4390 of 4424 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/pt_BR/ * Translated using Weblate (Turkish) Currently translated at 100.0% (4425 of 4425 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 99.9% (4424 of 4425 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/zh_Hans/ * Translated using Weblate (Spanish) Currently translated at 99.9% (4424 of 4425 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/es/ Co-authored-by: wget Co-authored-by: Tom De Moor Co-authored-by: Viorel-Cosmin Miron Co-authored-by: Elias Nahum Co-authored-by: rodrigocorsi Co-authored-by: Kaya Zeren Co-authored-by: aeomin * MM-31275 New sidebar performance improvements (#7207) (#7240) Automatic Merge * MM-31466 Performance investigation part two (cloud) (#7245) Automatic Merge * Translations update from Weblate (#7273) * Translated using Weblate (German) Currently translated at 88.6% (3921 of 4425 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ * Translated using Weblate (Romanian) Currently translated at 100.0% (4426 of 4426 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ro/ Translated using Weblate (Romanian) Currently translated at 100.0% (4425 of 4425 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ro/ * Translated using Weblate (Korean) Currently translated at 78.3% (3469 of 4425 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ko/ Translated using Weblate (Korean) Currently translated at 78.3% (3468 of 4425 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ko/ * Translated using Weblate (Ukrainian) Currently translated at 72.0% (3190 of 4425 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/uk/ Translated using Weblate (Ukrainian) Currently translated at 72.0% (3190 of 4425 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/uk/ Translated using Weblate (Ukrainian) Currently translated at 72.0% (3189 of 4425 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/uk/ * Translated using Weblate (German) Currently translated at 88.7% (3930 of 4426 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ * Translated using Weblate (Dutch) Currently translated at 99.9% (4425 of 4426 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ * Translated using Weblate (Turkish) Currently translated at 100.0% (4426 of 4426 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 99.9% (4425 of 4426 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/zh_Hans/ * Translated using Weblate (Spanish) Currently translated at 99.9% (4425 of 4426 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/es/ * Translated using Weblate (Japanese) Currently translated at 99.9% (4423 of 4426 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ja/ * Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ * Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ * Translated using Weblate (Japanese) Currently translated at 99.9% (4422 of 4423 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ja/ Co-authored-by: Elisabeth Kulzer Co-authored-by: Viorel-Cosmin Miron Co-authored-by: Lee Dae-yeop Co-authored-by: Ivan Novikov Co-authored-by: AxicsHD Co-authored-by: Tom De Moor Co-authored-by: Kaya Zeren Co-authored-by: aeomin Co-authored-by: Elias Nahum Co-authored-by: kaakaa * MM-31697- Remove OpenId from System Console (#7278) (#7294) Automatic Merge * [MM-31580] Fix call to getChannel to use new parameter format (#7284) (#7300) (cherry picked from commit 77a9c3cefade1d1195e8cb6997484fa7370dc622) Co-authored-by: Devin Binnie <52460000+devinbinnie@users.noreply.github.com> * MM-31189 Revert New Messages toast PRs (#7292) (#7301) Automatic Merge * [MM-31708][MM-31726][MM-31739][MM-31727] - Fix regressions in RHS and Status menu (#7290) (#7302) Automatic Merge * Add onClick event to button so banner button works for cloud * Change to onButtonClick * Reset changes for package-lock * Put showModal back in case its used elsewhere * Fix invocation * Fix payment_announcement_bar * Reset 2 files to master Co-authored-by: Mattermost Build Co-authored-by: Sudheer Co-authored-by: Harrison Healey Co-authored-by: Elisabeth Kulzer Co-authored-by: Weblate (bot) Co-authored-by: Viorel-Cosmin Miron Co-authored-by: aeomin Co-authored-by: Kaya Zeren Co-authored-by: Elias Nahum Co-authored-by: Tom De Moor Co-authored-by: rodrigocorsi Co-authored-by: Joram Wilander Co-authored-by: Tobias Weichart Co-authored-by: Hossein Ahmadian-Yazdi Co-authored-by: Michael Kochell <6913320+mickmister@users.noreply.github.com> Co-authored-by: Mattermod Co-authored-by: Saturnino Abril Co-authored-by: Jason Frerich Co-authored-by: Agniva De Sarker Co-authored-by: seongwon-kang <56567660+seongwon-kang@users.noreply.github.com> Co-authored-by: Daniel Espino García Co-authored-by: sowmiyamuthuraman <32141844+sowmiyamuthuraman@users.noreply.github.com> Co-authored-by: Sridhar Co-authored-by: Michael Leonard Co-authored-by: Ibrahim Serdar Acikgoz Co-authored-by: catalintomai <56169943+catalintomai@users.noreply.github.com> Co-authored-by: Catalin Tomai Co-authored-by: Joseph Baylon Co-authored-by: Revanth M <7revanth47@gmail.com> Co-authored-by: Clément Collin Co-authored-by: Devin Binnie <52460000+devinbinnie@users.noreply.github.com> Co-authored-by: Doug Lauder Co-authored-by: Maria A Nunez Co-authored-by: Elisabeth Kulzer Co-authored-by: Ji-Hyeon Gim Co-authored-by: Alexey Napalkov Co-authored-by: Morgan Connolly Co-authored-by: Ekaterina Grinberg <46496977+egrinberg@users.noreply.github.com> Co-authored-by: root Co-authored-by: Guillermo Vayá Co-authored-by: Vijay Raghavan Aravamudhan Co-authored-by: Nicolas Le Cam Co-authored-by: Daniel Shuy Co-authored-by: dizkek <41262168+dizkek@users.noreply.github.com> Co-authored-by: Hossein Ahmadian-Yazdi Co-authored-by: Luciano Lim Co-authored-by: Ben Schumacher Co-authored-by: kaakaa Co-authored-by: Lev Co-authored-by: wget Co-authored-by: Lee Dae-yeop Co-authored-by: Ivan Novikov Co-authored-by: AxicsHD (cherry picked from commit c4f2c4d62075929039fcd167377aed6c72b3307c) Co-authored-by: Nick Misasi --- .../cloud_announcement_bar/user_limit_announcement_bar.tsx | 2 +- .../default_announcement_bar/announcement_bar.tsx | 4 +++- .../payment_announcement_bar/payment_announcement_bar.tsx | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/components/announcement_bar/cloud_announcement_bar/user_limit_announcement_bar.tsx b/components/announcement_bar/cloud_announcement_bar/user_limit_announcement_bar.tsx index c894ee5d2eed..aced378f6839 100644 --- a/components/announcement_bar/cloud_announcement_bar/user_limit_announcement_bar.tsx +++ b/components/announcement_bar/cloud_announcement_bar/user_limit_announcement_bar.tsx @@ -164,7 +164,7 @@ export default class UserLimitAnnouncementBar extends React.PureComponent type={dismissable ? AnnouncementBarTypes.ADVISOR : AnnouncementBarTypes.CRITICAL_LIGHT} showCloseButton={dismissable} handleClose={this.handleClose} - showModal={this.showModal} + onButtonClick={this.showModal} modalButtonText={t('admin.billing.subscription.upgradeMattermostCloud.upgradeButton')} modalButtonDefaultText={'Upgrade Mattermost Cloud'} message={dismissable ? t('upgrade.cloud_banner_reached') : t('upgrade.cloud_banner_over')} diff --git a/components/announcement_bar/default_announcement_bar/announcement_bar.tsx b/components/announcement_bar/default_announcement_bar/announcement_bar.tsx index 0c8e88b110dc..5f1ea279e2ee 100644 --- a/components/announcement_bar/default_announcement_bar/announcement_bar.tsx +++ b/components/announcement_bar/default_announcement_bar/announcement_bar.tsx @@ -27,8 +27,9 @@ type Props = { type: string; message: React.ReactNode; handleClose?: (e?: any) => void; + showModal?: boolean; announcementBarCount?: number; - showModal?: (() => void) | boolean; + onButtonClick?: () => void; modalButtonText?: string; modalButtonDefaultText?: string; showLinkAsButton: boolean; @@ -178,6 +179,7 @@ export default class AnnouncementBar extends React.PureComponent { this.props.showLinkAsButton &&