diff --git a/CHANGELOG.md b/CHANGELOG.md
index d08da09e59..2719edcf0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,15 @@
# Changelog
All notable changes to this project will be documented in this file.
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased]
### Added
- Ability to hide/show repeats from user
-- User profile button clutter organized into a menu
+- User profile button clutter organized into a menu
- Emoji picker
- Started changelog anew
+- Ability to change user's email
### Changed
- changed the way fading effects for user profile/long statuses works, now uses css-mask instead of gradient background hacks which weren't exactly compatible with semi-transparent themes
### Fixed
diff --git a/src/boot/routes.js b/src/boot/routes.js
index 5670236c77..7400a682ca 100644
--- a/src/boot/routes.js
+++ b/src/boot/routes.js
@@ -18,6 +18,7 @@ import AuthForm from 'components/auth_form/auth_form.js'
import ChatPanel from 'components/chat_panel/chat_panel.vue'
import WhoToFollow from 'components/who_to_follow/who_to_follow.vue'
import About from 'components/about/about.vue'
+import RemoteUserResolver from 'components/remote_user_resolver/remote_user_resolver.vue'
export default (store) => {
const validateAuthenticatedRoute = (to, from, next) => {
@@ -42,6 +43,16 @@ export default (store) => {
{ name: 'friends', path: '/main/friends', component: FriendsTimeline, beforeEnter: validateAuthenticatedRoute },
{ name: 'tag-timeline', path: '/tag/:tag', component: TagTimeline },
{ name: 'conversation', path: '/notice/:id', component: ConversationPage, meta: { dontScroll: true } },
+ { name: 'remote-user-profile-acct',
+ path: '/remote-users/(@?):username([^/@]+)@:hostname([^/@]+)',
+ component: RemoteUserResolver,
+ beforeEnter: validateAuthenticatedRoute
+ },
+ { name: 'remote-user-profile',
+ path: '/remote-users/:hostname/:username',
+ component: RemoteUserResolver,
+ beforeEnter: validateAuthenticatedRoute
+ },
{ name: 'external-user-profile', path: '/users/:id', component: UserProfile },
{ name: 'interactions', path: '/users/:username/interactions', component: Interactions, beforeEnter: validateAuthenticatedRoute },
{ name: 'dms', path: '/users/:username/dms', component: DMs, beforeEnter: validateAuthenticatedRoute },
diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index 5917598afc..1113f81d86 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -12,8 +12,8 @@
>
+ {{ $t('remote_user_resolver.searching_for') }} @{{ $route.params.username }}@{{ $route.params.hostname }} +
++ {{ $t('remote_user_resolver.error') }} +
+{{ $t('settings.new_email') }}
+ +{{ $t('settings.current_password') }}
+ ++ {{ $t('settings.changed_email') }} +
+ +{{ $t('settings.change_email_error') }}
+{{ changeEmailError }}
+ +