Noa Himesaka
bd3ef05053
Merge commit 'refs/pull/2462/head' of https://github.com/glitch-soc/mastodon
2024-08-24 22:54:36 +09:00
Noa Himesaka
acf40f349d
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-08-24 22:53:34 +09:00
Claire
d0529b810a
Merge commit '97f6baf977212e84125ac325176ad305ad5b068a' into glitch-soc/merge-upstream
2024-08-24 12:06:31 +02:00
github-actions[bot]
62be0234d5
New Crowdin Translations (automated) ( #31559 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-23 08:59:31 +00:00
Claire
532b53eece
Fix assets build issue due to slightly different webpack config
2024-08-22 22:23:06 +02:00
Claire
e18bd0450a
Extract strings removed upstream
2024-08-22 22:17:33 +02:00
Claire
7ce079cd26
[Glitch] Fix missing CSS in moderation interface
...
Port e08d22724d
2024-08-22 22:11:48 +02:00
Claire
dc70ef25b2
Merge commit 'e08d22724d9baf6c639466507c2b117788e5b8de' into glitch-soc/merge-upstream
2024-08-22 22:09:10 +02:00
Claire
e08d22724d
Fix missing CSS in moderation interface ( #31550 )
2024-08-22 18:57:22 +00:00
Claire
9f2d3c721c
[Glitch] Hide multiple selection bar for notification requests when no notificion requests are loaded
...
Port abe292b0ec
2024-08-22 20:00:19 +02:00
Emelia Smith
37f20514d3
[Glitch] Add button to view the Hashtag on the instance from Hashtags in Moderation UI
...
Port 376088f6da
2024-08-22 19:59:37 +02:00
Claire
18556d3e9b
Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream refactored some helpers and moved them in another file.
Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
Kept glitch-soc definitions where they are and moved upstream ones
as upstream did.
2024-08-22 19:54:20 +02:00
Essem
e3dbd2e648
Fix grouped reaction notification text
2024-08-22 12:24:08 -05:00
Essem
4399c948fb
Fix reblog reactions being hydrated improperly
2024-08-22 12:24:00 -05:00
Essem
9b69c6468f
Fix i18n
2024-08-22 12:24:00 -05:00
Essem
1c57f5257b
Fix reactions bar alignment in grouped notifications
2024-08-22 12:24:00 -05:00
Essem
f02eee39f6
Add notification grouping for reactions
2024-08-22 12:24:00 -05:00
Essem
69adea4342
Turn custom emoji regexps into class level constants
2024-08-22 12:24:00 -05:00
Essem
c791890b77
Disable reactions in detailed status view when visibleReactions is 0
2024-08-22 12:24:00 -05:00
Jeremy Kescher
8104b63e6c
[Glitch+Emoji reactions] Use modern React context for for identity for emoji reaction code
2024-08-22 12:24:00 -05:00
Essem
524dd8c447
Fix reaction picker dropdown appearance
2024-08-22 12:23:59 -05:00
Essem
5edb855e67
Merge fixes
2024-08-22 12:23:59 -05:00
Essem
b42196e4c1
Hydrate reactions on streaming API
2024-08-22 12:23:59 -05:00
Essem
0db9282bd7
Purge status reactions on account delete
2024-08-22 12:23:59 -05:00
Essem
89e9f95e8b
Fix rubocop lint issue
2024-08-22 12:23:59 -05:00
Essem
4bcd275151
Refactor status reactions query
...
This was done to announcement reactions in 1b0cb3b54d
2024-08-22 12:23:59 -05:00
Essem
df6d11d630
Simplify reactions API controller
2024-08-22 12:23:58 -05:00
Essem
229fafe681
Update reaction emails
...
Reaction icon made by t3rminus@calamity.world
2024-08-22 12:23:58 -05:00
Essem
76ecfbd608
Revert variant selector normalization
...
Probably worth tackling later, but for now it's not worth worrying about; some other implementations (e.g. Misskey's) look to have the same behavior anyways.
2024-08-22 12:23:58 -05:00
Essem
ac7f4af7db
Move reaction normalization to API controller
2024-08-22 12:23:58 -05:00
Essem
7c28621855
Quick fixes
2024-08-22 12:23:58 -05:00
Essem
730370dcb4
Make name of like content parser function more general
2024-08-22 12:23:58 -05:00
Essem
c23c41915d
Normalize emojis with variant selectors
2024-08-22 12:23:57 -05:00
Essem
bc99b5434e
Check for content attribute in Misskey likes
2024-08-22 12:23:57 -05:00
Essem
254981f1ec
Add reaction notification column settings
...
This was in a previous PR. Not quite sure how it didn't carry over.
2024-08-22 12:23:57 -05:00
Essem
19ca103f3c
Linting fixes
2024-08-22 12:23:57 -05:00
Essem
09fc1ecb14
Refactor react services
2024-08-22 12:23:57 -05:00
Essem
991da0ce48
Fix reblog reactions
2024-08-22 12:23:57 -05:00
Essem
90b2d9e768
Add notification emails for reactions
2024-08-22 12:23:56 -05:00
Essem
26254c3c45
Add support for emoji reactions
...
Squashed, modified, and rebased from glitch-soc/mastodon#2221 .
Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2024-08-22 12:23:56 -05:00
Eugen Rochko
500f4925a5
Change how content warnings and filters are displayed in web UI ( #31365 )
2024-08-22 17:12:35 +00:00
Claire
98237207e6
Fix unnecessary “next” link when API returns fewer notification requests than requested ( #31541 )
2024-08-22 13:42:04 +00:00
Claire
abe292b0ec
Hide multiple selection bar for notification requests when no notificion requests are loaded ( #31540 )
2024-08-22 13:42:02 +00:00
Renaud Chaput
4a968cb7a9
Add icon field to instance endpoint ( #30205 )
2024-08-22 10:04:27 +00:00
Emelia Smith
376088f6da
Add button to view the Hashtag on the instance from Hashtags in Moderation UI ( #31533 )
2024-08-22 08:42:33 +00:00
github-actions[bot]
f86d16adba
New Crowdin Translations (automated) ( #31536 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-22 08:04:56 +00:00
Claire
1e814f58cc
[Glitch] Remove dead CSS code
...
Port 2da687a28b
2024-08-21 20:33:39 +02:00
Claire
fa2e758152
Merge commit '2da687a28b509025343d3d8ca17753de9b128e8f' into glitch-soc/merge-upstream
2024-08-21 20:32:02 +02:00
Claire
2da687a28b
Remove dead CSS code ( #31527 )
2024-08-21 17:05:02 +00:00
Claire
3ffdb7cdac
[Glitch] Remove fontawesome leftovers
...
Port edeae945c0
2024-08-21 18:52:40 +02:00
