Show the local couterpart of emoji when it exists in /admin/custom_emojis #5467
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…l-counterpart-when-it-exists
ykzts
approved these changes
Oct 28, 2017
clworld
added a commit
to clworld/mastodon
that referenced
this pull request
Nov 17, 2017
Gargron
pushed a commit
that referenced
this pull request
Nov 17, 2017
cobodo
pushed a commit
to cobodo/mastodon
that referenced
this pull request
Dec 6, 2017
…mojis (mastodon#5467) * Show the local couterpart of emoji when it exists in admin/custom_emojis * Fix indentation * Fix error * Add class table-action-link to Overwrite link * Make it enable to overwrite emojis * Make Code Climate happy
cobodo
pushed a commit
to cobodo/mastodon
that referenced
this pull request
Dec 6, 2017
* Changed ĩ => ï * Changed ĩ => ï * Add ability to disable login and mark accounts as memorial (mastodon#5615)
cobodo
pushed a commit
to cobodo/mastodon
that referenced
this pull request
Dec 6, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When I'm in the custom emoji admin page, I often have to check whether I've copied custom emojis already. After this PR merged, the local emoji which has the same shortcode is shown in the copy button.
I also make it possible to overwrite existing local emojis with remote emoji. We could manually delete emoji and copy from remote previously, so there is little disadvantage with it.