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

Riot -> Element #308

Merged
merged 6 commits into from
Jul 29, 2020
Merged

Riot -> Element #308

merged 6 commits into from
Jul 29, 2020

Conversation

anoadragon453
Copy link
Member

@anoadragon453 anoadragon453 commented Jul 24, 2020 •
edited
Loading

Fixes #306

This PR:

  • Converts email templates from Windows line endings to Unix line endings (this confused me for a good 10m, as I thought I had accidentally added them)
  • Converts instances of Riot to Element
  • Converts riot.im/app links to app.element.io

Still to do:

@nadonomy
Copy link

@anoadragon453 assets for the templates can be exported from https://www.figma.com/file/IhAMHBtQkLO8JPoWs94i7P/Element-Assets?node-id=3716%3A25

@anoadragon453
Copy link
Member Author

@nadonomy Thanks! Turns out there were already good images for me to use on static.element.io 🙂

image

@anoadragon453 anoadragon453 marked this pull request as ready for review July 28, 2020 17:34
@anoadragon453 anoadragon453 requested a review from a team July 28, 2020 17:34
clokep
clokep approved these changes Jul 29, 2020
View reviewed changes
Copy link
Member

@clokep clokep left a comment

Choose a reason for hiding this comment

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

Seems fine!

@anoadragon453 anoadragon453 merged commit fc20a96 into master Jul 29, 2020
@anoadragon453 anoadragon453 deleted the anoa/riot_to_element branch July 29, 2020 22:29
anoadragon453 added a commit that referenced this pull request Sep 2, 2020
@anoadragon453
Merge branch 'master' into dinsic
230035e 
* master:
  Add config options for how much to obfuscate email addresses in 3rd party invites (#311)
  Remove : from allowed client_secret chars (#309)
  Riot -> Element (#308)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@clokep clokep clokep approved these changes

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

Successfully merging this pull request may close these issues.

Replace email template references to Riot with Element
3 participants
@anoadragon453 @nadonomy @clokep