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,322 Commits 74 Branches 58 Tags
00154f3f92f815ca963f0a2fa4d1ec3a59c4ccde
Commit Graph

25322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
00154f3f92 Merge pull request #3091 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 989ca63b59
 2025-06-06 13:26:34 +02:00
Claire
4b22aa93a2 Merge commit '989ca63b596c9006c5606edd4e66498e29e83489' into glitch-soc/merge-upstream 2025-06-06 12:56:00 +02:00
Claire
989ca63b59 Remove inbound_quotes feature flag (#34958) 2025-06-06 08:25:59 +00:00
Matt Jankowski
f2cdbefa3c Align versions in templates to current/plausible values (#34952) 2025-06-06 07:42:57 +00:00
Claire
86627624f1 Fix quote post streaming edge cases (#34957) 2025-06-06 07:32:24 +00:00
github-actions[bot]
c09f9a93f1 New Crowdin Translations (automated) (#34953) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-06 07:15:31 +00:00
renovate[bot]
963f4977d6 fix(deps): update dependency postcss-preset-env to v10.2.1 (#34947) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-06 06:29:40 +00:00
renovate[bot]
5fde019e39 chore(deps): update dependency ruby-vips to v2.2.4 (#34949) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-06 06:29:19 +00:00
Claire
ad8f984cef Merge pull request #3090 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 520974e052
 2025-06-05 19:34:17 +02:00
Claire
af314a833d [Glitch] Add ability to filter quote posts in home timeline 
Port 520974e052 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-05 18:14:55 +02:00
Echo
9a649a2072 [Glitch] Add a way to easily unpin profiles from the featured account area 
Port 1fdcaaebbb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-05 18:09:42 +02:00
Claire
802ade62ce [Glitch] Fix account note textarea being interactable before the relationship gets fetched 
Port 375add0c83 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-05 18:09:16 +02:00
diondiondion
4dbbe520fb [Glitch] fix: Fix broken audio player layout in Safari 
Port 1dafd8c9dd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-05 18:08:47 +02:00
diondiondion
6bb29dec13 [Glitch] fix: Fix Safari volume bug 
Port 6637ecb460 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-05 18:08:12 +02:00
Echo
a6a35ad1ce [Glitch] Ensure carousel slides don't overflow 
Port e9f197740d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-05 18:07:37 +02:00
Claire
2085b0b53a Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
  Not a real conflict, just glitch-soc code textually adjacent to code added
  upstream.
 2025-06-05 18:02:40 +02:00
Claire
520974e052 Add ability to filter quote posts in home timeline (#34946) 2025-06-05 15:36:51 +00:00
Claire
3d474807bf Change “legacy” non-fast-tracked quote posts to not be displayed as such (#34945) 2025-06-05 13:53:57 +00:00
renovate[bot]
09208eafa4 chore(deps): update yarn to v4.9.2 (#34916) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-05 13:37:43 +00:00
renovate[bot]
25c4574480 chore(deps): update dependency opentelemetry-instrumentation-faraday to '~> 0.27.0' (#34917) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-05 13:37:37 +00:00
Matt Jankowski
e2c5a2abaa Fix Style/FetchEnvVar cop in repo.rake (#34903) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-05 13:37:33 +00:00
renovate[bot]
a80f77a996 fix(deps): update dependency pino-http to v10.5.0 (#34920) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-05 13:36:22 +00:00
Matt Jankowski
1297ad759e Update rubocop to version 1.76.0 (#34926) 2025-06-05 12:09:05 +00:00
Echo
1fdcaaebbb Add a way to easily unpin profiles from the featured account area (#34931) 2025-06-05 10:23:01 +00:00
Claire
375add0c83 Fix account note textarea being interactable before the relationship gets fetched (#34932) 2025-06-05 08:49:26 +00:00
renovate[bot]
a4bc438010 chore(deps): update dependency annotaterb to v4.15.0 (#34870) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-05 07:47:34 +00:00
Matt Jankowski
1d152d2181 Replace local vars with let in JS-enabled system specs (#34905) 2025-06-05 07:08:52 +00:00
github-actions[bot]
250c3b0c1f New Crowdin Translations (automated) (#34939) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-05 07:05:25 +00:00
diondiondion
1dafd8c9dd fix: Fix broken audio player layout in Safari, #34930 (#34933) 2025-06-04 15:34:13 +00:00
diondiondion
6637ecb460 fix: Fix Safari volume bug, #34797 (#34929) 2025-06-04 14:35:29 +00:00
Echo
e9f197740d Ensure carousel slides don't overflow (#34927) 2025-06-04 14:29:34 +00:00
Claire
d97910d662 Merge pull request #3088 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 12c0e58d9a
v4.4.0-beta.1 		2025-06-04 12:03:08 +02:00
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
a3f3fb0aac Merge pull request #3087 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 129e72b914
 2025-06-03 23:06:46 +02: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