Commit graph

7 commits

Author SHA1 Message Date
fef
df00e5e6cb
merge with catstodon/main 2024-04-16 22:39:49 +00:00
40ef7b3849
Merge branch 'glitch-soc' into develop
# Conflicts:
#	app/javascript/flavours/glitch/initial_state.js
#	app/serializers/initial_state_serializer.rb
2024-02-06 22:58:23 +01:00
Essem
08e511cecb
Fix doodle modal icons (#2597) 2024-02-06 20:22:42 +01:00
Essem
ae854b8027
Port three new emoji reaction PR commits to Catstodon:
"Update reaction emails

Reaction icon made by @t3rminus@calamity.world"

"Simplify reactions API controller"

"Refactor status reactions query

This was done to announcement reactions in 1b0cb3b54d. Might as well do it here too."
2024-01-28 02:22:43 +01:00
5d4cfe4cd8
Merge branch 'glitch-soc' into develop 2024-01-17 22:37:29 +01:00
Claire
a1920425ca [Glitch] Switch from 48px weight 600 material symbol icons to 24px weight 400 icons
Port 6bbcd9348e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-15 20:53:08 +01:00
Claire
6bbcd9348e
Switch from 48px weight 600 material symbol icons to 24px weight 400 icons (#28064) 2024-01-12 20:16:48 +00:00