Reactions will be backported to the vanilla
flavour, which requires all related settings to
be accessible from the vanilla settings page
rather than the glitch specific settings modal.
This adds an extra item to the local settings for
specifying the number of reactions shown in toots.
The detailed status view always shows all
reactions.
* Add missing locale keys
Added missing translation keys to en.js to make translation easier and more complete.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove translation keys for explore
Have been added to vanilla in #2014
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove unused key
Sorry, originally worked on this on my custom fork, which has this key, before I decided to work on glitch.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
Upstream change too close to a glitch-soc-specific string.
The glitch-soc-specific string should not have been in this file, so it
has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
Upstream refactored a part, that as usual is split and duplicated in various
pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
Upstream fixed custom.css path in a different way than we did, went with
upstream's change.
fef
www-cat
Plastikmensch
Michal Dvorak
Claire
prplecake
Jeong Arm
atsu1125
Julianne420
Thibaut Girka
otrapersona
Spencer Alves
霧島ひなた
Marcin Mikołajczak
imncls
kibigo!
ncls7615
beatrix
cwm