tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,532 Commits 5 Branches 0 Tags
Commit Graph

26532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
be762da45f Merge commit '254fff93ca3604438a94a453bedfe6f499e2cd66' into glitch-soc/merge-upstream 2025-10-13 16:51:40 +02:00
Claire
254fff93ca
Bump version to v4.4.6 (#36447) 2025-10-13 14:31:12 +00:00
Claire
2971ac9863
Fix streaming still being authorized for suspended accounts (#36448) 2025-10-13 13:35:44 +00:00
Claire
3354f4ce8b
Merge pull request #3231 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 7e98fa9b476fdaed235519f1d527eb956004ba0c
 2025-10-13 14:44:20 +02:00
Claire
8921494571 Merge commit '7e98fa9b476fdaed235519f1d527eb956004ba0c' into glitch-soc/merge-upstream 2025-10-13 14:26:11 +02:00
Emelia Smith
7e98fa9b47
Merge commit from fork 
* Require read, read:statuses or read:notifications scope to access streaming APIs

* Add additional tests for scope-based channel access

We were missing tests in the affirmative for subscribing to the user:notification channel, this adds them
 2025-10-13 14:20:57 +02:00
Emelia Smith
24dcb18013
Merge commit from fork 
* Ensure tootctl revokes sessions, access tokens and web push subscriptions

* Fix test coverage
 2025-10-13 14:20:23 +02:00
Emelia Smith
8d09e4ef23
Merge commit from fork 
* Streaming: Ensure disabled users cannot connect to streaming

* Streaming: Disconnect when the user is disabled
 2025-10-13 14:19:14 +02:00
renovate[bot]
692cfe27fa
Update dependency opentelemetry-instrumentation-excon to v0.25.2 (#36436) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-13 10:01:00 +00:00
github-actions[bot]
8b78c033e8
New Crowdin Translations (automated) (#36433) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-13 09:25:52 +00:00
Claire
ab93e9fc8a
Update dependency rack (#36443) 2025-10-13 09:13:17 +00:00
Claire
807a4bdec9
Merge pull request #3227 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 0219b7cad7d9ef800f82cc561571b70da040433f
 2025-10-10 21:32:34 +02:00
Emelia Smith
5dff3414ce [Glitch] Improve display of content warnings in Admin UI 
Port 8898f120dc1b5ad0d543360541fe99b5c10fa77b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-10 19:01:38 +02:00
Emelia Smith
adc0e15167 [Glitch] Add support for displaying link previews for Admin UI 
Port 81350c7cfb217349d0d73b6250faaf05c054fd08 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-10 19:01:38 +02:00
Claire
ee88f8550c Merge commit '0219b7cad7d9ef800f82cc561571b70da040433f' into glitch-soc/merge-upstream 2025-10-10 19:01:35 +02:00
github-actions[bot]
bcccfb19df
New Crowdin Translations (automated) (#3224) 
* New Crowdin translations

* Fix bogus no.yml

* Fix bogus simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-10 18:52:05 +02:00
Claire
2575ff5ce2
Fix crowdin download script for glitch-soc stable branches (#3225) 2025-10-10 18:44:33 +02:00
Claire
0219b7cad7
Add result_count to Mastodon-Async-Refresh header when needed (#36239) 2025-10-10 12:26:10 +00:00
github-actions[bot]
3f2ee09827
New Crowdin Translations (automated) (#36420) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-10 09:06:57 +00:00
Emelia Smith
8898f120dc
Improve display of content warnings in Admin UI (#35935) 2025-10-10 08:55:41 +00:00
Emelia Smith
81350c7cfb
Add support for displaying link previews for Admin UI (#35958) 2025-10-10 08:43:48 +00:00
Claire
8aee7fa400
Merge pull request #3221 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to c858fc77ef194be0217fd98eae84efd261dba798
 2025-10-10 10:29:45 +02:00
Echo
8a50fb02ce [Glitch] Fixes handled link formatting 
Port c858fc77ef194be0217fd98eae84efd261dba798 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-09 18:03:39 +02:00
Echo
3c3a812a9c [Glitch] Fix: Embed author handle using wrong DisplayName 
Port 258869278e8f42ff7c1795eb024c7c2ed6cfebca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-09 18:03:15 +02:00
Echo
48bb64cde3 [Glitch] Emoji: Fixes issue with handled link not correctly showing remote users 
Port 5bc7c4b7e880ee1456dc21987d8fba32e340d31e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-09 17:59:59 +02:00
Claire
490c89a5a9 Merge commit 'c858fc77ef194be0217fd98eae84efd261dba798' into glitch-soc/merge-upstream 2025-10-09 17:59:13 +02:00
Echo
c858fc77ef
Fixes handled link formatting (#36410) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-09 14:31:13 +00:00
Echo
258869278e
Fix: Embed author handle using wrong DisplayName (#36413) 2025-10-09 14:08:36 +00:00
Claire
d4a4a7177a
Fix crash when serializing quotes of deleted posts for ActivityPub (#36381) 2025-10-09 13:52:38 +00:00
Claire
b7c5e60426
Fix quote post state sometimes not being updated through streaming server (#36408) 2025-10-09 09:53:45 +00:00
github-actions[bot]
a459ccf616
New Crowdin Translations (automated) (#36406) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-09 09:12:27 +00:00
renovate[bot]
ba70dcf827
Update docker.io/ruby Docker tag to v3.4.7 (#36407) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-09 08:25:26 +00:00
Matt Jankowski
0152659245
Use tag filter for pending tag count on admin dashboard (#36404) 2025-10-09 08:08:29 +00:00
Claire
44b45ab0b7
Merge pull request #3220 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to b8444d9bb7885d75112a3cae74b6a5c711c7d547
 2025-10-08 20:15:31 +02:00
Echo
5bc7c4b7e8
Emoji: Fixes issue with handled link not correctly showing remote users (#36403) 2025-10-08 17:17:03 +00:00
Echo
62fc92dfd8 [Glitch] Emoji: Announcements 
Port babb7b2b9d13d6c9041edfe3ab6fe9fba708709c to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-08 18:51:03 +02:00
Echo
c08a874ba9 [Glitch] Emoji: Statuses 
Port 0c1ca6c969fcc2ba1c6ad17ff1a94a4ee8711f75 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-08 18:45:30 +02:00
Echo
c4ef050eb6 [Glitch] Emoji: Account page 
Port 6abda76d13b46c82741de8618e2c141b29fe5355 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-08 18:29:16 +02:00
diondiondion
c52473eebc [Glitch] Ensure Fetch-all-replies snackbar is shown at the bottom of the screen 
Port e4c3854ae8332bc3273e2949b050bd25205c5404 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-08 18:24:39 +02:00
Echo
fc1b407d89 [Glitch] Emoji: Compare history modal 
Port e02ea3e1109b717ffc7fc178ec62eb460cab9703 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-08 18:24:07 +02:00
Echo
f870904e5f [Glitch] Emoji: Bypass legacy emoji normalization 
Port 3c9b828c714c71598493fe39231175bb156ef6fd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-08 18:22:47 +02:00
Brad Dunbar
1c278df424 [Glitch] Resolve typescript eslint warning 
Port c578a0cb74bdc6492bed58007f8b7971eef43e30 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-08 18:21:01 +02:00
Echo
7f5232c377 [Glitch] Emoji: Remove re: from handleElement in StatusContent 
Port 9027d604204121808019e4f9b45e5e86565e7f3d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-08 18:19:40 +02:00
diondiondion
da99ec0eea [Glitch] Fetch all replies: Only display "More replies found" prompt when there really are new replies 
Port 474fbb2770a4bff97e25d07897a21acfda373262 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-08 18:19:12 +02:00
Claire
d34b4f3fd0 [Glitch] Add feature to automatically attach quote on eligible link past in Web UI composer 
Port cda07686dfbbc0b3f8dfbb38a54efa3d126f2c44 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-08 18:18:23 +02:00
Echo
d5ce785267 [Glitch] Allow modern_emojis to be enabled purely server-side 
Port 68a36d5a57269e34c76305b49628a36a87c21b74 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-08 18:17:07 +02:00
Echo
0281768cfd [Glitch] Emoji: Link Replacement 
Port ffac4cb05f5c5a8f91074c846b74fc1dd0c5faf3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-08 18:16:38 +02:00
Claire
f800057008 Merge commit 'b8444d9bb7885d75112a3cae74b6a5c711c7d547' into glitch-soc/merge-upstream 2025-10-08 18:07:04 +02:00
Renaud Chaput
b8444d9bb7
Do not automatically run Prettier on the streaming server code. (#36400) 2025-10-08 15:51:53 +00:00
Echo
babb7b2b9d
Emoji: Announcements (#36397) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-10-08 15:07:01 +00:00