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

27473 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
ba45eb8764 Merge commit 'bc2f8a358f96a9540e6f39bb1c58273deb4545de' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how theming works, and in particular changed the set of HTML attributes.
  Adapted upstream's change.
 2026-01-15 18:02:35 +01:00
diondiondion
bc2f8a358f
Enable theming via new HTML element attributes (#37477) 2026-01-15 16:04:27 +00:00
Echo
c09fbeb32f
MiniCard and MiniCardList components (#37479) 2026-01-15 13:53:42 +00:00
Echo
f2fb232e37
Account header split up (#37490) 2026-01-15 13:45:30 +00:00
Claire
2a6c084aa1
Update SECURITY.md (#37506) 2026-01-15 13:17:41 +00:00
github-actions[bot]
47557f5b9e
New Crowdin Translations (automated) (#37492) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-15 10:41:11 +00:00
renovate[bot]
1482a7bf20
Update dependency postcss-preset-env to v11 (#37485) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-15 10:14:00 +00:00
renovate[bot]
dd52e61c24
Update opentelemetry-ruby (non-major) (#37480) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-15 10:13:56 +00:00
renovate[bot]
8eff59b106
Update dependency httplog to '~> 1.8.0' (#37484) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-15 10:13:53 +00:00
Claire
fd510421c4
Merge pull request #3347 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 10de65e41c3b01bd938f97fdb60fc96c26673966
 2026-01-15 00:06:11 +01:00
Claire
f65e6a5029 Merge commit '10de65e41c3b01bd938f97fdb60fc96c26673966' into glitch-soc/merge-upstream 2026-01-14 20:31:42 +01:00
Claire
10de65e41c
Fix FeedManager#filter_from_home error when handling a reblog of a deleted status (#37486) 2026-01-14 10:51:23 +00:00
renovate[bot]
4bdc9d5e1e
Update dependency vite to v7.3.1 (#37248) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-14 10:37:43 +00:00
renovate[bot]
5d03d5d15c
Update dependency libvips to v8.18.0 (#37282) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-14 10:37:05 +00:00
renovate[bot]
6fdef1191a
Update dependency globals to v17 (#37360) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-14 10:35:40 +00:00
renovate[bot]
d612119b3e
Update dependency thor to v1.5.0 (#37406) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-14 10:17:40 +00:00
renovate[bot]
8390f0dbbf
Update dependency rqrcode to v3.2.0 (#37431) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-14 10:10:52 +00:00
David Roetzel
c218849204
Add collection endpoint (#37468) 2026-01-14 10:08:29 +00:00
github-actions[bot]
2f91d9755d
New Crowdin Translations (automated) (#37482) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-14 10:02:11 +00:00
renovate[bot]
ccf3ed0ddf
Update Node.js to 24.13 (#37473) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-14 10:02:07 +00:00
Claire
46df08b3a4
Merge pull request #3346 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 19bc3e76ea1d7fa2d9af711613a77fc0f5f0d1b5
 2026-01-13 20:16:29 +01:00
Echo
aa83f94ac1 [Glitch] Add feature flag detection for profile redesign 
Port 122b1592ed543838f2047ef82e570ca58a087b32 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-13 18:35:37 +01:00
diondiondion
beb23500b1 [Glitch] Fix isDarkMode utility 
Port 41639655ffaa9914632fe937c9583b901b36f5cc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-13 18:35:16 +01:00
Heath Dutton🕴️
e14af55640 [Glitch] Fix keyboard navigation in media modal after clicking image 
Port be60c4585ebdac0cc236fb597246922af3fb6ce8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-13 18:34:48 +01:00
Claire
b4ed1e6c99 Merge commit '19bc3e76ea1d7fa2d9af711613a77fc0f5f0d1b5' into glitch-soc/main 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added a helper to insert javascript tags, close to where we had
  modified code.
  Ported upstream's change.
 2026-01-13 18:30:48 +01:00
Claire
7f98a6703e
Merge pull request #3345 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 9b5986b36e86d50d19b68b10788b3316012894c3
 2026-01-13 18:21:18 +01:00
Claire
e33a8d5bfb Merge commit '9b5986b36e86d50d19b68b10788b3316012894c3' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream refactored a bit where we had an extra argument for markdown/HTML.
  Adapted upstream change.
 2026-01-13 18:01:53 +01:00
Matt Jankowski
19bc3e76ea
Add spec for quote policy update change (#37474) 2026-01-13 16:21:55 +00:00
Matt Jankowski
92ad380e11
Update rubocop to version 1.82.1 (#37475) 2026-01-13 16:21:25 +00:00
Shlee
c6be114cef
Non-ActivityPub Link header alternate blocks HTML ActivityPub discovery in FetchResourceService (#37439) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-13 15:47:48 +00:00
Echo
122b1592ed
Add feature flag detection for profile redesign (#37472) 2026-01-13 14:17:43 +00:00
Shlee
232b9e9cc6
Fix delivery worker counting unsalvageable HTTP errors as successes (#37235) 2026-01-13 13:49:36 +00:00
renovate[bot]
d5264b3722
Update dependency aws-sdk-s3 to v1.211.0 (#37396) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-13 13:32:11 +00:00
diondiondion
41639655ff
Fix isDarkMode utility (#37470) 2026-01-13 11:06:54 +00:00
Heath Dutton🕴️
be60c4585e
Fix keyboard navigation in media modal after clicking image (#37464) 2026-01-13 10:47:04 +00:00
Claire
5b54cd7f76
Add ability to include inline javascript (#37459) 2026-01-13 10:40:26 +00:00
Shlee
9b5986b36e
Fix quote_approval_policy being reset to user defaults when omitted in status update (#37436) 2026-01-13 10:40:08 +00:00
Claire
9332f48abe
Simplify status batch removal SQL query (#37469) 2026-01-13 10:18:26 +00:00
renovate[bot]
f8b8fa16f5
Update dependency pino to v10.1.1 (#37443) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-13 09:18:34 +00:00
github-actions[bot]
6cb533311a
New Crowdin Translations (automated) (#37466) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-13 09:14:27 +00:00
renovate[bot]
a63a0db568
Update dependency postcss-preset-env to v10.6.1 (#37457) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-13 09:03:59 +00:00
renovate[bot]
972ed73062
Update DefinitelyTyped types (non-major) (#37456) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-13 09:03:56 +00:00
Claire
ca3c3eada6
Merge pull request #3344 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to ed17b3a7ec52c0421ae2483a8e08431316f08b1c
 2026-01-12 21:37:32 +01:00
Claire
478462ab25 Merge commit 'ed17b3a7ec52c0421ae2483a8e08431316f08b1c' into glitch-soc/merge-upstream 2026-01-12 21:00:14 +01:00
renovate[bot]
ed17b3a7ec
Update dependency use-debounce to v10.1.0 (#37432) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-12 10:09:25 +00:00
renovate[bot]
aa3d76999d
Update dependency ioredis to v5.9.1 (#37388) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-12 10:09:04 +00:00
renovate[bot]
012c62132f
Update dependency sidekiq-unique-jobs to v8.0.13 (#37408) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-12 09:55:12 +00:00
github-actions[bot]
8f70cfc8b1
New Crowdin Translations (automated) (#37447) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-12 09:54:19 +00:00
Matt Jankowski
0fb4e26cfe
Add details to JS browser error spec failure helpers (#37441) 2026-01-12 09:38:00 +00:00
David Roetzel
a9cfddf28e
AP/AS serialization of Collections (#37434) 2026-01-12 08:39:25 +00:00