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
Improve the design and layout of email notifications #15906
Comments
I would like to work on this. Are there any docs explaining current email rendering infra? Could someone give me couple of pointers to the appropriate code for rendering emails locally? |
Or @matthewbirtch do you know what dev worked on the cloud emails that could provide some guidance here? |
@nickmisasi has worked a fair bit on emails for Cloud. Just a note though, the email updates here aren't in cloud yet. The cloud emails might be a good starting point though |
Thanks. @nickmisasi would you be able to provide some guidance here for @jp0707 that help get her started implementing these email UI updates as per her comment above? |
@esethna Sure, I'll provide some detail below. Love the idea of using the framework for these, as I think it'd be super helpful (emails are annoying to get to look proper in all clients, and then having them be responsive is even harder). However, I think there would need to be some input from core teams into how we implement that framework into our core product. @jp0707 you can find all of our existing email templates here: https://github.com/mattermost/mattermost-server/tree/master/templates |
@nickmisasi : Here's a proof of concept with welcome email: jp0707@d372e09 . The email still lacks style polishing, but this is meant to be proof of concept for mjml + Go templating. Here's how it works:
Please take a look. I'd love to have core team look at this and give their feedback. Who/where should I ask for core team's feedback? |
@agnivade This is not done yet. Only first two emails were done in previous PR. |
…ils (mattermost#17029) Automatic Merge (cherry picked from commit 41ab05c)
* Redesign message notification emails. * Fix tests and linter. * Fix tests * Fix tests * gofmt. * Fix date separator * Update html files * Remove date for message notification email. * Modify subtitle for mentions and direct and group messages. * Fix lint error * Fix DM subtitle. * Fixing translations Co-authored-by: Mattermod <mattermod@users.noreply.github.com> Co-authored-by: Jesús Espino <jespinog@gmail.com>
…attermost#17184) * Redesign message notification emails. * Fix tests and linter. * Fix tests * Fix tests * gofmt. * Fix date separator * Update html files * Remove date for message notification email. * Modify subtitle for mentions and direct and group messages. * Fix lint error * Fix DM subtitle. * Fixing translations Co-authored-by: Mattermod <mattermod@users.noreply.github.com> Co-authored-by: Jesús Espino <jespinog@gmail.com> (cherry picked from commit d97daaa)
…17597) * Redesign message notification emails. * Fix tests and linter. * Fix tests * Fix tests * gofmt. * Fix date separator * Update html files * Remove date for message notification email. * Modify subtitle for mentions and direct and group messages. * Fix lint error * Fix DM subtitle. * Fixing translations Co-authored-by: Mattermod <mattermod@users.noreply.github.com> Co-authored-by: Jesús Espino <jespinog@gmail.com> (cherry picked from commit d97daaa) Co-authored-by: Jyoti Patel <36148363+jp0707@users.noreply.github.com>
* Revert "MM-24530-Add support for search terms with underscore using postgresql engine (#16618)" (#16950) (#16956) This reverts commit ba3b788e46f98e2c2d7976d8d264a364676c9b2b. (cherry picked from commit 9992a27a907ba5472ff738b54131013689605c6c) Co-authored-by: Agniva De Sarker <agnivade@yahoo.co.in> * update incident-collaboration to 1.4.0 (#16920) (#16955) Co-authored-by: Mattermod <mattermod@users.noreply.github.com> (cherry picked from commit 58b3e8d92d2387b12a0c05c5476aab20d9bd9fd3) Co-authored-by: Christopher Poile <cpoile@gmail.com> * Custom status feature (#16835) (#16976) * Create the system console setting and send to webapp * MI-1145: Add custom status APIs * MI-1145 Add slash commands to set and clear status * Add validation for custom status API * Trim custom status message * Code refactoring - Run gofmt - Rename constants * Remove sendUserUpdated webhook event * Fix recent custom status length * Update error conditions * Disable /status slash command when config setting is off * MI-1155: Create the feature flag for custom status APIs and slash commands * Move recent custom statuses to user preferences (#7) * Move recent custom statuses to user preferences * Code refactoring and feedback changes * Update slash command text and emoji regex * Make the custom status feature flag off by default * Update SetCustomStatus, handle recents not set better * Update status codes * Update slash command handling * Add telementry settings * Fix i18n order * Revert "Fix i18n order" This reverts commit 499f7eaca8180336f5bcca360cc0133365899e08. * Update i18n strings (cherry picked from commit 7585e16d844d197f12079ff46bcbd0f78d7a698a) Co-authored-by: Chetanya Kandhari <chetanya.kandhari@brightscout.com> * Translations update from Weblate (#16996) * Translated using Weblate (Dutch) Currently translated at 100.0% (2138 of 2138 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 100.0% (2138 of 2138 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 100.0% (2132 of 2132 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ * Translated using Weblate (German) Currently translated at 82.5% (1770 of 2144 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/ Translated using Weblate (Romanian) Currently translated at 100.0% (2132 of 2132 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ro/ * Translated using Weblate (Bulgarian) Currently translated at 100.0% (2144 of 2144 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/bg/ Translated using Weblate (Bulgarian) Currently translated at 100.0% (2138 of 2138 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/bg/ * Translated using Weblate (Turkish) Currently translated at 100.0% (2138 of 2138 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Update translation files 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/ Update translation files 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/ * Translated using Weblate (Swedish) Currently translated at 100.0% (2144 of 2144 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ Translated using Weblate (Swedish) Currently translated at 99.9% (2142 of 2144 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ Translated using Weblate (Swedish) Currently translated at 99.4% (2133 of 2144 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2147 of 2147 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 97.8% (2101 of 2147 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/pt_BR/ Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: Viorel-Cosmin Miron <cosmin@uhlhost.net> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: majo <martinjohnson@bahnhof.se> Co-authored-by: rodrigocorsi <rodrigocorsi@gmail.com> * Translations update from Weblate (#17033) * Translated using Weblate (Japanese) Currently translated at 100.0% (2147 of 2147 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ja/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2163 of 2163 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 100.0% (2149 of 2149 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 100.0% (2148 of 2148 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 100.0% (2147 of 2147 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ * Translated using Weblate (Turkish) Currently translated at 99.4% (2152 of 2163 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 100.0% (2147 of 2147 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (2147 of 2147 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/zh_Hans/ * Translated using Weblate (Swedish) Currently translated at 100.0% (2163 of 2163 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ Translated using Weblate (Swedish) Currently translated at 99.2% (2147 of 2163 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ Translated using Weblate (Swedish) Currently translated at 99.0% (2143 of 2163 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ Translated using Weblate (Swedish) Currently translated at 100.0% (2149 of 2149 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ Translated using Weblate (Swedish) Currently translated at 100.0% (2147 of 2147 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ * Translated using Weblate (Bulgarian) Currently translated at 100.0% (2149 of 2149 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/bg/ Translated using Weblate (Bulgarian) Currently translated at 100.0% (2147 of 2147 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/bg/ * Update translation files 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/ Update translation files 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/ Update translation files 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/ * Translated using Weblate (Romanian) Currently translated at 100.0% (2149 of 2149 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ro/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2163 of 2163 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ * Translated using Weblate (German) Currently translated at 81.5% (1764 of 2163 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/ Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: MArtin Johnson <martinjohnson@bahnhof.se> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: Viorel-Cosmin Miron <cosmin@uhlhost.net> Co-authored-by: Friederike J <friederike.jolk@cambio-carsharing.com> * Solve conflicts Signed-off-by: Mario de Frutos <mario@defrutos.org> * Solve conflicts Signed-off-by: Mario de Frutos <mario@defrutos.org> * Fix blank invite email (#17065) (#17094) * Fix blank invite email * Some small improvements * Another small fix Co-authored-by: Mattermod <mattermod@users.noreply.github.com> (cherry picked from commit 31f3edf1d9e19c77915ff6d3431964c1cef549cf) Co-authored-by: Jesús Espino <jespinog@gmail.com> * Translations update from Weblate (#17081) * Translated using Weblate (Romanian) Currently translated at 100.0% (2163 of 2163 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ro/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (2163 of 2163 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/pt_BR/ * Translated using Weblate (Bulgarian) Currently translated at 99.3% (2148 of 2163 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/bg/ Translated using Weblate (Bulgarian) Currently translated at 99.2% (2147 of 2163 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/bg/ * Update translation files 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/ * Translated using Weblate (Bulgarian) Currently translated at 100.0% (2164 of 2164 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/bg/ * Update translation files 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/ * Translated using Weblate (Japanese) Currently translated at 100.0% (2164 of 2164 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ja/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2164 of 2164 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ * Translated using Weblate (Swedish) Currently translated at 100.0% (2164 of 2164 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ Co-authored-by: Viorel-Cosmin Miron <cosmin@uhlhost.net> Co-authored-by: rodrigocorsi <rodrigocorsi@gmail.com> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: MArtin Johnson <martinjohnson@bahnhof.se> * Fix migrations code Signed-off-by: Mario de Frutos <mario@defrutos.org> * Add missiong db migration for version 5.29.1 Signed-off-by: Mario de Frutos <mario@defrutos.org> * [GH-15906][MM-22844] Redesign reset password and invite emails (#17029) (#17132) Automatic Merge (cherry picked from commit 41ab05ca6637a2eb799ec13ef177b6954098fece) Co-authored-by: Jyoti Patel <36148363+jp0707@users.noreply.github.com> * Fix db upgrade conflict Signed-off-by: Mario de Frutos <mario@defrutos.org> * Fix app email conflict Signed-off-by: Mario de Frutos <mario@defrutos.org> * Revert DB migration removal applied to installations Signed-off-by: Mario de Frutos <mario@defrutos.org> * Translations update from Weblate (#17133) * Translated using Weblate (Swedish) Currently translated at 98.9% (2162 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ Translated using Weblate (Swedish) Currently translated at 100.0% (2165 of 2165 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ * Translated using Weblate (Bulgarian) Currently translated at 100.0% (2165 of 2165 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/bg/ * Update translation files 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/ Update translation files 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/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2186 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 100.0% (2167 of 2167 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 100.0% (2167 of 2167 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ * Translated using Weblate (Romanian) Currently translated at 98.5% (2154 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ro/ * Translated using Weblate (Korean) Currently translated at 83.8% (1832 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ko/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 97.7% (2137 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/zh_Hans/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2186 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ * Translated using Weblate (Turkish) Currently translated at 100.0% (2186 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Bulgarian) Currently translated at 100.0% (2186 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/bg/ Co-authored-by: MArtin Johnson <martinjohnson@bahnhof.se> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: Viorel-Cosmin Miron <cosmin@uhlhost.net> Co-authored-by: Ji-Hyeon Gim <potatogim@potatogim.net> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> * Fix bug with DB upgrade Signed-off-by: Mario de Frutos <mario@defrutos.org> * Fix bug with DB upgrade Signed-off-by: Mario de Frutos <mario@defrutos.org> * Translations update from Weblate (#17133) (#17135) * Translated using Weblate (Swedish) Currently translated at 98.9% (2162 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ Translated using Weblate (Swedish) Currently translated at 100.0% (2165 of 2165 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ * Translated using Weblate (Bulgarian) Currently translated at 100.0% (2165 of 2165 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/bg/ * Update translation files 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/ Update translation files 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/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2186 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 100.0% (2167 of 2167 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 100.0% (2167 of 2167 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ * Translated using Weblate (Romanian) Currently translated at 98.5% (2154 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ro/ * Translated using Weblate (Korean) Currently translated at 83.8% (1832 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ko/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 97.7% (2137 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/zh_Hans/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2186 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ * Translated using Weblate (Turkish) Currently translated at 100.0% (2186 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Bulgarian) Currently translated at 100.0% (2186 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/bg/ Co-authored-by: MArtin Johnson <martinjohnson@bahnhof.se> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: Viorel-Cosmin Miron <cosmin@uhlhost.net> Co-authored-by: Ji-Hyeon Gim <potatogim@potatogim.net> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> (cherry picked from commit 027413aebdbdf8b3e4e1d827107a4d4282955b69) Co-authored-by: Weblate (bot) <hosted@weblate.org> * MM-33789: Revert fallback to master for GetAllProfilesInChannel (#17119) (#17139) Automatic Merge * MM-33836: Detect and upgrade incorrect HTTP version for websocket handshakes (#17142) (#17146) Automatic Merge * MM-34000: Use non-epoll mode for TLS connections (#17172) (#17180) Automatic Merge * Automated cherry pick of #17198 (#17200) Co-authored-by: Mattermod <mattermod@users.noreply.github.com> Co-authored-by: Allan Guwatudde <guwats10@gmail.com> * Translations update from Weblate (#17191) * Translated using Weblate (Dutch) Currently translated at 100.0% (2186 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 100.0% (2186 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 100.0% (2186 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ * Translated using Weblate (Turkish) Currently translated at 100.0% (2186 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Japanese) Currently translated at 98.5% (2155 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ja/ * Translated using Weblate (French) Currently translated at 83.8% (1833 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/fr/ * Translated using Weblate (French) Currently translated at 83.9% (1836 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/fr/ * Translated using Weblate (Spanish) Currently translated at 93.5% (2044 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/es/ * Translated using Weblate (Russian) Currently translated at 95.1% (2080 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ru/ * Translated using Weblate (Swedish) Currently translated at 100.0% (2186 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ * Translated using Weblate (French) Currently translated at 84.0% (1837 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/fr/ * Translated using Weblate (Russian) Currently translated at 95.1% (2080 of 2186 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ru/ Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: Pierre JENICOT <pierre.jenicot@ac-lille.fr> Co-authored-by: Cyril LD <c.laguilhon.debat@petitclou.de> Co-authored-by: jesus.espino <jesus@mattermost.com> Co-authored-by: Edward Smirnov <ed@microolap.com> Co-authored-by: MArtin Johnson <martinjohnson@bahnhof.se> Co-authored-by: Elisabeth Kulzer <elisabeth.kulzer@mattermost.com> Co-authored-by: Mattermod <mattermod@users.noreply.github.com> * Translations update from Weblate (#17298) * Added translation using Weblate (English (Australia)) * Translated using Weblate (English (Australia)) Currently translated at 100.0% (2189 of 2189 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/en_AU/ * Translated using Weblate (Russian) Currently translated at 99.8% (2187 of 2190 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ru/ Translated using Weblate (Russian) Currently translated at 100.0% (2189 of 2189 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ru/ Translated using Weblate (Russian) Currently translated at 98.4% (2156 of 2189 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ru/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2190 of 2190 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 100.0% (2189 of 2189 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 99.3% (2175 of 2189 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/zh_Hans/ * Update translation files 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/ * Translated using Weblate (English (Australia)) Currently translated at 100.0% (2190 of 2190 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/en_AU/ Translated using Weblate (English (Australia)) Currently translated at 100.0% (2189 of 2189 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/en_AU/ * Translated using Weblate (Turkish) Currently translated at 100.0% (2190 of 2190 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 100.0% (2189 of 2189 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Korean) Currently translated at 84.6% (1854 of 2190 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ko/ * Deleted translation using Weblate (English (Australia)) * Translated using Weblate (Swedish) Currently translated at 100.0% (2191 of 2191 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ Co-authored-by: Matthew Williams <en_AU@controlaltdieliet.be> Co-authored-by: Edward Smirnov <ed@microolap.com> Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: teamzamong <heekang@korea.ac.kr> Co-authored-by: MArtin Johnson <martinjohnson@bahnhof.se> * Fix lint issue * Fix typo * Automated cherry pick of #17113 (#17314) Co-authored-by: Mattermod <mattermod@users.noreply.github.com> (cherry picked from commit 489eaa4605d19929dfe46600e1be1465eb872b46) Co-authored-by: Allan Guwatudde <guwats10@gmail.com> * Translations update from Weblate (#17334) * Translated using Weblate (Russian) Currently translated at 100.0% (2299 of 2299 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ru/ Translated using Weblate (Russian) Currently translated at 97.8% (2249 of 2299 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ru/ Translated using Weblate (Russian) Currently translated at 100.0% (2194 of 2194 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ru/ Translated using Weblate (Russian) Currently translated at 100.0% (2192 of 2192 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ru/ * Translated using Weblate (Turkish) Currently translated at 100.0% (2194 of 2194 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 99.7% (2188 of 2194 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/zh_Hans/ * Translated using Weblate (French) Currently translated at 85.1% (1869 of 2194 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/fr/ * Translated using Weblate (Russian) Currently translated at 100.0% (2194 of 2194 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ru/ * Translated using Weblate (Dutch) Currently translated at 95.6% (2198 of 2299 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 100.0% (2194 of 2194 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ * Translated using Weblate (Russian) Currently translated at 100.0% (2299 of 2299 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ru/ Co-authored-by: Edward Smirnov <ed@microolap.com> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: Pierre JENICOT <pierre.jenicot@ac-lille.fr> Co-authored-by: jesus.espino <jesus@mattermost.com> Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: Elisabeth Kulzer <elisabeth.kulzer@mattermost.com> * Automated cherry pick of #17338 (#17344) (cherry picked from commit ec5f099313624dc346f3f16a9791feca04ebf3fa) Co-authored-by: Allan Guwatudde <guwats10@gmail.com> * Automated cherry pick of #17306 (#17324) * [MM-34179] app: move cluster registeration to server creation (#17306) * app: move cluster registeration to server creation * initserver via fakeapp * reflect review comments (cherry picked from commit e13d85d8c7fa98e1f25052e6d3de8d94c16853b7) * Update config.yml * Update config.yml Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com> Co-authored-by: Elisabeth Kulzer <elikul@elikul.de> * Automated cherry pick of #17321 (#17326) * [MM-34557] commands/server_test: add skip (#17321) * commands/server_test: disable plugins for test (was causing a data race) * add skip app init * skip tests * add skip linter (cherry picked from commit 9897d4651af329a1d0268b767570256bc78b8dfd) * Update config.yml * Apply suggestions from code review * Apply suggestions from code review Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com> Co-authored-by: Elisabeth Kulzer <elikul@elikul.de> * Upgrade for cloud branch Signed-off-by: Mario de Frutos <mario@defrutos.org> * Upgrade for cloud branch Signed-off-by: Mario de Frutos <mario@defrutos.org> * Start using 5.35.0 database schema Signed-off-by: Mario de Frutos <mario@defrutos.org> * Fix upgrade tests Signed-off-by: Mario de Frutos <mario@defrutos.org> * Comment skipped test logic to avoid golint failure Signed-off-by: Mario de Frutos <mario@defrutos.org> * Improve msgroot query Signed-off-by: Mario de Frutos <mario@defrutos.org> * MM-32133 shared channel username collisions (#17347) (#17399) Support for handling username collisions between remote clusters. Users belonging to remote clusters have their username changed to include the remote name e.g. wiggin becomes wiggin:mattermost. @mentions are also modified so the munged username is replaced with the original username when the post is sync'd with the remote the user belongs to. When adding remote users: - append the remote name to the username with colon separator - append the remote name to the email address with colon separator - store the original username and email address in user props - when resolving @mentions replace with the stored original username (cherry picked from commit f69cb38249afab1dda66e5ec79a0c32001b57b0a) Co-authored-by: Doug Lauder <wiggin77@warpmail.net> * Translations update from Weblate (#17381) (#17383) * Translated using Weblate (Dutch) Currently translated at 99.2% (2284 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 99.3% (2285 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ * Update translation files Updated by "Remove blank strings" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.3% (2287 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/pt_BR/ Translated using Weblate (Portuguese (Brazil)) Currently translated at 96.0% (2211 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/pt_BR/ * Translated using Weblate (Swedish) Currently translated at 100.0% (2303 of 2303 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ Translated using Weblate (Swedish) Currently translated at 99.9% (2301 of 2303 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ Translated using Weblate (Swedish) Currently translated at 98.0% (2255 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ Translated using Weblate (Swedish) Currently translated at 96.7% (2226 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ * Translated using Weblate (Romanian) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ro/ Translated using Weblate (Romanian) Currently translated at 94.7% (2181 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ro/ * Translated using Weblate (Spanish) Currently translated at 88.8% (2045 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/es/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2303 of 2303 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 99.3% (2287 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ * Translated using Weblate (Russian) Currently translated at 100.0% (2303 of 2303 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ru/ Translated using Weblate (Russian) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ru/ * Translated using Weblate (Turkish) Currently translated at 95.6% (2201 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Japanese) Currently translated at 100.0% (2303 of 2303 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ja/ Translated using Weblate (Japanese) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ja/ * Translated using Weblate (French) Currently translated at 82.1% (1892 of 2303 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/fr/ * Translated using Weblate (Turkish) Currently translated at 97.9% (2255 of 2303 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Bulgarian) Currently translated at 94.9% (2186 of 2303 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/bg/ Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: rodrigocorsi <rodrigocorsi@gmail.com> Co-authored-by: MArtin Johnson <martinjohnson@bahnhof.se> Co-authored-by: Viorel-Cosmin Miron <cosmin@uhlhost.net> Co-authored-by: Elias Nahum <elias@mattermost.com> Co-authored-by: Edward Smirnov <ed@microolap.com> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: William Farelly <wfarelly@orange.fr> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: Weblate (bot) <hosted@weblate.org> Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: rodrigocorsi <rodrigocorsi@gmail.com> Co-authored-by: MArtin Johnson <martinjohnson@bahnhof.se> Co-authored-by: Viorel-Cosmin Miron <cosmin@uhlhost.net> Co-authored-by: Elias Nahum <elias@mattermost.com> Co-authored-by: Edward Smirnov <ed@microolap.com> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: William Farelly <wfarelly@orange.fr> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> * [MM-31899] Use a custom user-agent when previewing links (#17186) (#17394) * Use a custom user-agent when previewing links Many websites block requests made with Go's default user-agent. We had previous special-cased Twitter links to use a nonstandard user-agent. This makes that behavior apply everywhere and also customizes the user-agent to belong specifically to Mattermost. * Correctly use custom transport for link previews This allows us to use the custom user-agent defined in services/httpservice/client.go. * Stop leaking server version in custom user-agent Since the custom user-agent is now used when previewing links, exposing the server version could provide a vector for a malicious actor to gather information about private deployments. To avoid this, we switch to a generic string. * Remove extraneous Transport creation MakeClient already creates a transport for us, so this is unnecessary. Co-authored-by: Mattermod <mattermod@users.noreply.github.com> (cherry picked from commit 17a7d5ce296cd4c63fa3e51630f13277573fbd7a) Co-authored-by: Eli Young <elyscape@gmail.com> * Automated cherry pick of #17397 (#17402) Co-authored-by: Mattermod <mattermod@users.noreply.github.com> Co-authored-by: Nick Misasi <nick.misasi@mattermost.com> Co-authored-by: Allan Guwatudde <guwats10@gmail.com> Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com> * [MM-34240] - Cloud: "Congratulations" welcome email missing images (#17350) (#17411) Automatic Merge * Fix problem with nulls in file infos content field (#17404) (#17423) * Hotfix add multistatements param on mysql url (#17429) Co-authored-by: John Tzikas <john.tzikas@mattermost.com> * Fix 5.32 migration (#17414) * [MM-34919] Use Mattermost-Plugin-ID header to pass ID in inter-plugin requests (#17418) (#17443) (cherry picked from commit 730dc6b98569c072aaee9324e58e790973690d2d) Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com> * MM-34983: Remove check for number of data sources (#17431) (#17446) Automatic Merge * Add doc extraction dependencies (#17403) (#17449) Automatic Merge (cherry picked from commit d2ed053b6b2162cb8721df970d24ac2578a9bc65) Co-authored-by: Jesús Espino <jespinog@gmail.com> * Remove the Remove System Permissions (#17401) (#17451) Co-authored-by: Mattermod <mattermod@users.noreply.github.com> (cherry picked from commit 93c8c6e9d85cd87e0113294ae2272a518c5fc2e5) Co-authored-by: Hossein <hahmadia@users.noreply.github.com> * #MM-34893 Completely disabled Admin Advisor (#17422) (#17454) Automatic Merge * [MM-13799] Avoid queries timing out during upgrade (#17444) (#17453) * Avoid timing out during upgrade * Update gorp dep Co-authored-by: Mattermod <mattermod@users.noreply.github.com> (cherry picked from commit 39843810117d8a5fb3c93a0bce50076995ecade5) * Fixing problem with read-replica on indexing files (#17460) (#17461) (cherry picked from commit 368b6421050b3973a6c3eaf90fd300b1748690eb) Co-authored-by: Jesús Espino <jespinog@gmail.com> * Mm 30807 granular data retention scaffold (#17464) * MM-31717: Remove HTTP clustering (#17409) * MM-31717: Remove HTTP clustering https://mattermost.atlassian.net/browse/MM-31717 ```release-note Gossip clustering mode is now GA and is no longer available as a choice now. All cluster traffic will always use the gossip protocol. The config setting UseExperimentalGossip has no effect and has only been kept for compatibility purposes. The setting to use gossip has been removed from admin console. Upgrade note: If an existing system is not using gossip, then one cannot upgrade one node in a cluster and keep the other one to the older version, if an HA upgrade is intended. All nodes in the cluster must use a single protocol. Either the customer must use gossip if they want to do an HA upgrade. Or, shut down all nodes and bring up all of them after doing an upgrade. ``` * Trigger CI * update translations * MM-34871 CRT: Participants of thread include non-replying followers (and past followers) (#17447) Co-authored-by: Mattermod <mattermod@users.noreply.github.com> * MM-34872 CRT: thread last_viewed_at updated when channel is viewed (#17448) * Fix performance problem on document extraction (#17470) * Custom status fixes (#17122) * Changed the request type to POST for the remove recent custom status API Fixed the custom status clear slash command * Added Delete method in the remove recent custom status endpoint * Added one new endpoint to remove recent custom status with POST method * Added comments for the recent custom status API Co-authored-by: Manoj <manoj@brightscout.com> Co-authored-by: Chetanya Kandhari <availchet@gmail.com> Co-authored-by: Manoj <77336594+manojosh@users.noreply.github.com> * Fix performance problem on document extraction (#17470) (#17473) (cherry picked from commit bf542ec12f1c7ca2f275f90d0b8d0a120a07a461) Co-authored-by: Jesús Espino <jespinog@gmail.com> * [MM-32281] SqlRoleStore/GetByName: add context to allow read from master (#17176) * role_store/GetByName: add context * propagate context in the app layer * propagate context in the app layer * add missing import Co-authored-by: Mattermod <mattermod@users.noreply.github.com> * [MM-34838] Remove Ancillary Permissions That Are Purposefully Being Removed (#17466) * remove ancillary permissions * Start writing tests * Move Ancillary Permissions to FrontEnd * remove function * remove test * clean up * fix comment * Update api4/permission.go Co-authored-by: Martin Kraft <martinkraft@gmail.com> * Update api4/permission.go * Update api4/permission.go * license info * Add Tests Co-authored-by: Mattermod <mattermod@users.noreply.github.com> Co-authored-by: Martin Kraft <martinkraft@gmail.com> * [MM-34798] Respect MM_SERVER_PATH when looking for templates (#17410) * MM-31339: Send only one direct message reply within one calendar day. (#17181) * don't send auto response if already responded today * update query to get posts from channel for given user and Updatetime requires value in milli seconds * regenerate mocks and layers * update function to return true/false on existence of auto responded post in channel and add tests * add store tests * bubble up error and propagate upstream * fix error handling logic * use require instead of assert Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com> * rename variable for better redability and logging fixes * update comment explaining function * use new function to generate test ids * add comments to clarify NewTestId copies * add translations for error id * fix translation Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com> Co-authored-by: Mattermod <mattermod@users.noreply.github.com> Co-authored-by: Saturnino Abril <saturnino.abril@gmail.com> * [MM-34216] app/import: do not break import process if a dm channel is invalid (#17391) * app/import: do not break import process if a dm channel is invalid * update test headers Co-authored-by: Mattermod <mattermod@users.noreply.github.com> * [MM-33662] - Mock out CWS in enterprise code (#17305) * [MM-33662] - Mock out CWS in enterprise code * Feedback impl Co-authored-by: Mattermod <mattermod@users.noreply.github.com> * MM-34895 CRT: Replying to a root post with an at-mention triggers an unread mention (#17474) * don't count your own replies as unread * corrected totalUnreadThreads query * Improving doc extraction command (#17482) Automatic Merge * sync profile images (#17375) support for synchronizing user's profile image for shared channels. * [MM-33853] remove CSV row limit in compliance monitoring (#17185) * upgrade DB for 5.35 (#17488) * [MM-35039] - Send trial ended email (#17478) * [MM-35039] - Send trial ended email * Generations * Use First name with fallback to username * Use First name with fallback to username for trial ending email * Translations update from Weblate (#17509) * Translated using Weblate (Swedish) Currently translated at 100.0% (2310 of 2310 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ * Update translation files 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/ * Translated using Weblate (Dutch) Currently translated at 99.4% (2296 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ * Update translation files 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/ * Translated using Weblate (Dutch) Currently translated at 99.4% (2296 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ * Update translation files 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/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2313 of 2313 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 100.0% (2308 of 2308 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 100.0% (2307 of 2307 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ Translated using Weblate (Dutch) Currently translated at 99.5% (2299 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/ * Translated using Weblate (Romanian) Currently translated at 100.0% (2309 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ro/ * Update translation files 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/ Update translation files 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/ * Translated using Weblate (Turkish) Currently translated at 100.0% (2308 of 2308 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 100.0% (2308 of 2308 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Swedish) Currently translated at 100.0% (2313 of 2313 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ Translated using Weblate (Swedish) Currently translated at 100.0% (2308 of 2308 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ Translated using Weblate (Swedish) Currently translated at 99.9% (2307 of 2308 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/ * Translated using Weblate (Russian) Currently translated at 99.8% (2305 of 2308 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ru/ Co-authored-by: MArtin Johnson <martinjohnson@bahnhof.se> Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: Viorel-Cosmin Miron <cosmin@uhlhost.net> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Edward Smirnov <ed@microolap.com> * [MM-35039] - Send trial ended email (#17478) (#17510) * [MM-35039] - Send trial ended email * Generations * Use First name with fallback to username * Use First name with fallback to username for trial ending email (cherry picked from commit fd546cdff250315e14c3170e1fdbf2ba828b90c9) Co-authored-by: Allan Guwatudde <guwats10@gmail.com> * Fix conflict in remote_cluster_store test Signed-off-by: Mario de Frutos <mario@defrutos.org> * Fix upgrade conflicts Signed-off-by: Mario de Frutos <mario@defrutos.org> * Fix upgrade conflicts Signed-off-by: Mario de Frutos <mario@defrutos.org> * Upgrade for cloud branch Signed-off-by: Mario de Frutos <mario@defrutos.org> * MM-34549 shared channels; add users to channel that were already sync'd (#17361) Fixes a bug and adds a feature for shared channels: - The Bug: when creating new shared channels, users that had already been sync'd via another channel were not added to the new channel's member list, since the users were not sync'd again. This PR sync's users per channel. - The Feature: support custom statuses * sync profile images (#17375) (#17512) support for synchronizing user's profile image for shared channels. (cherry picked from commit ff657bfdef2467ab38641c39c5df171000c77eb6) Co-authored-by: Doug Lauder <wiggin77@warpmail.net> * Improving doc extraction command (#17482) (#17513) Automatic Merge (cherry picked from commit 7c7c4716e6cc73878734f4b52a34800096bd39e7) Co-authored-by: Jesús Espino <jespinog@gmail.com> * Fix sv.json conflict Signed-off-by: Mario de Frutos <mario@defrutos.org> * Updates on CI (#17484) * moving mattermost-ver and golangci out from the build step * adjusting resource class and update image for check-mocks job * MM-32950: Reliable WebSockets: Basic single server (#17406) * MM-32950: Reliable WebSockets: Basic single server This PR adds reliable websocket support for a single server. Below is a brief overview of the three states of a connection: Normal: - All messages are routed via web hub. - Each web conn has a send queue to which it gets pushed. - A message gets pulled from the queue, and before it gets written to the wire, it is added to the dead queue. Disconnect: - Hub Unregister gets called, where the connection is just marked as inactive. And new messages keep getting pushed to the send queue. If it gets full, the channel is closed and the conn gets removed from conn index. Reconnect: - We query the hub for the connection ID, and get back the queues. - We construct a WebConn reusing the old queues, or a fresh one depending on whether the connection ID was found or not. - Now there is a tricky bit here which needs to be carefully processed. On register, we would always send the hello message in the send queue. But we cannot do that now because the send queue might already have messages. Therefore, we don't send the hello message from web hub, if we reuse a connection. Instead, we move that logic to the web conn write pump. We check if the sequence number is in dead queue, and if it is, then we drain the dead queue, and start consuming from the active queue. No hello message is sent here. But if the message does not exist in the dead queue, and the sequence number is actually something that should have existed, then we set a new connction id and clear the dead queue, and send a hello message. The client, on receiving a new connection id will automatically set its sequence number to 0, and make the sync API calls to manage any lost data. https://mattermost.atlassian.net/browse/MM-32590 ```release-note NONE ``` * gofmt * Add EnableReliableWebSockets to the client config * Refactoring isInDeadQueue * Passing index to drainDeadQueue * refactoring webconn * fix pointer * review comments * simplify hasMsgLoss * safety comment * fix test * Trigger CI * Trigger CI Co-authored-by: Devin Binnie <devin.binnie@mattermost.com> Co-authored-by: Mattermod <mattermod@users.noreply.github.com> * MM-35125 CRT: Mention badge on threads doesn't appear until refresh (#17504) * update pr template (#17480) * MM-35127 CRT: Marking thread as unread doesn't set the timestamp correctly (#17507) Co-authored-by: Mattermod <mattermod@users.noreply.github.com> * MM-35128 CRT: Global Threads item should not be affected by 'mark as unread' in channel (#17505) Co-authored-by: Mattermod <mattermod@users.noreply.github.com> * Fix file info index batch (#17525) * MM-35239: Skip TestHubSessionRevokeRace (#17524) https://mattermost.atlassian.net/browse/MM-35239 ```release-note NONE ``` * MM-35103 Replies in a thread with an initial mention triggers notification each time (#17503) * only process parent post mentions for threads in order to autofollow * don't use merge since it modifies the original Co-authored-by: Mattermod <mattermod@users.noreply.github.com> * MM-34674 Adding config telemetry for feature flags. (#17456) * Adding config telemetry for feature flags. * Review fixes. * MM-24455: Fix role responses. (#17385) Automatic Merge * [MM-34918] Update prepackaged version of autolink and GitHub (#17465) * MM-18818 Prompt admins to set the Support Email (#17296) * MM-18818 Set default support to empty and handled the same in email templates * #MM-18818 Admin advisor now warns for inconfigured support email address * Updated text * #MM-18818 gofmt'ed files * #MM-18818 updated text and removed unused i18n strings: * #MM-18818 updated i18n string ordering * #MM-18818 Added test for support email advisory * MM-18818 gofmt'd the file * MM-18818 separated contextual notifications from configuration notifications in Admin Advisor * #MM-18818 prevented support email with whitepsaces from being detected as filled Co-authored-by: Mattermod <mattermod@users.noreply.github.com> * Automated cherry pick of #17503 (#17529) Co-authored-by: Mattermod <mattermod@users.noreply.github.com> Co-authored-by: Eli Yukelzon <reflog@gmail.c…
I'm not sure this deserves a separate issue, but I believe the buttons in Mattermost's emails do not render in GMail until loading images is permitted by the user. This does not seem to be an issue with Thunderbird. |
@loleg can you share screenshots and more detailed repro steps for our QA team to dig into? cc// @jgilliam17 |
Sure, here is what the e-mail content looks like in GMail when the sender is unknown. I would need to click somewhere in the white space below the words Reset your password to go to the password reset page: To reproduce, just create a user account with an address that you have not already used to interact with Mattermost. Or forward a password reset e-mail to another address. I have verified with another popular webmail, SOGo, where the issue looks identical. I am seeing this on 5.36.0 EE. |
cc// @jgilliam17 if you can repro and open a ticket ^ Thanks for the report! |
Summary:
Update the styling for email notifications to make them more friendly looking, helpful and informative to users.
(Optional) this may a helpful tool to do this: https://mjml.io/
The email template design was updated for the following email types:
Figma Design File: https://www.figma.com/file/xMMUFcqIFlyiJlIhLMlcWX/MM-22844-Email-Notification-Redesign?node-id=0%3A1
Sample Email UI Updates
DM Notification
Mention Notification
Batch Notifications
Proposed Updates as seen above:
Note: Some of the cloud emails follow similar layout for the top portion of the email. Implementation could benefit from leveraging this previous work.
If you're interested please comment here and come join our "Contributors" community channel on our daily build server, where you can discuss questions with community members and the Mattermost core team. For technical advice or questions, please join our "Developers" community channel.
New contributors please see our Developer's Guide.
JIRA: https://mattermost.atlassian.net/browse/MM-22844
The text was updated successfully, but these errors were encountered: