1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-01 00:08:39 +09:00
Commit Graph

23852 Commits

Author SHA1 Message Date
Matt Jankowski
675d3ea5c1
Extract dashboard partial for admin instance page (#32189) 2024-10-01 08:36:41 +00:00
Renaud Chaput
497e8d00b9
Bump main version 4.4.0-alpha.1 (#32180) 2024-10-01 08:36:22 +00:00
renovate[bot]
d9973f3b70
Update peter-evans/create-pull-request action to v7.0.5 (#32164)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-01 08:28:50 +00:00
Matt Jankowski
685067efd1
Avoid id duplication conflict with main navigation from settings profile link (#32181) 2024-10-01 08:23:05 +00:00
Renaud Chaput
1be55ce244
Fix follow notifications from streaming being grouped (#32179) 2024-10-01 08:22:14 +00:00
github-actions[bot]
5839ee434b
New Crowdin Translations (automated) (#32195)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-01 08:21:17 +00:00
Matt Jankowski
0b6d217b9e
Use account display name for pretend blog example in attribution area (#32188) 2024-10-01 08:19:53 +00:00
Noa Himesaka
67c1a405ad Merge branch 'pr2462' 2024-10-01 17:19:04 +09:00
Essem
a728b77de2
Make addReaction and removeReaction optional props
This prevents things from breaking with embeds.
2024-09-30 20:29:22 -05:00
Essem
55cd0e37a2
Fix grouped reaction notification text 2024-09-30 20:29:22 -05:00
Essem
f8a38731c3
Fix reblog reactions being hydrated improperly 2024-09-30 20:29:22 -05:00
Essem
075aa1beb4
Fix reactions bar alignment in grouped notifications 2024-09-30 20:29:22 -05:00
Essem
4e127c00b8
Add notification grouping for reactions 2024-09-30 20:29:21 -05:00
Essem
d0307e6d52
Turn custom emoji regexps into class level constants 2024-09-30 20:28:42 -05:00
Essem
f9f42bb416
Disable reactions in detailed status view when visibleReactions is 0 2024-09-30 20:28:42 -05:00
Jeremy Kescher
23bb205168
[Glitch+Emoji reactions] Use modern React context for for identity for emoji reaction code 2024-09-30 20:28:42 -05:00
Essem
8e924e4f0a
Fix reaction picker dropdown appearance 2024-09-30 20:28:42 -05:00
Essem
5b98796294
Merge fixes 2024-09-30 20:28:01 -05:00
Essem
7cb1921ae7
Hydrate reactions on streaming API 2024-09-30 20:28:01 -05:00
Essem
f2671e7fe1
Purge status reactions on account delete 2024-09-30 20:28:01 -05:00
Essem
d8dfb80f72
Fix rubocop lint issue 2024-09-30 20:28:00 -05:00
Essem
2ec65010d5
Refactor status reactions query
This was done to announcement reactions in 1b0cb3b54d. Might as well do it here too.
2024-09-30 20:28:00 -05:00
Essem
edcb96a54c
Simplify reactions API controller 2024-09-30 20:28:00 -05:00
Essem
1c237054f9
Update reaction emails
Reaction icon made by t3rminus@calamity.world
2024-09-30 20:28:00 -05:00
Essem
1586498896
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-09-30 20:28:00 -05:00
Essem
a58b87f086
Move reaction normalization to API controller 2024-09-30 20:28:00 -05:00
Essem
1f8fd31210
Quick fixes 2024-09-30 20:27:59 -05:00
Essem
73e334f611
Make name of like content parser function more general 2024-09-30 20:27:59 -05:00
Essem
f64726eb75
Normalize emojis with variant selectors 2024-09-30 20:27:59 -05:00
Essem
cf8ec7193b
Check for content attribute in Misskey likes 2024-09-30 20:27:59 -05:00
Essem
f1ad6d7378
Fix rubocop complaint 2024-09-30 20:27:59 -05:00
Essem
610ec589d1
Add reaction notification column settings
This was in a previous PR. Not quite sure how it didn't carry over.
2024-09-30 20:27:59 -05:00
Essem
80422a1ecd
Linting fixes 2024-09-30 20:27:58 -05:00
Essem
115de85c92
Refactor react services 2024-09-30 20:27:58 -05:00
Essem
5e15ec3ba2
Fix reblog reactions 2024-09-30 20:27:58 -05:00
Essem
defb301ea9
Add notification emails for reactions 2024-09-30 20:27:58 -05:00
Essem
0fe45d5fef
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-09-30 20:27:58 -05:00
Claire
07cd1fd1ef
Support translation branches in Crowdin (#32174) 2024-09-30 17:32:23 +00:00
Claire
88756ab75f
Merge pull request #2861 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 03210085b7
2024-09-30 13:30:14 +02:00
Claire
9af9ef6fb3 Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream 2024-09-30 13:04:19 +02:00
Claire
03210085b7
Bump version to 4.3.0-rc.1 (#32124) 2024-09-30 10:42:59 +00:00
Claire
0c872beed4
Merge commit from fork
This should not change the set of words matched by `USERNAME_RE` but does
change the one matched by `MENTION_RE`. Indeed, the previous regexp allowed
a domain part to start with `.` or `-`, which the new regexp does not allow.
2024-09-30 12:25:54 +02:00
Claire
e22eff8900
Remove regexp timeout feature (#32169) 2024-09-30 09:41:06 +00:00
renovate[bot]
431b382563
Update dependency sass to v1.79.4 (#32139)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-30 08:55:18 +00:00
renovate[bot]
bf7cfba48e
Update DefinitelyTyped types (non-major) (#32163)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-30 08:53:52 +00:00
github-actions[bot]
f477dc399e
New Crowdin Translations (automated) (#32140)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-30 08:53:29 +00:00
renovate[bot]
6037714f76
Update dependency propshaft to v1.0.1 (#32158)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-30 08:47:57 +00:00
Eugen Rochko
c352ce6f45
Fix missing permission on new embeds making them unclickable (#32135) 2024-09-30 08:20:20 +00:00
Claire
9bf624b44d
Merge pull request #2860 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 9d664f87a0
2024-09-29 20:36:32 +02:00
Eugen Rochko
e80971e660 [Glitch] Change media reordering design in the compose form in web UI
Port 11a12e56b3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-29 14:03:19 +02:00