mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность
15 744 коммитов 3 Ветки 0 Теги
f31380f5773c6cea2d6434fb656d012d5cc9b866
Граф коммитов

96 Коммитов

Автор SHA1 Сообщение Дата
emmyni
701d0ecaa2 [MM-48098]: "Downgrade to Starter" CTA's go to purchase modal instead of pricing modal (#21849) 2022-12-13 08:55:52 -05:00
emmyni
cfa008e9c3 [MM-48097]: Delinquency Email Spacing/Wording Changes (#21740) 2022-11-28 14:46:48 -05:00
emmyni
679c23d235 [MM-47560]: In-product: Add support for new fields (back-end and front-end) 2022-10-24 13:34:38 -04:00
emmyni
3ea6247ec1 Merge pull request #21272 from emmyni/MM-46440 
[MM-46440]: Update Logo and Remove grey email border
 2022-10-24 09:27:06 -04:00
Emmy Ni
532a3c1f22 fix templates 2022-10-21 14:09:00 -04:00
Harshil Sharma
31e6cdd0e6 Slack attachment in email notifications (#20946) 
* First POC

* Added author data and markdown support

* WIP

* styled fields

* WIP

* WIP

* IMplementation done

* Updated template

* fixed mjml compilation error

* removed card.mjml

* Added test

* Updated a styling

* Updated a styling

* CI

* Updated generated templates

* Explicitelly specified font for message attachments

* Lint fix

* Removed leftover existances of slack attachment
 2022-10-20 11:05:22 +05:30
Emmy Ni
c8508f61cd Merge remote-tracking branch 'upstream/master' into MM-46440 2022-10-17 11:12:19 -04:00
Muhammad Salman
8bd6ec8f99 [MM-44790] removing extra margin bottom from the verify email change email heading 2022-10-13 21:00:44 +03:00
Muhammad Salman
1d9fdce916 Revert "add metropolis font to email change verify email html" 
This reverts commit 9f6497fb0e.
 2022-10-13 20:34:48 +03:00
Emmy Ni
f161f1e058 fix colours 2022-10-12 12:54:26 -04:00
Muhammad Salman
9f6497fb0e add metropolis font to email change verify email html 2022-10-11 12:46:10 +03:00
Muhammad Salman
6cc85b8350 [MM-44790] removing extra quotes around font-family 2022-10-10 20:40:40 +03:00
Muhammad Salman
affddb65da [MM-44790] add additional font family for consitency 2022-10-10 20:40:40 +03:00
Muhammad Salman
979359ade6 [MM-44790] fix the external link warning 2022-10-10 20:40:40 +03:00
Muhammad Salman
542c36bd68 new ui for email verify change email address 2022-10-10 20:40:40 +03:00
Emmy Ni
5beb99f3f4 update css 2022-10-07 10:17:18 -04:00
Emmy Ni
84134126c5 fix CI error 2022-10-06 17:23:00 -04:00
Emmy Ni
55b94ac826 fix logo 2022-10-06 14:27:22 -04:00
Emmy Ni
e407c9832e update background and logo 2022-10-04 17:15:09 -04:00
Nick Misasi
069049db03 Fix delinquency emails (#21029) 
* attempt to fix delinquency emails in gmail

* fix

* More fix
 2022-10-03 14:16:43 -04:00
Nick Misasi
8401a31c3a [MM-44729] Update payment failed email (#20925) 
* Update Payment Failed Email

* Actually add the mjml file:

* Fix mjml indentation

* Fix pipelines

* Fix translations

* Fix translations

* Clean up translations

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2022-09-08 11:01:50 -04:00
Nick Misasi
e8a45a8cf7 [MM-43399] Cloud Delinquency Email Sequence (#20814) 
* Add DelinquentSince to Subscription fields

* Stashing, migrating

* Adding file

* Adding many email templates

* Fix templates pipeline

* Fix translations

* Fix mocks

* Many changes

* Adjust mocks

* Update i18n/en.json

Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com>

* PR fixes

* Update string

* Update i18n/en.json

Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com>

* Update URL's for buttons to open the delinquency modal

* Update emails from mjml

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com>
 2022-08-25 09:39:35 -04:00
Allan Guwatudde
b445440600 [MM-45053] - Remove 'trial of Mattermost ending soon' product emails (#20550) 
* [MM-45053] - Remove 'trial of Mattermost ending soon' product emails

* remove trial end warning email
 2022-06-30 09:18:13 +03:00
Allan Guwatudde
c01fc923f5 [MM-45135] - Mattermost Logo is outdated in Cloud welcome email (#20548) 2022-06-28 18:11:24 +03:00
Allan Guwatudde
37fd699175 [MM-43920] - Set Workspace Inactivity Email to only fire once and change subject (#20134) 
* [MM-43920] - Set Workspace Inactivity Email to only fire once and change subject

* feedback impl

* temp change

* revert

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2022-05-06 11:54:38 +03:00
Nick Misasi
373c4655e6 [MM-43337] Updating email templates for trial will end and trial ended emails (#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 (#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 <mattermod@users.noreply.github.com>
 2022-04-28 10:06:16 -04:00
Agniva De Sarker
16b1cbd6e3 spelling (#19956) 
* spelling: activated

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: attachments

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: categories

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: category

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: cellspacing

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: channel

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: compliance

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: constraint

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: counts

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: createat

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: deactivate

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: destination

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: exceeded

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: failed

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: foreign

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: hours

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: inactivity

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: inappropriate

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: initialization

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: initialized

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: management

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: mismatch

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: recipients

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: scheme

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: signature

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: subscription

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: suggestions

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: sync

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: telemetry

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: webhook

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* Trigger CI
```release-note
NONE
```

Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2022-04-11 19:31:19 +05:30
Allan Guwatudde
fa56ee9d9a [MM-42713] - Remove cloud user limit restrictions (#19835) 
* [MM-42713] - Remove cloud user limit restrictions

* remove unused code

* fix translations

* feedback impl-1

* enterprise code clean up

* feedback impl-2

* fix mocks

* fix translations

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2022-03-31 18:24:38 +03:00
Allan Guwatudde
8d6d1c51c2 [MM-40917] - Inactive Server Email Notification (#19374) 
* [MM-40917] - Inactive Server Email Notification

* add email template

* make store layers

* add some store tests

* fix translations

* fix logic

* improve

* fix lint

* feedback-impl

* fix wrong text

* optimize queries

* move feature flag check

* feedback impl-1

* add line

* feedback impl

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2022-02-22 20:41:58 +03:00
Kyriakos Z
e9308640ec MM-35847: fixes email templates (#18634) 
Some email clients don't support style tags which results in CTA buttons
not being visible, and other styling being "broken".

This commit tries to fix that issue by both including style tags and
inlining the same CSS.
 2021-10-22 11:13:06 +03:00
Agniva De Sarker
9bbac354d8 Add new CI step for checking email templates (#18570) 
* Add new CI step for checking email templates

https://community-daily.mattermost.com/boards/workspace/zyoahc9uapdn3xdptac6jb69ic/285b80a3-257d-41f6-8cf4-ed80ca9d92e5/495cdb4d-c13a-4992-8eb9-80cfee2819a4?c=2c1d9628-675f-4eb6-80bb-db9e4d09b8bf

```release-note
NONE
```

* Pre-install

```release-note
NONE
```

* pinning down to 4.9.0

```release-note
NONE
```

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2021-10-07 13:07:38 +05:30
Allan Guwatudde
2a40a7d649 [MM-39072] - Run make build-templates on latest master (#18541) 
* [MM-39072] - Run make build-templates on latest master

* fix guest template failure
 2021-10-06 09:50:51 +03:00
Allan Guwatudde
132f2e9680 [MM-36603] - Text is cut-off on the bottom of the 14-day trial 3 day to end of trial email notification (#18421) 
* feedback impl

* add test
 2021-09-21 12:55:52 +03:00
Allan Guwatudde
ad5591cf75 [MM-37730] - Self-managed: Update email template to new branding - Batch Email (#18221) 
* [MM-37730] - Self-managed: Update email template to new branding - Batch Email

* batch email fixes

* simplify email title

* More fixes

* fix tests

* fix group message name on card

* fix bracket issue

* style the count

* account for  merged changes

* change truncating rule
 2021-09-16 22:08:31 +03:00
Allan Guwatudde
f13ebe84ef [MM-37725] - Self-managed: Update email template to new branding - Password Reset (#18135) 
* [MM-37725] - Self-managed: Update email template to new branding - Password Reset

* feedback impl

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2021-08-20 19:31:34 +03:00
Allan Guwatudde
95cea03704 [MM-37731] - Self-managed: Update email template to new branding - Invitation Guests (#18222) 2021-08-19 21:39:12 +03:00
Allan Guwatudde
117cfae0bf [MM-37726] - Self-managed: Update email template to new branding - Invitation email (#18200) 
* [MM-37726] -  Self-managed: Update email template to new branding - Invitation email

* fix subtitle color

* fix other template subtitle colors

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2021-08-18 20:09:37 +03:00
Allan Guwatudde
2547e47eab [MM-37727] - Self-managed: Update email template to new branding - Mention (#18134) 
* [MM-37727] - Self-managed: Update email template to new branding - Mention

* fix lint

* truncate long channel names

* change rgba to rgb

* feedback impl

* adjust character truncation length

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2021-08-18 16:14:47 +03:00
Allan Guwatudde
f43aa7d925 [MM-37726] - Self-managed: Update email template to new branding - Invitation email (#18136) 
* [MM-37726] - Self-managed: Update email template to new branding - Invitation email

* build

* feedback impl

* feedback impl

* feedback impl

* fix template

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2021-08-16 19:01:32 +03:00
Allan Guwatudde
d3973557fc [MM-37616] Self-managed: Update email template to new branding - Welcome and Verification email (#18076) 
* [MM-37616] - Update Welcome and Verify emails to new branding

* make build-templates

* styling feedback
 2021-08-12 11:55:16 +03:00
Martin Kraft
21639f9c87 MM-22845: Added support for permalink previews. (#17796) 
* MM-22845: Added support for permalink previews.

* MM-22845: Adds license to new file.

* MM-22845: Adds endpoint to retrieve multiple posts by id.

* MM-22845: Fix for deleted post.

* MM-22845: Adds config setting for permalink previews.

* MM-22845: Adds API test for new endpoint.

* MM-22845: Fix typo.

* MM-22845: Tests that post create or updated via App get the previewed_post prop.

* MM-22845: Tests for matching permalinks.

* MM-22845: Adds PreparePostForClient test for permalink previews.

* MM-22845: Embeds entire post in permalink metadata.

* MM-22845: Filter WS message payload of created and edited post based on permissions.

* MM-22845: Runs app layer generator.

* MM-22845: Lint check fix.

* MM-22845: Adds feature flag.

* MM-22845: Clones WS message.

* MM-22845: Removes knowledge of permalink from LinkMetadata table. Removes knowledge of user id from post embedding methods in favour of a 'sanitize' method/step.

* MM-22845: Handle nil post metadata.

* MM-22845: Switch to cloning post.

* MM-22845: Removes unused code.

* MM-22845: Refactor.

* MM-22845: Reverts whitespace change.

* MM-22845: Removes unnecessary code.

* MM-22845: Removes unnecessary function.

* MM-22845: Warn but don't error if permalinked referenced post or channel is not found.

* MM-22845: Fix for clone method.

* MM-22845: Fix for clone method.

* MM-22845: Updates translations.

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2021-08-09 11:33:21 -04:00
Allan Guwatudde
98d170894d [MM-36457] - Send email when license is up for renewal (#17816) 
* [MM-36457] - Send email when license is up for renewal

* i18n-extract

* feedback impl

* feedback impl

* fix translations

* Change license key to test for testing purposes

* Revert license key

* Trying test license key once more

* revert license change

Co-authored-by: marianunez <maria.nunez@mattermost.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2021-07-06 18:50:19 +03:00
Devin Binnie
347bc770ed [MM-35841] Fix invalid use of variables in invite_body template (#17643) 2021-05-19 15:50:05 -04:00
Jyoti Patel
d97daaa1de [GH-15906][MM-22844] Redesign message notification emails. (#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>
 2021-05-10 17:50:44 +02:00
Allan Guwatudde
fa0a408744 [MM-35061] - Welcome Email: Missing spacing between icon and paragraphs (#17567) 
* [MM-35061] - Welcome Email: Missing spacing between icon and paragraphs

* Feedback impl

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2021-05-05 12:57:15 +03:00
Harshil Sharma
79dd9b13dc 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>
 2021-04-28 12:05:38 +05:30
Allan Guwatudde
fd546cdff2 [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
 2021-04-23 21:45:47 +03:00
Allan Guwatudde
ab8b8e8bf2 [MM-34240] - Cloud: "Congratulations" welcome email missing images (#17350) 
* [MM-34240]-Cloud: Congratulations welcome email missing images

* Use img instead of svg

* Add fallback font Arial

* Feedback impl

* EOF

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2021-04-15 13:23:03 +03:00
Maria A Nunez
81c40174e6 Feature: Support Cloud 14-day Trial (#17397) 
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>
 2021-04-14 11:36:36 -04:00
Jason Blais
58069ff7dc Update to correct mailing address in outgoing server and portal email (#17223) 
* Update cloud_welcome_email.html

* Update en.json
 2021-03-25 10:43:11 +01:00