bacecff2ab
Merge upstream
...
Signed-off-by: 무라쿠모 <space@psec.dev>
2024-08-05 22:31:05 +09:00
Noa Himesaka
4778c61349
Merge branch 'pr2462'
2024-07-27 15:29:08 +09:00
Noa Himesaka
7b8d855ec2
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-07-27 15:28:10 +09:00
Claire
8af71d021b
Merge pull request #2797 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 887e64efd4
2024-07-25 19:06:12 +02:00
Claire
cf5d2c3fe4
Merge commit '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream
2024-07-25 17:47:02 +02:00
Claire
836719edf0
Merge pull request #2796 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 4d374cf730
2024-07-25 17:46:10 +02:00
Adam Niedzielski
887e64efd4
Allow @ at the end of an URL ( #31124 )
2024-07-25 15:02:58 +00:00
Matt Jankowski
5f5373397f
Remove duplicate omniauth_only? helper method ( #31066 )
2024-07-25 14:59:56 +00:00
Adam Niedzielski
fbf95216c5
Fix LinkCrawlWorker NoMethodError: undefined method `[]' for nil ( #31144 )
2024-07-25 14:51:44 +00:00
Matt Jankowski
bfaa53343a
Improve failure message on pagination matcher ( #31146 )
2024-07-25 14:28:08 +00:00
Adam Niedzielski
337a7fcf30
Fix ß bug in regexp for mentions and tags ( #31122 )
2024-07-25 14:24:19 +00:00
Matt Jankowski
e881a59671
Add User.unconfirmed scope, reduce factories in scheduler/user_cleanup spec ( #31063 )
2024-07-25 14:18:24 +00:00
Claire
c94c5da7b4
Merge commit '4d374cf73096be1e5347e131c91c99842e3c6dbb' into glitch-soc/merge-upstream
2024-07-25 12:43:25 +02:00
Matt Jankowski
34626b8291
Update schema to reflect full db:migrate run results ( #31128 )
2024-07-25 10:37:48 +00:00
renovate[bot]
4d374cf730
chore(deps): update dependency opentelemetry-exporter-otlp to v0.28.1 ( #31139 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-25 10:00:06 +00:00
renovate[bot]
efa7ad9d75
chore(deps): update dependency node to 20.16 ( #31127 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-25 07:44:54 +00:00
github-actions[bot]
ef0e3e447a
New Crowdin Translations (automated) ( #31119 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-25 07:44:00 +00:00
renovate[bot]
9c39fb52f3
chore(deps): update opentelemetry-ruby (non-major) ( #31138 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-25 07:21:01 +00:00
renovate[bot]
8117977c88
fix(deps): update dependency postcss to v8.4.40 ( #31137 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-25 07:20:55 +00:00
Essem
ef8e5891cc
Fix i18n
2024-07-24 23:16:01 -05:00
Essem
44caa3e1e2
Fix reactions bar alignment in grouped notifications
2024-07-24 23:11:53 -05:00
Essem
6785d855d8
Add notification grouping for reactions
2024-07-24 22:54:28 -05:00
Essem
ac50c722d2
Turn custom emoji regexps into class level constants
2024-07-24 22:54:28 -05:00
Essem
cafc15e30f
Disable reactions in detailed status view when visibleReactions is 0
2024-07-24 22:54:28 -05:00
Jeremy Kescher
ace921461c
[Glitch+Emoji reactions] Use modern React context for for identity for emoji reaction code
2024-07-24 22:54:28 -05:00
Essem
5aae7c9f92
Fix reaction picker dropdown appearance
2024-07-24 22:54:28 -05:00
Essem
347b9945db
Merge fixes
2024-07-24 22:54:28 -05:00
Essem
7aa017302f
Hydrate reactions on streaming API
2024-07-24 22:54:27 -05:00
Essem
ff77262648
Purge status reactions on account delete
2024-07-24 22:54:27 -05:00
Essem
f93a2de8d4
Fix rubocop lint issue
2024-07-24 22:54:27 -05:00
Essem
0fc853669e
Refactor status reactions query
...
This was done to announcement reactions in 1b0cb3b54d
2024-07-24 22:54:27 -05:00
Essem
775e5a585a
Simplify reactions API controller
2024-07-24 22:54:27 -05:00
Essem
1bcf5ccac8
Update reaction emails
...
Reaction icon made by t3rminus@calamity.world
2024-07-24 22:54:27 -05:00
Essem
f34dbb6479
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-07-24 22:54:27 -05:00
Essem
920caf7682
Move reaction normalization to API controller
2024-07-24 22:54:26 -05:00
Essem
401ab36f91
Quick fixes
2024-07-24 22:54:26 -05:00
Essem
e3249636e4
Make name of like content parser function more general
2024-07-24 22:54:26 -05:00
Essem
bb179e3068
Normalize emojis with variant selectors
2024-07-24 22:54:26 -05:00
Essem
e72385c8dd
Check for content attribute in Misskey likes
2024-07-24 22:54:26 -05:00
Essem
18dd721c3f
Fix rubocop complaint
2024-07-24 22:54:26 -05:00
Essem
12c07b66b3
Add reaction notification column settings
...
This was in a previous PR. Not quite sure how it didn't carry over.
2024-07-24 22:54:26 -05:00
Essem
5adfa5a30f
More cleanup
2024-07-24 22:54:26 -05:00
Essem
b4926ebf78
Linting fixes
2024-07-24 22:54:25 -05:00
Essem
c4f5611d43
Refactor react services
2024-07-24 22:54:25 -05:00
Essem
42a377fa62
Fix reblog reactions
2024-07-24 22:54:25 -05:00
Essem
f381aabbf1
Add notification emails for reactions
2024-07-24 22:54:25 -05:00
Essem
45e1d4ed74
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-07-24 22:54:25 -05:00
Claire
6be21ae8ac
Fix double indent for post attachments and metadata in grouped notifications ( #2793 )
2024-07-24 22:35:39 +02:00
Claire
0adf31c007
Merge pull request #2794 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to e507d17520
2024-07-24 22:34:01 +02:00
renovate[bot]
9e04007020
chore(deps): update opentelemetry-ruby (non-major) ( #31126 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-24 19:27:39 +00:00
