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-08-02 #8514
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
* ci/test: add NODE_OPTIONS max_old_space_size=500 * update gitlab to use the same
* Re-add cross-env to set test timezone * Update package-lock.json again * Update CI to Node 16 * Add workspaces section to package.json * Update package-lock.json * Close empty brackets
Summary Update webapp to pass collapsed_threads_supported parameters to the server API to indicate that the webapp supports collapsed reply threads. Update webapp to correctly mark channels and threads as unread/read. Ticket Link https://mattermost.atlassian.net/browse/MM-34758 Related Pull Requests Has server changes: mattermost/mattermost#17424
* MM-35435 - add multiple sku options to purchase modal * MM-35435 - add multiple sku options to purchase modal * add initial logic to update the subscription price * dictionary changes * refactor the api endpoint call * add the right api call * linter changes * remove unnecessary code * add the right productId * fix types problems * first fixes to MR comments * add unit test to radio button group * remove unnecessary space, organize styles * fix linter and types problem, use the current subscription product id * fix snapshots * Revert "fix snapshots" This reverts commit f7dbe85. * improve the findProduct function * reorganize return value * style improvements based on UX feedback Co-authored-by: Pablo Velez Vidal <pablo.velez@mattermost.com> Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Remove max-lines warning in test files * MM-35838/MM-35923 Fix memoization of makeGetChannelIdsForCategory when channel order changes * MM-35838/MM-35923 Fix memoization of getChannelsNameMapInCurrentTeam when channels change * Clarify memoization pattern * Add getChannelNameToDisplayNameMap for channel linking in Markdown * Remove unused type
…ou) is present (#7984) * to ts * added the fix * revert 1 * revert 2 * rvert 3 * revr 4 * rever 5 * req changes * added tests
* Clarify Add Member to Channel Hint Text When adding members to a channel, the existing hint text ambiguously suggests that a maximum of 20 members can be added to a given channel. Updated hint text to note that users can add up to 20 members at a time to the channel. * Update MultiSelect to support new text Co-authored-by: Harrison Healey <harrisonmhealey@gmail.com>
Removes comment count from post info component. Justification: we show it in root post's thread footer.
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* test * Update e2e/cypress/integration/scroll/image_aspect_ratio_spec.js Co-authored-by: Saturnino Abril <saturnino.abril@gmail.com>
* Translated using Weblate (French) Currently translated at 90.9% (4307 of 4737 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/fr/ * Translated using Weblate (Turkish) Currently translated at 100.0% (4757 of 4757 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% (4756 of 4756 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% (4737 of 4737 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/ * Translated using Weblate (Swedish) Currently translated at 100.0% (4757 of 4757 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/sv/ Translated using Weblate (Swedish) Currently translated at 100.0% (4737 of 4737 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/sv/ * Translated using Weblate (Hungarian) Currently translated at 99.2% (4701 of 4737 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 83.0% (3949 of 4757 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 83.0% (3952 of 4756 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 (Dutch) Currently translated at 100.0% (4757 of 4757 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% (4732 of 4757 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ * Translated using Weblate (Polish) Currently translated at 77.3% (3679 of 4757 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/pl/ * Translated using Weblate (Bulgarian) Currently translated at 100.0% (4757 of 4757 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/bg/ * Translated using Weblate (French) Currently translated at 90.4% (4305 of 4757 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/fr/ Co-authored-by: wget <william@gathoye.be> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: MArtin Johnson <martinjohnson@bahnhof.se> Co-authored-by: Zsolt Godó <zsolttokio@gmail.com> Co-authored-by: Elisabeth Kulzer <elisabeth.kulzer@mattermost.com> Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: Michał Sobkiewicz <perceptron8@gmail.com> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: Pierre JENICOT <pierre.jenicot@ac-lille.fr>
Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com>
…ers on drag (#8157) Automatic Merge
Automatic Merge
* MM-35435 - add multiple sku options to purchase modal * MM-35435 - add multiple sku options to purchase modal * add initial logic to update the subscription price * dictionary changes * refactor the api endpoint call * add the right api call * linter changes * remove unnecessary code * add the right productId * fix types problems * first fixes to MR comments * add unit test to radio button group * remove unnecessary space, organize styles * fix linter and types problem, use the current subscription product id * fix snapshots * Revert "fix snapshots" This reverts commit f7dbe85. * improve the findProduct function * reorganize return value * style improvements based on UX feedback * MM-35835 - show cc info in purchase modal * fix i18n texts * show the billing address information in the purchase form * add the badge and select the next upgrade product * fix styles and translations * add PR review comments * add space between title and checkboxes * rename the selectedProduct variable Co-authored-by: Pablo Velez Vidal <pablo.velez@mattermost.com> Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Pablo Velez Vidal <pablo.velez@mattermost.com>
* Translated using Weblate (Dutch) Currently translated at 100.0% (4760 of 4760 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/ Translated using Weblate (French) Currently translated at 90.4% (4305 of 4757 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/fr/ * Added translation using Weblate (English (Australia)) * Translated using Weblate (Turkish) Currently translated at 100.0% (4760 of 4760 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/ * Translated using Weblate (Swedish) Currently translated at 100.0% (4760 of 4760 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/sv/ * Translated using Weblate (English (Australia)) Currently translated at 100.0% (4760 of 4760 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/en_AU/ Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: MArtin Johnson <martinjohnson@bahnhof.se> Co-authored-by: matthew-w <matthew-w@somehting.au>
Co-authored-by: Manoj <manoj@brightscout.com>
* assume enableThunk is never false * drop unused clientOptions * inline createMiddleware * collapse prod/dev configureStore * typescript magic * redux-devtools-extension/developmentOnly * fix linting
* Add Cypress test for MM-T3080 * MM-T3080 fix lint issues * Login smoke test codereview fixes * Update e2e/cypress/integration/signin_authentication/login_logout_smoke_spec.js Co-authored-by: Saturnino Abril <saturnino.abril@gmail.com> * Update e2e/cypress/integration/signin_authentication/login_logout_smoke_spec.js Co-authored-by: Saturnino Abril <saturnino.abril@gmail.com> * Update e2e/cypress/integration/signin_authentication/login_logout_smoke_spec.js Co-authored-by: Saturnino Abril <saturnino.abril@gmail.com> * Update e2e/cypress/integration/signin_authentication/login_logout_smoke_spec.js Co-authored-by: Saturnino Abril <saturnino.abril@gmail.com> * Remove extra spaces * Update e2e/cypress/integration/signin_authentication/login_logout_smoke_spec.js Co-authored-by: Saturnino Abril <saturnino.abril@gmail.com> * Update e2e/cypress/integration/signin_authentication/login_logout_smoke_spec.js Co-authored-by: Saturnino Abril <saturnino.abril@gmail.com> * Update e2e/cypress/integration/signin_authentication/login_logout_smoke_spec.js Co-authored-by: Saturnino Abril <saturnino.abril@gmail.com> * Update e2e/cypress/integration/signin_authentication/login_logout_smoke_spec.js Co-authored-by: Saturnino Abril <saturnino.abril@gmail.com> * Adding test for MM-T2372 Deleting * Update e2e/cypress/integration/scroll/deleting_scroll_spec.js Co-authored-by: Joseph Baylon <joseph.baylon@mattermost.com> * Update e2e/cypress/integration/scroll/deleting_scroll_spec.js Co-authored-by: Joseph Baylon <joseph.baylon@mattermost.com> * Update e2e/cypress/integration/scroll/deleting_scroll_spec.js Co-authored-by: Joseph Baylon <joseph.baylon@mattermost.com> * Update e2e/cypress/integration/scroll/deleting_scroll_spec.js Co-authored-by: Joseph Baylon <joseph.baylon@mattermost.com> * Update e2e/cypress/integration/scroll/deleting_scroll_spec.js Co-authored-by: Joseph Baylon <joseph.baylon@mattermost.com> * Update e2e/cypress/integration/scroll/deleting_scroll_spec.js Co-authored-by: Joseph Baylon <joseph.baylon@mattermost.com> * Update e2e/cypress/integration/scroll/deleting_scroll_spec.js Co-authored-by: Joseph Baylon <joseph.baylon@mattermost.com> * resolve conflicts Co-authored-by: Yulyana <yulyana@phntms.com> Co-authored-by: Saturnino Abril <saturnino.abril@gmail.com> Co-authored-by: Joseph Baylon <joseph.baylon@mattermost.com>
…address should not disappear (#8175) * test * rewrote the test * Update e2e/cypress/integration/system_console/user_management/users_deactivation_spec.js Co-authored-by: Joseph Baylon <joseph.baylon@mattermost.com> Co-authored-by: Joseph Baylon <joseph.baylon@mattermost.com>
#8178) * test * Update e2e/cypress/integration/messaging/message_bullets_spec.js Co-authored-by: Saturnino Abril <saturnino.abril@gmail.com> Co-authored-by: Saturnino Abril <saturnino.abril@gmail.com>
`parent_id` has been deprecated.
* fix whitespace in refresh bar
* fixed test cases * replace cy.get * replace_cy.get
pvev
approved these changes
Aug 2, 2021
There was a problem hiding this comment.
hey @isacikgoz heads up that Maria Nuñez is on vacation this week. Not sure if this needs to be validated by a lead or otherwise you can change the reviewer from Maria to @AGMETEOR
AGMETEOR
reviewed
Aug 3, 2021
i18n/nl.json
Outdated
| @@ -4217,7 +4217,7 @@ | |||
| "status_dropdown.set_online": "Online", | |||
| "status_dropdown.set_ooo": "Out Of Office", | |||
| "status_dropdown.set_ooo.extra": "Automatische Antwoorden zijn ingeschakeld", | |||
| "status_dropdown.set_your_status": "Stel je status in", | |||
| "status_dropdown.set_your_status": "Status", | |||
There was a problem hiding this comment.
Wondering if this is an intentional change?
There was a problem hiding this comment.
I changed the base, this change was due to that. Can you check again?
e2e/package-lock.json
Outdated
| @@ -21578,17 +21578,6 @@ | |||
| "mochawesome-report-generator": "^5.2.0", | |||
| "strip-ansi": "^6.0.0", | |||
| "uuid": "^8.3.2" | |||
| }, | |||
There was a problem hiding this comment.
Wondering if this is an intentional change
|
@AGMETEOR Kind reminder for PR review. |
jwilander
approved these changes
Aug 4, 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