Skip to content
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.

Sign up for GitHub

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

Jump to bottom

MF-942 - Fix email template logic #944

Merged
merged 14 commits into from
Nov 11, 2019
Merged

MF-942 - Fix email template logic #944

merged 14 commits into from
Nov 11, 2019

Conversation

mteodor
Copy link
Contributor

@mteodor mteodor commented Nov 9, 2019

Which issue(s) does this PR fix/relate to?

Resolves #942

Did you document any new/modified functionality?

Yes

@mteodor mteodor requested a review from a team as a code owner November 9, 2019 06:11
@mteodor mteodor requested a review from drasko November 9, 2019 06:13
blokovi
blokovi previously approved these changes Nov 9, 2019
View reviewed changes
@codecov-io
Copy link

codecov-io commented Nov 9, 2019 •
edited
Loading

Codecov Report

Merging #944 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #944   +/-   ##
=======================================
  Coverage   83.69%   83.69%           
=======================================
  Files          75       75           
  Lines        5244     5244           
=======================================
  Hits         4389     4389           
  Misses        588      588           
  Partials      267      267

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e735e5c...dda8d4f. Read the comment docs.

@chombium chombium mentioned this pull request Nov 9, 2019
Closed
@drasko drasko changed the title NOISSUE - fix email template logic MF-942 - fix email template logic Nov 10, 2019
drasko
drasko requested changes Nov 10, 2019
View reviewed changes
users/README.md Outdated
@@ -41,9 +41,9 @@ default values.
| MF_EMAIL_PASSWORD | Mail server password | |
| MF_EMAIL_FROM_ADDRESS | Email "from" address | |
| MF_EMAIL_FROM_NAME | Email "from" name | |
| MF_TOKEN_SECRET | Token secret for signing token used for password reset | |
| MF_EMAIL_TEMPLATE | Email template for sending emails with password reset link | email.tmpl |
| MF_TOKEN_SECRET | Password reset token signing secret | |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Align this properly

users/README.md Outdated
```

if 'MF_EMAIL_TEMPLATE' doesn't point to any file service will function but password reset functionality will not work
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sentences start with capital letter.

Use backticks (``) rather than single qoutes.

@drasko drasko changed the title MF-942 - fix email template logic MF-942 - Fix email template logic Nov 10, 2019
@mteodor
fix email template
74cb3a7 
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
@mteodor
rename resetPasswEmail.tmpl
d331657 
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
@mteodor
add env var
20668df 
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
@mteodor
rename resetPasswEmail.tmpl
6eb91af 
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
@mteodor
rename resetPasswEmail.tmpl
0b37749 
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
@mteodor
upd docs
8eeb329 
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
@mteodor
upd docs
b2364e4 
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
@mteodor
upd docs
14ab8c1 
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
@mteodor
remove not needed file
f2bac00 
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
@mteodor
move email tmpl
cb89a5f 
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
@mteodor
move email tmpl
8fcf45b 
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
@mteodor
move email tmpl
b8a9e82 
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
@mteodor
variable for tmpl
e38e90d 
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
@mteodor
fix ident and caps
dda8d4f 
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
anovakovic01
anovakovic01 approved these changes Nov 11, 2019
View reviewed changes
Copy link
Contributor

@anovakovic01 anovakovic01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

manuio
manuio approved these changes Nov 11, 2019
View reviewed changes
Copy link
Contributor

@manuio manuio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

drasko
drasko approved these changes Nov 11, 2019
View reviewed changes
Copy link
Contributor

@drasko drasko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@drasko drasko merged commit 9e8dd4b into absmach:master Nov 11, 2019
manuio pushed a commit that referenced this pull request Oct 12, 2020
@mteodor @drasko
MF-942 - Fix email template logic (#944)
3862498 
* fix email template

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* rename resetPasswEmail.tmpl

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* add env var

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* rename resetPasswEmail.tmpl

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* rename resetPasswEmail.tmpl

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* upd docs

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* upd docs

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* upd docs

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* remove not needed file

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* move email tmpl

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* move email tmpl

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* move email tmpl

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* variable for tmpl

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix ident and caps

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
@mteodor mteodor deleted the email-tmpl branch September 13, 2021 12:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drasko drasko drasko approved these changes

@nmarcetic nmarcetic nmarcetic approved these changes

@manuio manuio manuio approved these changes

@anovakovic01 anovakovic01 anovakovic01 approved these changes

@dborovcanin dborovcanin dborovcanin approved these changes

@blokovi blokovi blokovi left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

E-mail template usage is confusing
8 participants
@mteodor @codecov-io @drasko @nmarcetic @manuio @blokovi @anovakovic01 @dborovcanin