-
-
Notifications
You must be signed in to change notification settings - Fork 771
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
Email design update #746
Email design update #746
Conversation
Codecov Report
@@ Coverage Diff @@
## master #746 +/- ##
==========================================
- Coverage 33.97% 33.92% -0.06%
==========================================
Files 101 101
Lines 5774 5784 +10
Branches 672 676 +4
==========================================
Hits 1962 1962
- Misses 3733 3742 +9
- Partials 79 80 +1
Continue to review full report at Codecov.
|
purdy excited about this.. what is still left TODO on this PR? |
@jakerockland Could we
PS: Does this PR also update the Gitcoin weekly mail ? |
@thelostone-mc sure thing, can take care of all of those things. I like to commit early and often so was waiting to squash commits until after the WIP is a bit more finalized. 😄Also I don't believe that this PR updates the Gitcoin weekly email (unless the weekly email uses @owocki only outstanding things are those listed above from @thelostone-mc (I wanted to start off with WIP PR to see if there were any other outstanding tweaks changes that anyone had in feedback) and also I still need to verify if |
Ah other than that , everything else looks solid :D |
makes sense to me!
i posted some screenshots of this above. tip email looks okay. roundup email needs a little work though thanks... looking forward to getting this to merge! |
Looking good @jakerockland! |
@owocki The redeem tip button! |
I agree! @jakerockland can you make it so!?
i think this could use another pass too. you can edit the source data in retail/emails.py if you are still having problems with the bounties not existing in your local DB |
@jakerockland once we get the merge conflicts resolved and resolve the above issues im looking forward to merging this! |
Yes yes! Sorry for the delay, I will wrap this up tomorrow or Friday at the very latest. Been a bit tied up! 😓😅
…On Apr 4, 2018, 9:57 AM -0700, Kevin Owocki ***@***.***>, wrote:
@jakerockland once we get the merge conflicts resolved im looking forward to merging this!
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or mute the thread.
|
So I believe that this PR addresses almost all outstanding issues now except for one thing, on the single bounty page, are we sure we want to remove the fire emojis? From what I understand, that email currently will only ever have content for one bounty. @owocki I was able to get things working with being able to effectively work on |
@thelostone-mc Is it possible to merge this with Githubs squash & merge feature? I'm having trouble squashing my commits now that I've pulled the upstream changes to resolve the merge conflicts from adding translation support. Also I was able to cleanup the |
@jakerockland You won't have merge conflicts in this case but it's always good to rebase before getting the PR is merged! That said, let's get this merged and celebrate 🍻 Squash dem commits
Rebase with upstream :
That should do the trick ^_^ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm. @owocki Are you good with this PR?
519207d <= there were some untested emails.. i just submitted some fixes for them here.. now i'm good with the merge shipit! |
@thelostone-mc So the problem is that there were previously merge conflicts with the master branch so I pulled the master branch into this branch to resolve those conflicts, but now when I try to rebase using the above method, the commit history includes all of the commits that were on master that I pulled into my branch, not just my commits onto this branch before pulling master in. 😓 |
@jakerockland Don't worry about rebasing this branch. I'll squash commits when I merge it. |
Description
This PR is a current work in progress solution for updating the email templates as described in issue #563.
Checklist
Affected core subsystem(s)
n/a?
Testing
I have only changed HTML/CSS for email templates (all Django templating has been left unchanged).
Refers/Fixes
Fixes: #563
Screenshots of Current Progress