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

26660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
deed31ba8c Merge commit '1ba579b0a181fbfff514ef32b50179d2ab1fc342' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/public_feed.rb`:
  Minor conflict due to glitch-soc's local-only posts.
  Adopted upstream's changes.
- `spec/models/tag_feed_spec.rb`:
  Minor conflict due to glitch-soc's local-only posts.
  Adopted upstream's changes.
 2025-10-23 18:33:52 +02:00
diondiondion
1ba579b0a1
Fix "new post highlighting" in threads being applied when navigating between posts (#36583) 2025-10-23 15:52:07 +00:00
Claire
6b2051b7b3
Fix bookmarks export when one bookmarked status is soft-deleted (#36576) 2025-10-23 11:51:23 +00:00
Claire
2fa5dd6d1f
Add UI support for disabled live feeds (#36577) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-10-23 09:59:43 +00:00
github-actions[bot]
f7b99cd48a
New Crowdin Translations (automated) (#36569) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-23 09:29:02 +00:00
renovate[bot]
92aeecfbdc
Update dependency vite to v7.1.12 (#36573) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-23 08:41:34 +00:00
Claire
7774cd6670
Add disabled setting for live and topic feeds, as well as user permission to bypass that (#36563) 2025-10-23 08:37:05 +00:00
Claire
c6e2ac5af9
Merge pull request #3251 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 9f7075a0ce2b6ecef8d92ef318785fa8ce708688
 2025-10-23 10:36:11 +02:00
Claire
ee87afd6a4 [Glitch] Remove unnecessary restrictions on HTML handling 
Port 9f7075a0ce2b6ecef8d92ef318785fa8ce708688 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-22 18:08:21 +02:00
diondiondion
2d8b7a7fd8 [Glitch] Fix text overflow alignment for long author names in News 
Port 7538bc77b787c861a062e2c4cc849e39b98a3a63 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-22 18:08:00 +02:00
diondiondion
cbc07af929 [Glitch] Refresh thread replies periodically & when refocusing window 
Port 7ea2af6ae227875c0dc66f1810fa33ae8567860f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-22 18:07:34 +02:00
Claire
ee9a15031b Merge commit '9f7075a0ce2b6ecef8d92ef318785fa8ce708688' into glitch-soc/merge-upstream 2025-10-22 18:06:32 +02:00
Claire
9f7075a0ce
Remove unnecessary restrictions on HTML handling (#36548) 2025-10-22 13:55:41 +00:00
renovate[bot]
c40648f7b3
Update dependency pino to v9.14.0 (#36529) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-22 13:53:20 +00:00
renovate[bot]
2bd5c2f528
Update dependency ioredis to v5.8.2 (#36544) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-22 13:52:59 +00:00
renovate[bot]
1e28ec628b
Update dependency rubocop to v1.81.6 (#36541) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-22 13:52:43 +00:00
diondiondion
7538bc77b7
Fix text overflow alignment for long author names in News (#36562) 2025-10-22 13:08:51 +00:00
diondiondion
7ea2af6ae2
Refresh thread replies periodically & when refocusing window (#36547) 2025-10-22 09:43:03 +00:00
belatedly
6adbd9ce52
Fix discovery preamble missing word in EN and EN-GB locales (#36560) 2025-10-22 09:18:02 +00:00
github-actions[bot]
08ae77fd9c
New Crowdin Translations (automated) (#36556) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-22 08:24:40 +00:00
Claire
a0aa5fe8ea
Merge pull request #3250 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 17eb1a7e668dbba6e79612395b99407e8e8de6b9
 2025-10-21 21:36:50 +02:00
Claire
209434cb1d Merge commit '17eb1a7e668dbba6e79612395b99407e8e8de6b9' into glitch-soc/merge-upstream 2025-10-21 18:15:56 +02:00
Claire
17eb1a7e66
Fix scheduled quote posts being posted as non-quote posts (#36550) 2025-10-21 16:00:40 +00:00
Claire
aba30a85be
Fix value of quote_approval_policy and quoted_status_id in ScheduledStatus serializer (#36549) 2025-10-21 16:00:30 +00:00
Renaud Chaput
de80a54555
Update recommended Node version to 24 (LTS) (#36539) 2025-10-21 14:26:24 +00:00
Renaud Chaput
b80ec3721d
Drop support for PostgreSQL 13 (#36540) 2025-10-21 14:26:00 +00:00
Claire
f4ca3e6c74
Merge pull request #3249 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 118ff13bd028cfb19370a12edb9307ea96007ad7
 2025-10-21 16:13:52 +02:00
Claire
5674100f0b Merge commit '118ff13bd028cfb19370a12edb9307ea96007ad7' into glitch-soc/merge-upstream 2025-10-21 15:57:43 +02:00
Claire
118ff13bd0
Bump version to v4.5.0-beta.2 (#36543) 2025-10-21 13:43:38 +00:00
Claire
405a49df44
Merge commit from fork 
* Refuse granting quote authorization for reblogs

* Add validation to reject quotes of reblogs

* Do not process quotes of reblogs as potentially valid quotes

* Refuse to serve quoted reblogs over REST API
 2025-10-21 15:00:28 +02:00
github-actions[bot]
2b9e4294fe
New Crowdin Translations (automated) (#36538) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-21 08:50:24 +00:00
Matt Jankowski
2eccd7b53c
Specs for validation error in API responses (#36507) 2025-10-21 07:33:30 +00:00
renovate[bot]
74172ced81
Update dependency playwright to v1.55.1 [SECURITY] (#36534) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-21 07:20:24 +00:00
Claire
a74b3c549a
Merge pull request #3246 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 341ea7f462c68ebe2fc5ee15dc7c58aa5775d5a0
 2025-10-20 22:13:15 +02:00
Echo
8b3ff4f8b1 [Glitch] Emoji: Fix unneeded re-renders when StatusContent changes 
Port 6e2973aa2d3dc9466f2cc9b352e0eb2b260bf463 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-20 21:40:05 +02:00
Claire
af1b658c20 [Glitch] Fix position of quote dropdown menu item when “quick boosting” is enabled 
Port 97c8cc560675070a5c82c1f253e41229fb5d2493 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-20 21:38:56 +02:00
Echo
7b44fd6d3c [Glitch] Emoji: Swap mode test to an emoji from 16.0 
Port 50dfab30c27a8557105fe6c0e99f4c1737dff363 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-20 21:38:37 +02:00
Claire
9080083263 Merge commit '341ea7f462c68ebe2fc5ee15dc7c58aa5775d5a0' into glitch-soc/merge-upstream 2025-10-20 21:37:50 +02:00
renovate[bot]
341ea7f462
Update dependency vite to v7.1.11 (#36526) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-20 17:07:28 +00:00
renovate[bot]
168cba35e3
Update dependency puma to v7.1.0 (#36519) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-20 17:07:11 +00:00
Echo
6e2973aa2d
Emoji: Fix unneeded re-renders when StatusContent changes (#36532) 2025-10-20 14:52:27 +00:00
Claire
97c8cc5606
Fix position of quote dropdown menu item when “quick boosting” is enabled (#36528) 2025-10-20 13:05:40 +00:00
Echo
50dfab30c2
Emoji: Swap mode test to an emoji from 16.0 (#36530) 2025-10-20 13:04:38 +00:00
renovate[bot]
53e20d5c83
Update dependency jsdom to v27.0.1 (#36524) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-20 12:11:04 +00:00
renovate[bot]
0a1111d5a5
Update dependency @reduxjs/toolkit to v2.9.1 (#36515) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-20 12:10:45 +00:00
renovate[bot]
95be29d700
Update dependency rubocop-performance to v1.26.1 (#36525) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-20 10:56:54 +00:00
Ben Sheldon [he/him]
843c43c97a
Replace ThreadingHelper wait loop with functional CyclicBarrier (#36508) 2025-10-20 10:10:43 +00:00
github-actions[bot]
82483ed8b0
New Crowdin Translations (automated) (#36520) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-20 10:10:37 +00:00
Claire
4c5e9e2419
Merge pull request #3245 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 612771de465da60dbd58790adc6b1556a7fa739b
 2025-10-18 21:33:35 +02:00
Claire
5123f8aa94 [Glitch] Fix relationship not being fetched to evaluate whether to show a quote post 
Port 811c1eaf7e8978d93f24669e55b173052c01fb9f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-17 19:08:59 +02:00