This repository has been archived by the owner on Mar 13, 2024. It is now read-only.
[Cloud Sync] Merge remote-tracking branch 'origin/master' 2021-09-20 #8895
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Lock CI from master/release-6.0 (#8246) Automatic Merge * MM-36085: Split out System/Team Schemes from license feature checks. (#8211) * MM-36085: Shows the Permissions sysconsole menu item in all cases. Removes feature discovery page. * MM-36085: Remove options that are now available in the system scheme. * MM-36085: Removes unused import. Updates snap. * MM-36085: Updated translations. * MM-36085: Fixes license check. Co-authored-by: Mattermod <mattermod@users.noreply.github.com> * Lock CI back to master. Co-authored-by: Mattermod <mattermod@users.noreply.github.com> Co-authored-by: Claudio Costa <cstcld91@gmail.com> Co-authored-by: Martin Kraft <martinkraft@gmail.com>
* initialize boolean form value as false * consolidate tests and rename form component file * empty commit to run CI
* Translated using Weblate (Hungarian) Currently translated at 21.2% (1021 of 4814 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/hu/ Translated using Weblate (Hungarian) Currently translated at 20.8% (1004 of 4814 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/hu/ Translated using Weblate (Hungarian) Currently translated at 19.1% (920 of 4807 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/hu/ Translated using Weblate (Hungarian) Currently translated at 10.4% (502 of 4807 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/hu/ Translated using Weblate (Hungarian) Currently translated at 100.0% (4807 of 4807 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/hu/ * Translated using Weblate (German) Currently translated at 96.2% (4639 of 4819 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 92.6% (4464 of 4819 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 91.1% (4387 of 4814 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 91.1% (4386 of 4814 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 89.6% (4309 of 4807 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ * Translated using Weblate (German) Currently translated at 96.3% (4638 of 4813 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 96.2% (4633 of 4813 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 96.2% (4639 of 4819 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 92.6% (4464 of 4819 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 91.0% (4387 of 4819 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 91.1% (4386 of 4814 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 89.7% (4316 of 4807 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ * Translated using Weblate (German) Currently translated at 89.7% (4316 of 4807 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ * Translated using Weblate (Turkish) Currently translated at 100.0% (4819 of 4819 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/ Translated using Weblate (Turkish) Currently translated at 100.0% (4814 of 4814 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/ * Translated using Weblate (English (Australia)) Currently translated at 100.0% (4814 of 4814 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/en_AU/ * Translated using Weblate (Bulgarian) Currently translated at 100.0% (4813 of 4813 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/bg/ Translated using Weblate (Bulgarian) Currently translated at 100.0% (4814 of 4814 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/bg/ * 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 (German) Currently translated at 100.0% (4813 of 4813 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 100.0% (4813 of 4813 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 99.9% (4811 of 4813 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 99.3% (4781 of 4813 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 98.8% (4758 of 4813 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 98.0% (4717 of 4813 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 97.4% (4688 of 4813 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 97.0% (4670 of 4813 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 96.9% (4666 of 4813 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 96.4% (4642 of 4813 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Translated using Weblate (German) Currently translated at 96.3% (4638 of 4813 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ * Translated using Weblate (German) Currently translated at 100.0% (4813 of 4813 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: jprusch <rs@schaeferbarthold.de> Co-authored-by: Danny Funkat <danny.funkat@tele-union.de> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com>
…hile webapp is open with CRT on (#8450)
"Thread" h3 title in thread pane is displayed vertically in other languages (e.g: Japanese). This commit fixes that by enlarging the column as much as needed so text won't wrap.
* On initial app load include threads in unreads for teams * Fix types and tests * Fixes per feedback * Innocuous change to trigger build
* Translated using Weblate (German) Currently translated at 100.0% (4813 of 4813 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ * 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 (Turkish) Currently translated at 100.0% (4797 of 4797 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 97.3% (4670 of 4797 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 96.6% (4634 of 4797 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/zh_Hans/ * Translated using Weblate (Dutch) Currently translated at 99.6% (4781 of 4797 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ * Translated using Weblate (English (Australia)) Currently translated at 100.0% (4797 of 4797 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/en_AU/ * Translated using Weblate (German) Currently translated at 100.0% (4797 of 4797 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ * Translated using Weblate (Bulgarian) Currently translated at 100.0% (4797 of 4797 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/bg/ Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: jprusch <rs@schaeferbarthold.de> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com>
* Fixes global threads crash on md images MarkdownImageExpanded needs onImageHeightChanged prop to be defined, this commit adds that, but not using it, since we have fixed height for thread items. * Fixes snapshot tests * Minor refactor
* MM-36765: fixes threads crashing when LEAVE_CHANNEL Leaving a channel removes post items that belong to that channel from posts, but it doesn't remove threads that belong to that channel, so the global threads view crashes. This commit fixes that by removing threads as well upon a LEAVE_CHANNEL action being dispatched. The way entities.threads reducer is structured it wasn't possible to update counts upon LEAVE_CHANNEL action. So this commit refactors combineReducers to a custom function to be able update counts as well. * Minor refactor * Fixes RHS crash when leaving a channel When you leave a channel and a thread belonging to that channel is open in the RHS the app would crash. This commit fixes that crash.
* fix: hide rhs when not open * fix: content height logic
* Standardize name of suggestionListPosition * Fix bad rebase * Added warning around usage of Components
Co-authored-by: Benjamin Cooke <benjamincooke@Benjamins-MacBook-Pro.local>
* MM-36866 - mid month proration changes * Unify the validation for the team name * add the variable product name to the prorated tooltip message * fix issue with ordering and with product not getting selected correctly * do not allow downgrade from user_based to flat_fee * remove isTrial condition for changing subscription product * fix the initial load problem with currentProduct * fix linter issues * load product from global state to cause components rerendering * use useEffect instead of layoutEffect per code review recomendation Co-authored-by: Pablo Velez Vidal <pablo.velez@mattermost.com> Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Automatic Merge
* fix tests due to global header changes * fix tests for v6
* fixed post_header and main menu test cases * Revert "fixed post_header and main menu test cases" This reverts commit 7b8bcc6. * fixed post_header and main menu test cases
* Add A/B test for first time user prewritten message helps. * Define box shadow elevations as CSS variables.. * Track users closing of tutorial tips. * Track users usage of prefilled messages.
* fix for failed tests * fix e2e tests * add types and remove commented step
* Translated using Weblate (French) Currently translated at 90.1% (4289 of 4760 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/fr/ * 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 (Spanish) Currently translated at 97.1% (4619 of 4756 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 99.8% (4766 of 4771 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% (4746 of 4771 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% (4746 of 4756 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ * Translated using Weblate (German) Currently translated at 100.0% (4771 of 4771 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (4771 of 4771 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/hu/ Translated using Weblate (Hungarian) Currently translated at 99.9% (4768 of 4771 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/hu/ * Translated using Weblate (English (Australia)) Currently translated at 99.9% (4768 of 4771 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/en_AU/ * Translated using Weblate (Polish) Currently translated at 74.2% (3542 of 4771 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/pl/ Co-authored-by: Pierre JENICOT <pierre.jenicot@ac-lille.fr> Co-authored-by: Elias Nahum <elias@mattermost.com> Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: jprusch <rs@schaeferbarthold.de> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: master7 <marcin.karkosz@rajska.info>
* Add A/B test for download section * Add missing translations. * Make button text for invite members step conditional.
jwilander
approved these changes
Sep 20, 2021
marianunez
approved these changes
Sep 20, 2021
amyblais
added
4: Reviews Complete
amyblais
added
Changelog/Not Needed
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Merge master into cloud branch for cloud release
Release Note