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-16 #8598
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
* MM-36066 - open cloud pricing link in new tab * fix translation file reference Co-authored-by: Pablo Velez Vidal <[email protected]>
* Update NOTICE.txt * Update NOTICE.txt
* adding action tests for data retention * adding more tests for reducers Co-authored-by: Benjamin Cooke <[email protected]>
… one after the other (#8198) * Fix plugin buttons on the LHS showing one below the other, instead of one after the other * Fix snapshots
* Adding English Australian to translated languages Co-authored-by: Tom De Moor <[email protected]> Co-authored-by: Mattermod <[email protected]> Co-authored-by: Elisabeth Kulzer <[email protected]>
…ads (#8209) * Update participants for root post for newly received posts * Correctly update reply count for unfollowed threads * Fix unit tests * Fix lint issues * Do not delete unfollowed threads and instead keep data for unfollowed threads up to date
* Allow users to upload jpeg pictures as their profile picture * Make constants for image upload types to accept
* fixed test case * fixed tutorial navigation test case * fixed tutorial nav test case
* 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 <[email protected]> * Update e2e/cypress/integration/signin_authentication/login_logout_smoke_spec.js Co-authored-by: Saturnino Abril <[email protected]> * Update e2e/cypress/integration/signin_authentication/login_logout_smoke_spec.js Co-authored-by: Saturnino Abril <[email protected]> * Update e2e/cypress/integration/signin_authentication/login_logout_smoke_spec.js Co-authored-by: Saturnino Abril <[email protected]> * Remove extra spaces * Update e2e/cypress/integration/signin_authentication/login_logout_smoke_spec.js Co-authored-by: Saturnino Abril <[email protected]> * Update e2e/cypress/integration/signin_authentication/login_logout_smoke_spec.js Co-authored-by: Saturnino Abril <[email protected]> * Update e2e/cypress/integration/signin_authentication/login_logout_smoke_spec.js Co-authored-by: Saturnino Abril <[email protected]> * Update e2e/cypress/integration/signin_authentication/login_logout_smoke_spec.js Co-authored-by: Saturnino Abril <[email protected]> * Adding test for MM-T2372 Deleting * Update e2e/cypress/integration/scroll/deleting_scroll_spec.js Co-authored-by: Joseph Baylon <[email protected]> * Update e2e/cypress/integration/scroll/deleting_scroll_spec.js Co-authored-by: Joseph Baylon <[email protected]> * Update e2e/cypress/integration/scroll/deleting_scroll_spec.js Co-authored-by: Joseph Baylon <[email protected]> * Update e2e/cypress/integration/scroll/deleting_scroll_spec.js Co-authored-by: Joseph Baylon <[email protected]> * Update e2e/cypress/integration/scroll/deleting_scroll_spec.js Co-authored-by: Joseph Baylon <[email protected]> * Update e2e/cypress/integration/scroll/deleting_scroll_spec.js Co-authored-by: Joseph Baylon <[email protected]> * Update e2e/cypress/integration/scroll/deleting_scroll_spec.js Co-authored-by: Joseph Baylon <[email protected]> * resolve conflicts * Added tTest for MM-T2371 Editing a post * Change comment details * Remove duplicated file * Codereview fixes for scroll editing scenarios * Codereview fixes for scroll editing scenarios * Split editing and deleting scenarios into different files * Code style changes for editing and deleting scenarios Co-authored-by: Yulyana <[email protected]> Co-authored-by: Saturnino Abril <[email protected]> Co-authored-by: Joseph Baylon <[email protected]>
…eader (when not already present) (#8186) * test * test * Update e2e/cypress/integration/channel_settings/channel_header_spec.js Co-authored-by: Joseph Baylon <[email protected]> * Update e2e/cypress/integration/channel_settings/channel_header_spec.js Co-authored-by: Joseph Baylon <[email protected]> * Update e2e/cypress/integration/channel_settings/channel_header_spec.js Co-authored-by: Joseph Baylon <[email protected]> * Update e2e/cypress/integration/channel_settings/channel_header_spec.js Co-authored-by: Saturnino Abril <[email protected]> * Update e2e/cypress/integration/channel_settings/channel_header_spec.js Co-authored-by: Saturnino Abril <[email protected]> * Update e2e/cypress/integration/channel_settings/channel_header_spec.js Co-authored-by: Saturnino Abril <[email protected]> * Update e2e/cypress/integration/channel_settings/channel_header_spec.js Co-authored-by: Saturnino Abril <[email protected]> * Update e2e/cypress/integration/channel_settings/channel_header_spec.js Co-authored-by: Guillermo Vayá <[email protected]> * Update e2e/cypress/integration/channel_settings/channel_header_spec.js Co-authored-by: Guillermo Vayá <[email protected]> * Update e2e/cypress/integration/channel_settings/channel_header_spec.js Co-authored-by: Guillermo Vayá <[email protected]> * rev * rev3 Co-authored-by: Joseph Baylon <[email protected]> Co-authored-by: Saturnino Abril <[email protected]> Co-authored-by: Guillermo Vayá <[email protected]>
#8216) * Migrate 'components/profile_popover' module and associated tests to TypeScript * spanshot test added * fix linting error in utils.jsx * update test snapshot * fix wrong types and type casting * change overwriteName type to React.ReactNode from string and minor refactoring related to that * change type of OverwriteIcon to string and openDirectChannelToUserId return promise type to object
* fix: keep badge on hover * remove unneeded importants * CRT unread channel filter * other LHS selectors * fix selector * add test Co-authored-by: Mattermod <[email protected]>
If a root post is deleted and the user is at global threads view, the app crashes. This commit fixes that by removing the thread from the threads reducer. Co-authored-by: Mattermod <[email protected]>
* MM-34578 - update permission name to see button in main menu * add tests for when there is no valid permissions * fix linter Co-authored-by: Pablo Velez Vidal <[email protected]>
* MM-35538 - display purchase modal when coming from email * use better name for query param Co-authored-by: Pablo Velez Vidal <[email protected]>
Threads nav menu, both in legacy and regular sidebar, is moved outside of the scrollable area, so it always 'sticky' at the same position.
* Downgrading Polish, Italian and German to beta * Update latex_block.test.tsx.snap * Update snapshot latex_block.test.tsx.snap Co-authored-by: Tom De Moor <[email protected]>
* New channel sidebar header component for GH * make better use of styled-components * lint, test, snapshot updates * make sure there is a description * change help text for invite menu item * update snapshots
* Fix filter and locations by considering the right types, and sending the location on commands. * Fix tests * Fix Lint Co-authored-by: Mattermod <[email protected]>
* Send user into cloud upgrade modal on feature discovery page if they are in a cloud plan. * Hide start trial agreement wording in feature discovery for cloud users * Add e2e test for on prem feature discovery pages
* Add settings tip
* MM-36698: ThreadViewer is now a virtualized list Added ThreadViewerVirtualized to handle: - displaying the thread in a virtualized list, - scrolling to {bottom/new-messages/permalinked replies} ThreadViewer has still the logic of fetching posts etc... * Fixes tests * Minor fixes * Delete unnecessary method * Fixes FloatingTimestamp * Call isMobile only when needed * Addressing review comments * Adds OnScrollArgs type to dynamic-virtualized-list * Removes unnecessary void return type * Scrolls to highlighted post when thread viewer is open * Minor fixes - highlighting a post after opening ThreadViewer - regain CreateComment focus after posting a comment - dot menu visible when only 2 replies * Fixes types * Fixes adding reaction in thread viewer shortcut By typing +:emoji: in the create comment in thread viewer you should add a reaction of 'emoji' to the last post. This commit fixes that. * Minor fixes - lint error - RHS top padding in thread list * Remove unneeded calculation of oldestPostId * Fixes linter * Addressing a bunch of review comments - blockFocus becomes focusOnMount - removed this.props.posts from thread_viewer - removed ephemeral post guard from thread - fixed scroll to bottom on new messages - removed unneeded memos * Fixes tests * Fixes scrolling to bottom issues * Fixes CreateComment re-mounting issue CreateComment was added in view with the last reply which resulted in -mounting when a new post was added, or the last post getting deleted. This commit introduces CreateComment as the last item on the list, and removes dependency on the last post. * Fixes scroll to bottom after highlighting a reply * Fixes linting issues * Fixes some e2e tests that broke * Fixes a11ly Due to a typo a11y was not enabled on ThreadViewer, this commit fixes that, and e2e that broke due to this, accessibility, issue. * Fixes tests Co-authored-by: Mattermod <[email protected]>
* Filter forms and embedded bindings * Add tests and handle some command filters * Add command validation and improve and simplify fill bindings function * Filter invalid lookup items * Fix test * Get filteroptions to a helper function * Improve channel header icon filter * Fix tsc and address feedback Co-authored-by: Mattermod <[email protected]>
…ve a category name (#8490) * Fix category styling issue Fixes mattermost/mattermost#17736 * Remove unused classname and update snapshots * Fix e2e test broken by autoSortedCategory change * Add spacing beneath sidebar category new drop box * Fix linting issue
* Translated using Weblate (German) Currently translated at 100.0% (4802 of 4802 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% (4804 of 4804 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% (4801 of 4801 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% (4798 of 4798 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% (4798 of 4798 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 99.6% (4784 of 4801 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.5% (4773 of 4796 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.4% (4769 of 4796 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.3% (4766 of 4796 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.2% (4768 of 4802 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% (4801 of 4801 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% (4801 of 4801 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% (4801 of 4801 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% (4801 of 4801 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% (4798 of 4798 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% (4798 of 4798 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% (4798 of 4798 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% (4798 of 4798 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% (4798 of 4798 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/hu/ * Translated using Weblate (Dutch) Currently translated at 100.0% (4798 of 4798 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% (4801 of 4801 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% (4798 of 4798 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% (4801 of 4801 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/en_AU/ Translated using Weblate (English (Australia)) Currently translated at 100.0% (4798 of 4798 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/en_AU/ * 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 (Bulgarian) Currently translated at 97.6% (4689 of 4802 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/bg/ * Translated using Weblate (English (Australia)) Currently translated at 100.0% (4801 of 4801 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/en_AU/ Translated using Weblate (English (Australia)) Currently translated at 100.0% (4802 of 4802 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% (4801 of 4801 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% (4796 of 4796 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/ 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 (Bulgarian) Currently translated at 98.7% (4734 of 4796 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/bg/ * Translated using Weblate (Japanese) Currently translated at 99.1% (4761 of 4801 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ja/ * Translated using Weblate (Japanese) Currently translated at 99.1% (4761 of 4801 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ja/ * Translated using Weblate (Turkish) Currently translated at 100.0% (4801 of 4801 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.0% (4755 of 4801 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 98.6% (4734 of 4801 strings) Translation: mattermost-languages-shipped/mattermost-webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/zh_Hans/ Co-authored-by: JtheBAB <[email protected]> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <[email protected]> Co-authored-by: Tom De Moor <[email protected]> Co-authored-by: Kaya Zeren <[email protected]> Co-authored-by: Matthew Williams <[email protected]> Co-authored-by: Nikolai Zahariev <[email protected]> Co-authored-by: kaakaa <[email protected]> Co-authored-by: maruTA-bis5 <[email protected]> Co-authored-by: aeomin <[email protected]>
* fix product switcher tip position * product switcher tip uses a class for skip step logic to avoid breaking rule of hooks.
marianunez
approved these changes
Aug 16, 2021
neallred
approved these changes
Aug 16, 2021
isacikgoz
added
4: Reviews Complete
|
@isacikgoz is this ready to merge? |
|
@marianunez Yes, just waiting all cloud PRs to get approved. Waiting for mattermost/mattermost#18147 |
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