forked from mattermost/mattermost
-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
merging from mm #1
Open
maisnamrajusingh
wants to merge
6,116
commits into
demansoltech:master
Choose a base branch
from
mattermost:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
pull from mm repo to sync changes |
* verified available actions on scheduled posts * Review fixes * Added copy text option for scheudled posts * Added check for archived channel and deactivated DM * Import optimisation
* Added test for user beloonging to channel but not team * Added test for read onmly channel * Added test for fetching scheduled posts for team you don;'t belong to * Added more tests * test enhancements * CI
* MM-60506 - notify user for failed scheduled messages * add unit tests for handleFailedScheduledMessages and send system-bot message * fix vet issues * adjust test for vet report * make sure to send the message to every user there was a failed message --------- Co-authored-by: Harshil Sharma <[email protected]>
* Demote unstable tests from daily run --------- Co-authored-by: Mattermost Build <[email protected]>
* Fix broken TestGetPost * Skip TestPromoteGuestToUser/websocket_update_user_event --------- Co-authored-by: Mattermost Build <[email protected]>
* Added support for S3 storage classes * Added missing translations for S3 storage class * Changed default storage class values to preserve original behaviour * Changed storage class description and example * Fix translations ordering * Change configuration defaults to empty strings * Remove redundant empty string check * Validate storage class variable against constants from S3 API docs * Validate export storage class against constants * Use slices for config validation * Applied patch for translation ordering
…29152) * Deleting scheduled posts when permanently deleting a user * Updated tests * CI * Testing CI * Restored a test change * Skipping flaky test
* Added show more to long draft adn scheduled post * Added show more to long draft adn scheduled post * Fixed layout * Updated snapshots
Use a template variable to distinguish between Elasticsearch and Opensearch ```release-note NONE ```
…ts (#28833) Co-authored-by: Ibrahim Serdar Acikgoz <[email protected]>
* Fixed a bug where GM member count shows up as 0 in scheduled posts * Fixed a bug where GM member count shows up as 0 in scheduled posts * Lint fix * Added wrap̛ntl to channels * lint fix * Used existing renderer * Removed ubnused store
Co-authored-by: Ben Schumacher <[email protected]>
Co-authored-by: Ben Schumacher <[email protected]>
Since we have the auto-retry mechanism for replicas, there is not much benefit in trying 5 times before deciding to move on. In the earlier model, we would fail the server startup, so it made sense to check as many times as possible. Also reducing the sleep interval so that we can improve the boot up time in case of a bad replica. ```release-note NONE ``` * fix: Add job name to the publish report step --------- Co-authored-by: Mattermost Build <[email protected]> Co-authored-by: Antonis Stamatiou <[email protected]>
Co-authored-by: Mattermost Build <[email protected]>
Co-authored-by: Ben Schumacher <[email protected]>
#29179 (#29188) Co-authored-by: Ben Schumacher <[email protected]>
Co-authored-by: Ben Schumacher <[email protected]>
* Reduced unnecessery debug logs from scheduled post job * Improved log
…rtcuts when editing messages (#29398) * footer * changes * edit * some changes * form submit * ci fixes * rev fix 1 * ci fix * Fixed some styles * Added delete on empty post option * fix E2E tests * fix more tests * Fixed UI isses when editing post in RHS * Fixed formatting bar behjaviour * Reset draft to original post when cancelling or escaping * DFisplayed @mention warning * fixed existing test * Added test for @mention during editing * Displayed long message warning during edit post * Removed a console log: * Handled message with image links when using image proxy * Fixed a11y styling for button * Fixed emoji picker keyboard shortcut * Checnged edit box ID * Added draft test * Fixed edit text box id * e2e fix * e2e fix * handled deleting empty fposts * Fixed e2e test --------- Co-authored-by: Mattermost Build <[email protected]> Co-authored-by: Harshil Sharma <[email protected]> Co-authored-by: yasserfaraazkhan <[email protected]>
* fix restricted indicator icon * fix linter * fix linter again
#29604) Co-authored-by: Mattermost Build <[email protected]>
…29528) * replace inside of comp/withtooltip * remove overlay trigger eslint rl * update location of prev migrated new tooltips * copy button * shared_channel_indicator, shared_user_indicator.tsx, size_aware_image * actions_menu, old_admin_settings, schema_admin_settings, admin_settings * billing_summary, brand_image_setting, edit_section_edit_table_row, elapsed_duration_cell * permissions_scheme_summary,secure_connections/controls,system_users_column_toggler_menu,system_users_export,group/group_users/users_to_remove_groups * team_profile,user_grid_role_dropdown,priority_labels,toggle_formatting_bar,use_emoji_picker,formatting_icon * show_formatting,alert_banner others * more * snap fix * add disabled prop to menu * test fix for avatar feat: Add id to WithTooltip in Avatars component to fix test failures * combine refs in withtooltip * channel header title favorite test fix * priority label comp changes * types check for children * Update avatar.tsx * e2e fixes * fix E2E tests * Remove memo from WithTooltip I found that the web app leaks a fair bit less memory when this is removed. See https://community.mattermost.com/core/pl/gwyyoww9gtbg8fddoic9meq84y for more information * e2e lint fixes * e2e fixes * Fix test style issue --------- Co-authored-by: yasserfaraazkhan <[email protected]> Co-authored-by: Harrison Healey <[email protected]> Co-authored-by: Mattermost Build <[email protected]>
…er (#29540) * [BST-183]: Removed unnecessary role and aria-level from channel header * [BST-183]: Fix failing E2E test case --------- Co-authored-by: Mattermost Build <[email protected]>
* MM-61968 - a11y rhs focus management * fix condition when rhs was already open and not getting focus * fix typescript errors * skip failing test --------- Co-authored-by: Mattermost Build <[email protected]>
* MM-62229 - scheduled messages not updated on reconnect * validate websocket connection-disconection time * Add current team id * remove debugging code * remove debugging timeout * remove unnecessary time in the logs * remove unnecessary time in the logs * remove unnecessary comment --------- Co-authored-by: Mattermost Build <[email protected]>
* revert the api4 portion of 57372bd * test: Add system admin channel access tests * skip a.HasPermissionToTeam for channels without a team * fix TestPostGetInfo
…rned when 10K posts was exceeded. Remaining posts were silently orphaned. (#29642) Co-authored-by: Mattermost Build <[email protected]>
* removed extra space * Fixed border of edit box in mobile view * Fixed test
This rule warns us if an element has an onMouseOver/onMouseLeave attributes without corresponding onFocus/onBlur ones. It's helpful for showing where we may be missing some accessible interactions, and I've filed MM-62343 and MM-62345 to follow up on two of these. In other cases, the component either has alternate accessibility support (the emoji picker), it's something that may not make sense to be accessible (the expanded view of the channel header), or something we're already planning to review accessiblity for (the search component), so I'm going to disable it to avoid introducing noise for the time being.
Automatic Merge
* fix(pluginapi/store): init master db if no replica GetReplicaDB return nil because masterDB is not initialized. * chore: add test
…29686) * MM-62378: Initialize status and session cache before loading license ps.LoadLicense could end up calling InvalidateAllCaches. Therefore, we need to intialize those caches before calling LoadLicense to prevent a panic from happening. While here, we also remove some unused code. https://mattermost.atlassian.net/browse/MM-62378 ```release-note NONE ``` * fix lint errors ```release-note NONE ``` * fix test ```release-note NONE ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Ticket Link
Release Note