Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 07:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,289 Commits 74 Branches 58 Tags
7f87ce29961c06d023aa3684cfc939d880fa6d92
Commit Graph

25289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
7f87ce2996 Merge commit '12c0e58d9aa80db570fba5fa5146f3a640e99b42' into glitch-soc/merge-upstream 2025-06-04 11:49:36 +02:00
Claire
12c0e58d9a Fix mastodon-streaming container image builds on 4.4 (#34921) 2025-06-04 09:36:15 +00:00
diondiondion
b5c477929b [Glitch] fix: Fix unauthenticated familiar followers request 
Port b64ad77e21 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-04 11:02:12 +02:00
Claire
5d9e5967aa Merge commit 'f7c19226cff625895478b80302201c98f36163c8' into glitch-soc/merge-upstream 2025-06-04 11:01:40 +02:00
Claire
f7c19226cf Bump version to v4.4.0-beta.1 (#34912) 2025-06-04 08:47:18 +00:00
diondiondion
b64ad77e21 fix: Fix unauthenticated familiar followers request, #34911 (#34914) 2025-06-04 08:25:10 +00:00
renovate[bot]
37bf59f76a fix(deps): update dependency @vitejs/plugin-react to v4.5.1 (#34898) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-04 07:41:52 +00:00
Claire
23ce6d326c Merge commit '129e72b91494f30777cf4fa8a0905de2dccedba7' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream removed OTel instrumentation around some code modified in glitch-soc
  because of the Markdown rendering feature.
  Removed the OTel instrumentation as upstream did.
 2025-06-03 18:34:37 +02:00
Claire
129e72b914 Revert "Add telemetry for status / bio formatting (#32677)" (#34906) 2025-06-03 15:06:32 +00:00
Matt Jankowski
6d12831686 Fix Rails/OutputSafety cop from rubocop todo via inline disable (#34893) 2025-06-03 08:00:50 +00:00
github-actions[bot]
efe8def0c6 New Crowdin Translations (automated) (#34897) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-03 07:57:07 +00:00
Claire
98c9c7a9ff Merge pull request #3086 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 8224178e8c
 2025-06-02 22:54:09 +02:00
Eugen Rochko
1144515310 [Glitch] Fix nested buttons in search popout in web UI 
Port c77158c8b7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-02 20:16:15 +02:00
Claire
06b1f8bd85 Merge commit '8224178e8ca9746f97ce341179d2c636fa22a082' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a condition where glitch-soc had changes on the same line.
  Adapted upstream's changes.
 2025-06-02 20:05:43 +02:00
Claire
8224178e8c Revert "Remove cookie rotator (#32289)" (#34892) 2025-06-02 13:51:27 +00:00
Claire
d4bbe8b719 Fix blocked accounts not being automatically removed from trending statuses (#34891) 2025-06-02 13:38:47 +00:00
Claire
6ef998a792 Merge pull request #3085 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 9c80b16401
 2025-06-02 15:33:35 +02:00
Eugen Rochko
c77158c8b7 Fix nested buttons in search popout in web UI (#34871) 2025-06-02 12:21:31 +00:00
Eugen Rochko
8d8b0b2ec0 [Glitch] Fix not being able to scroll dropdown on touch devices in web UI 
Port d47199dd4b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-02 12:17:04 +02:00
Claire
088af860b3 Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream 2025-06-02 12:16:06 +02:00
David Roetzel
9c80b16401 Accept HTTP Message Signatures (RFC9421) (#34814) 2025-06-02 09:27:08 +00:00
github-actions[bot]
eb42425427 New Crowdin Translations (automated) (#34874) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-02 08:24:52 +00:00
Claire
00b56932de Fix handling of featured tag removal (#34887) 2025-06-02 08:09:30 +00:00
Eugen Rochko
d47199dd4b Fix not being able to scroll dropdown on touch devices in web UI (#34873) 2025-06-02 08:07:42 +00:00
renovate[bot]
0182fc389e fix(deps): update dependency sass to v1.89.1 (#34875) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-02 07:49:37 +00:00
renovate[bot]
7036d5ad25 chore(deps): update dependency csv to v3.3.5 (#34881) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-02 07:49:11 +00:00
Lukas Martini
11481df4dc Fix sidekiq health check in docker-compose for sidekiq 7 (#34879) 2025-06-02 07:48:37 +00:00
Matt Jankowski
0d5123199f Fix Style/FormatStringToken cop (#34861) 2025-06-02 07:37:33 +00:00
renovate[bot]
1b11bb23d7 chore(deps): update definitelytyped types (non-major) (#34884) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-02 07:37:15 +00:00
renovate[bot]
d051366308 chore(deps): update dependency linzer to v0.7.3 (#34885) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-02 07:09:25 +00:00
Claire
59bfca08c9 Merge pull request #3084 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 32b521b7f4
 2025-05-31 21:39:17 +02:00
Matt Jankowski
7f4ec7d9cf Include matrix values in upload artifact names (#34876) 2025-05-31 15:52:28 +00:00
Claire
8e409f92fe Merge commit '32b521b7f4055ccd4e59587589c2bed7759537cb' into glitch-soc/merge-upstream 2025-05-31 17:32:57 +02:00
Claire
618e4d982f Merge pull request #3083 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 44d71d59ef
 2025-05-31 17:32:21 +02:00
Claire
32b521b7f4 Fix multiple issues in quoted posts hydration (#34864) 2025-05-31 15:20:31 +00:00
Eugen Rochko
2cf44bc914 [Glitch] Add icon to header of pinned posts carousel in web UI 
Port 44d71d59ef to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-31 15:31:44 +02:00
diondiondion
eef71fcc07 [Glitch] refactor(Pinned posts carousel): Don't animate initial resize 
Port 1cc853059f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-31 15:31:13 +02:00
Claire
c2989e231d Merge commit '44d71d59efd79ee723a1dec72ec77833560c45cf' into glitch-soc/merge-upstream 2025-05-31 15:30:19 +02:00
Eugen Rochko
44d71d59ef Add icon to header of pinned posts carousel in web UI (#34869) 2025-05-30 22:24:34 +00:00
Claire
f4ad91bd6a Merge pull request #3081 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 54ad57ea95
 2025-05-30 22:18:34 +02:00
diondiondion
1cc853059f refactor(Pinned posts carousel): Don't animate initial resize (#34868) 2025-05-30 18:06:41 +00:00
diondiondion
f97bcb00b4 [Glitch] fix: Fix autoplay not working properly in AudioModal, #34841 
Port 54ad57ea95 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-30 17:44:53 +02:00
Nicholas La Roux
0f591649c4 [Glitch] Make account header profile pic exactly 2x post profile pic 
Port 0789ec93f8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-30 17:44:27 +02:00
diondiondion
c80b14e251 [Glitch] feat: Add relationship info to hover card 
Port 975db93e3f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-30 17:43:58 +02:00
Echo
d7ba8451cf [Glitch] Fix pinned carousel scroll on mobile 
Port 9860046b04 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-30 17:43:38 +02:00
Claire
4693aab179 [Glitch] Fix featured posts and familiar followers showing up on hidden accounts 
Port 71a4a92dda to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-30 17:43:13 +02:00
Claire
c00e27aa55 Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream 2025-05-30 17:41:31 +02:00
Matt Jankowski
7efe20337c Fix Style/FetchEnvVar cop in omniauth config (#34862) 2025-05-30 15:32:47 +00:00
diondiondion
54ad57ea95 fix: Fix autoplay not working properly in AudioModal, #34841 (#34865) 2025-05-30 15:26:08 +00:00
Claire
064d333620 Fix inconsistent filtering of silenced accounts for other silenced accounts (#34863) 2025-05-30 13:20:51 +00:00