Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

mastodon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

66126f30

Commit 66126f30 authored 7 years ago by Eugen Rochko Committed by GitHub 7 years ago

Downloads
- Patches
- Plain Diff

Add custom emojis to the emoji picker (#5052)

parent 293972f7

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/javascript/mastodon/emoji.js 40 additions, 0 deletions

app/javascript/mastodon/emoji.js
app/javascript/mastodon/features/compose/components/compose_form.js 1 addition, 1 deletion

...ript/mastodon/features/compose/components/compose_form.js
app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js 15 additions, 1 deletion

...odon/features/compose/components/emoji_picker_dropdown.js
app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js 8 additions, 0 deletions

...res/compose/containers/emoji_picker_dropdown_container.js
app/javascript/mastodon/reducers/custom_emojis.js 13 additions, 0 deletions

app/javascript/mastodon/reducers/custom_emojis.js
app/javascript/mastodon/reducers/index.js 2 additions, 0 deletions

app/javascript/mastodon/reducers/index.js
app/javascript/styles/components.scss 6 additions, 0 deletions

app/javascript/styles/components.scss
app/serializers/initial_state_serializer.rb 6 additions, 0 deletions

app/serializers/initial_state_serializer.rb

with 91 additions and 2 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment