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

28816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
2ebf6d60a6 Merge commit 'e89acc2302df49cbd7815b031e9c2939632bd204' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Conflict because of an extra dependency in glitch-soc.
  Updated upstream's dependencies as upstream did.
 2026-01-03 16:05:35 +01:00
Claire
8011a28011
Merge pull request #3327 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to a0ce77673c977e3a90d0c7d1c2acd250b7fad0c2
 2026-01-03 16:04:13 +01:00
diondiondion
cf461c79ca [Glitch] Add dedicated user preferences for theme mode & contrast 
Port a0ce77673c977e3a90d0c7d1c2acd250b7fad0c2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-03 15:31:38 +01:00
Claire
c7ad055ff3 Merge commit 'a0ce77673c977e3a90d0c7d1c2acd250b7fad0c2' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/application_controller.rb`:
  Upstream added an experimental color and contrast theme control.
  Conflicts because of glitch-soc's different theming system.
  Adapted upstream's changes.
- `app/views/layouts/application.html.haml`:
  Upstream added an experimental color and contrast theme control.
  Conflicts because of glitch-soc's different theming system.
  Adapted upstream's changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream added an experimental color and contrast theme control.
  Conflicts because of glitch-soc's different theming system.
  Adapted upstream's changes.
 2026-01-03 15:26:58 +01:00
Claire
29856620b4
Merge pull request #3274 from glitch-soc/i18n/crowdin/translations 
New Crowdin Translations (automated)
 2026-01-02 19:45:03 +01:00
renovate[bot]
e89acc2302
Update dependency irb to v1.16.0 (#37275) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 16:46:03 +00:00
renovate[bot]
628cbd2999
Update dependency postcss-preset-env to v10.6.0 (#37353) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 14:38:34 +00:00
Matt Jankowski
6628d8e769
Update “Automatic post deletion” explanation text (#37286) 2026-01-02 14:19:49 +00:00
renovate[bot]
d98a18510a
Update dependency aws-sdk-s3 to v1.208.0 [SECURITY] (#37313) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 13:54:48 +00:00
renovate[bot]
9173a81b0b
Update dependency debug to v1.11.1 (#37318) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 13:52:15 +00:00
github-actions[bot]
04f7638224
New Crowdin Translations (automated) (#37326) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-02 13:48:08 +00:00
renovate[bot]
37eb1ec84c
Update dependency bufferutil to v4.1.0 (#37309) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 13:44:14 +00:00
renovate[bot]
b2c0e0c5a7
Update dependency utf-8-validate to v6.0.6 (#37308) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 13:38:08 +00:00
Chan Nyein Tun
54bc97cfce
Hide empty padding box if no status in Wrapstodon highlighted post (#37289) 
Co-authored-by: Chan Nyein Tun <29679269+channyeintun@users.noreply.github.com>
 2026-01-02 13:20:11 +00:00
renovate[bot]
2b74572ebd
Update dependency playwright-ruby-client to v1.57.1 (#37356) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 13:07:31 +00:00
renovate[bot]
0afe85e967
Update dependency jsdom to v27.4.0 (#37349) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 13:03:49 +00:00
renovate[bot]
99e16e6b21
Update dependency color_diff to v0.2 (#37331) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 13:03:01 +00:00
renovate[bot]
5a7db6649e
Update dependency strong_migrations to v2.5.2 (#37329) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 12:54:00 +00:00
renovate[bot]
86a2e650aa
Update dependency brakeman to v7.1.2 (#37348) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 12:28:23 +00:00
renovate[bot]
334e30492e
Update dependency i18n to v1.14.8 (#37337) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 11:41:06 +00:00
Andy Piper
f32bed6809
Update keyboard shortcut description for direct mentions (#37347) 2026-01-02 11:15:24 +00:00
renovate[bot]
c772a8fb43
Update dependency json-schema to v6.1.0 (#37338) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 11:09:10 +00:00
renovate[bot]
0f55bb6735
Update dependency sass to v1.97.1 (#37328) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 11:08:48 +00:00
Claire
bc3f68b46a
Fix date-related wrapstodon test failures (#37362) 2026-01-02 10:52:22 +00:00
GitHub Actions
aace2679bd New Crowdin translations 2026-01-01 04:56:54 +00:00
Claire
8522ea1924
Merge pull request #3320 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 0231b6d350d6027fa822f286732405b573d634e8
 2025-12-19 22:40:16 +01:00
Claire
04f4725249 Merge commit '0231b6d350d6027fa822f286732405b573d634e8' into glitch-soc/merge-upstream 2025-12-19 18:43:09 +01:00
Echo
4bae3da85c
Prevents swiping when zoomed in (#37323) 2025-12-19 16:18:50 +00:00
diondiondion
a0ce77673c
Add dedicated user preferences for theme mode & contrast (#37288) 2025-12-19 15:31:44 +00:00
David Roetzel
0231b6d350
Expose feature policy in API (#37322) 2025-12-19 15:20:30 +00:00
diondiondion
8d9192835d
Add stub story for StatusQuoteManager / Status component (#37321) 2025-12-19 15:18:10 +00:00
David Roetzel
4e63958914
Federated "featureable in collections" preference (#37298) 2025-12-19 13:44:27 +00:00
Echo
f254b47067
Remove trailing variation selector code for legacy emojis (#37320) 2025-12-19 13:43:27 +00:00
renovate[bot]
06a5199c44
Update dependency storybook to v10.1.10 [SECURITY] (#37314) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-19 13:41:58 +00:00
github-actions[bot]
ff005bae0b
New Crowdin Translations (automated) (#37312) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-12-19 10:40:07 +00:00
renovate[bot]
77b685e749
Update dependency vite-tsconfig-paths to v6.0.3 (#37303) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-19 10:07:44 +00:00
diondiondion
a505c2efd8
Fix mobile admin sidebar displaying under batch table toolbar (#37307) 2025-12-19 08:39:25 +00:00
Claire
6c6ea030f4
Merge pull request #3317 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to ff20ab7510a189bee75bdd5460f6c2ae38e7009a
 2025-12-19 09:16:38 +01:00
renovate[bot]
6480e16c17
Update dependency sass to v1.97.0 (#37266) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-19 08:13:07 +00:00
Echo
9ce81baff9 [Glitch] Emoji loading fixes 
Port ba4710debe65e204f28ffd4d105433b26cd6721c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-18 18:59:46 +01:00
Claire
baa6af0e18 Merge commit 'ff20ab7510a189bee75bdd5460f6c2ae38e7009a' into glitch-soc/merge-upstream 2025-12-18 18:56:31 +01:00
Echo
ff20ab7510
Fixes CDN domain loading (#37310) 2025-12-18 17:41:21 +00:00
Claire
4bfd92310f [Glitch] Fix custom emojis not displaying in CWs and fav/boost notifications 
Port a8109e50fc313b8124a3e471d41b490df59a68b8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-18 18:11:41 +01:00
Claire
97ff0f94bf Merge commit 'a8109e50fc313b8124a3e471d41b490df59a68b8' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed a field that was moved to another page due to glitch-soc's theming system.
  Ignored this one change.
 2025-12-18 18:10:30 +01:00
Echo
ba4710debe
Emoji loading fixes (#37300) 2025-12-18 16:58:44 +00:00
Claire
a8109e50fc
Fix custom emojis not displaying in CWs and fav/boost notifications (#37306) 2025-12-18 16:49:03 +00:00
Claire
2a7e5fb3f7
Skip followers synchronization for accounts with 25k followers or more (#37302) 2025-12-18 14:42:47 +00:00
renovate[bot]
8bc0170c02
Update docker.io/ruby Docker tag to v3.4.8 (#37297) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-18 14:42:07 +00:00
renovate[bot]
787b00813e
Update dependency ruby to v3.4.8 (#37278) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-18 14:41:35 +00:00
Claire
ffdf56b1e6
Fix default Admin role not including view_feeds permission (#37301) 2025-12-18 14:26:31 +00:00