forked from mattermost/mattermost
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Draft: Update MM-Server to latest Version | v6.5.1 #1
Open
teshsharma
wants to merge
908
commits into
master
Choose a base branch
from
hsharma_v6.5.1
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.
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
Currently translated at 98.8% (2315 of 2343 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ja/
* remove AcceptedServiceTermsId column * PR feedback * make migrations-bindata
Automatic Merge
* [MM-42027] - Invitation Email is resent as a Reminder after invalidating pending email invites * generate app layers mocks * add tests * improve err handling * fix translations * change status code
Co-authored-by: Josh Soref <[email protected]> Co-authored-by: Mattermod <[email protected]>
…els (mattermost#19633) * tools updates * Revert "tools updates" This reverts commit 6293297. * stop custom groups linking to teams and channels * updating test and changing logic Co-authored-by: Benjamin Cooke <[email protected]> Co-authored-by: Benjamin Cooke <[email protected]>
* deadcode: remove UpdateChannelLastViewedAt * deadcode: remove ThreadStore.(Save(Multiple)|Update|Delete) * deadcode: followThead in App.MarkChannelAsUnreadFromPost * document ThreadMembership, Thread structs * maintain LastUpdated consistently Whenever we touch a `ThreadMembership` record, we should be setting `LastUpdated` to the current timestamp. The mobile client relies on this to detect changes to these records. * simplify: never updateThreads from `App.MarkChannelAsUnreadFromPost` Change all invocations of `ChannelStore.UpdateLastViewedAtPost` from `App.MarkChannelAsUnreadFromPost` to pass `updateThreads` as `false`. When `ChannelStore.UpdateLastViewedAtPost` was invoked with `updateThreads` as `true`, it would in turn call `ThreadStore.UpdateUnreadsByChannel` but pass `updateViewedTimestamp` as `false`. This effectively updated the `LastUpdated` field of the corresponding thread memberships but never touched any of the actual data (such as `LastViewed`). The overall CRT feature continued to work, because `App.MarkChannelAsUnreadFromPost` directly updates the relevant thread memberships via `ThreadStore.MaintainMembership`. * deadcode: updateThreads in ChannelStore.UpdateLastViewedAtPost * simplify: never updateThreads from App.SendNotifications Change all invocations of `ChannelStore.IncrementMentionCount` from `App.SendNotifications` to pass `updateThreads` as `false`. When `ChannelStore.IncrementMentionCount` was invoked with `updateThreads` as `true`, it would in turn call `ThreadStore.UpdateUnreadsByChannel` but pass `updateViewedTimestamp` as `false`. This effectively updated the `LastUpdated` field of the corresponding thread memberships but never touched any of the actual data (such as `UnreadMentions`). The overall CRT feature continued to work, because `App.SendNotifications` directly updates the relevant thread memberships mention counts via `ThreadStore.MaintainMembership`. * deadcode: updateThreads in ChannelStore.IncrementMentionCount * fix & rename ThreadStore.UpdateUnreadsByChannel Rename `ThreadStore.UpdateUnreadsByChannel` to `ThreadStore.UpdateLastViewedByThreadIds`, making it unconditionally set the `LastViewed` for the given threads (as well as `LastUpdated`). All previous invocations of this method that passed `updateViewedTimestamp` have been previously removed. * unrelated gofmt -w -s changes to satisfy linter * always set LastUpdated to model.GetMillis() * deadcode: ThreadStore.SaveMembership * fix TestMarkUnreadWithThreads * GetMasterX
Currently translated at 99.7% (2337 of 2343 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/en_AU/
Currently translated at 100.0% (2344 of 2344 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/
Currently translated at 100.0% (2344 of 2344 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/
Currently translated at 74.4% (1745 of 2344 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/it/
Currently translated at 92.7% (2173 of 2344 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/pt_BR/
Currently translated at 100.0% (2344 of 2344 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/hu/
Currently translated at 100.0% (2344 of 2344 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/pl/
* Revert "Translated using Weblate (Polish)" This reverts commit 5aee5b3. * Revert "Translated using Weblate (Hungarian)" This reverts commit 4ad13d2. * Revert "Translated using Weblate (Portuguese (Brazil))" This reverts commit 986cf9a. * Revert "Translated using Weblate (Italian)" This reverts commit 0398e34. * Revert "Translated using Weblate (Turkish)" This reverts commit c8e8a4a. * Revert "Translated using Weblate (German)" This reverts commit 86c2680. * Revert "Translated using Weblate (English (Australia))" This reverts commit 5709e6c.
* add license service interface * add wrapper * remove wrapper from channels struct until its being used * add comments
…ermost#19587) * Only check for userId when saving userTermsOfService * Add test Co-authored-by: Mattermod <[email protected]>
* Add push notification check to ping * Add test type and missing details * Address feedback * Fix function name * Address feedback Co-authored-by: Mattermod <[email protected]>
… channel (mattermost#19641) * Don't break importing process on missing display name of a channel * remove unused strings Co-authored-by: = <=>
CircleCI will deprecate the image we use and we need to upgrade to the latest one. Ticket: https://mattermost.atlassian.net/browse/DOPS-822
…attermost#19617) Co-authored-by: Mattermod <[email protected]>
Previously, we were incrementing mentions one-by-one all concurrently in an unbounded fashion. This would cause a big spike in memory usage if there were an `@all` mention in a large channel. We fix this by changing the SQL query to take all userIDs at once. https://mattermost.atlassian.net/browse/MM-41752 ```release-note NONE ``` Co-authored-by: Mattermod <[email protected]>
Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/
Currently translated at 100.0% (2319 of 2319 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ Translated using Weblate (Turkish) Currently translated at 99.3% (2305 of 2319 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/
Currently translated at 100.0% (2319 of 2319 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ru/
Currently translated at 100.0% (2319 of 2319 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/
Currently translated at 99.2% (2302 of 2319 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/hu/
Currently translated at 99.3% (2305 of 2319 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/en_AU/
Currently translated at 99.1% (2300 of 2319 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/
* add test * add channels to test * check for actual channel Co-authored-by: = <=>
* Enable timestamp for default audot config * add unit test
* add cloud workspace limits endpoint
```release-note NONE ``` Co-authored-by: Mattermod <[email protected]>
* [MM-42739] Initial setup for top channels for team * [MM-42739] Add initial tests * [MM-42739] Update tests * [MM-42739] Add top channels for user * [MM-42739] Fix query * [MM-42739] Update query * [MM-42739] Improve query performance * [MM-42739] Remove rank * [MM-42739] Fix tests to use new time range today * [MM-42739] Add tests for top channels for user * [MM-42739] Add test for pagination * Remove top channels by time struct * [MM-42739] Update test names * [MM-42739] Remove rank from top reactions * [MM-42739] Return empty array instead of nil when result is empty * [MM-42739] Add additional tests and update permissions check for teams * [MM-42739] Add excluded channel tests for top reactions * [MM-42739] Move insights to api4/insights and keep time range as string until required * [MM-42739] Update queries only check DeleteAt after union * [MM-42739] Improve query performance by using publicchannels table * [MM-42739] Fix broken query after merge
We bump the go.mod version to 1.18 and run go mod tidy. This is required for using new features. ```release-note NONE ```
…mattermost#20075) Signed-off-by: Mustafa Kara <[email protected]>
Co-authored-by: Mattermod <[email protected]>
…d emails (mattermost#19976) * Updating email templates for trial will end and trial will end emails * put back variable * Rebuilding * fix tests * Updates * [MM-43339] Add Cloud Subscription Upgrade Confirmation Email (mattermost#19989) * Add Cloud Upgrade Confirmation email * Updates * String change * i18n-extract * Updates * make email-mocks * Appease linter * Add a test * GMAIL NEVER RENDERS RIGHT * Important EVERYWHERE because gmail just cant deal * l * Last one * Update image * Update tests * Fix tests Co-authored-by: Mattermod <[email protected]>
Automatic Merge
```release-note NONE ```
…attermost#19838) * MM-41211: Replaces SessionLength[Web|Mobile|SSO]InDays with SessionLength[Web|Mobile|SSO]InHours. * MM-41211: Clear the value of the old config settings.
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.
TBD