-
- Downloads
Add categories for custom emojis (#11196)
Fix #7940
Showing
- app/controllers/api/v1/custom_emojis_controller.rb 1 addition, 1 deletionapp/controllers/api/v1/custom_emojis_controller.rb
- app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js 16 additions, 14 deletions...odon/features/compose/components/emoji_picker_dropdown.js
- app/javascript/mastodon/features/emoji/emoji.js 3 additions, 0 deletionsapp/javascript/mastodon/features/emoji/emoji.js
- app/models/custom_emoji.rb 2 additions, 0 deletionsapp/models/custom_emoji.rb
- app/models/custom_emoji_category.rb 15 additions, 0 deletionsapp/models/custom_emoji_category.rb
- app/serializers/rest/custom_emoji_serializer.rb 10 additions, 0 deletionsapp/serializers/rest/custom_emoji_serializer.rb
- db/migrate/20190627222225_create_custom_emoji_categories.rb 9 additions, 0 deletionsdb/migrate/20190627222225_create_custom_emoji_categories.rb
- db/migrate/20190627222826_add_category_id_to_custom_emojis.rb 5 additions, 0 deletions...igrate/20190627222826_add_category_id_to_custom_emojis.rb
- db/schema.rb 9 additions, 1 deletiondb/schema.rb
- lib/mastodon/emoji_cli.rb 6 additions, 0 deletionslib/mastodon/emoji_cli.rb
- spec/fabricators/custom_emoji_category_fabricator.rb 3 additions, 0 deletionsspec/fabricators/custom_emoji_category_fabricator.rb
- spec/models/custom_emoji_category_spec.rb 5 additions, 0 deletionsspec/models/custom_emoji_category_spec.rb
- yarn.lock 2 additions, 2 deletionsyarn.lock
Loading