tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,341 Commits 5 Branches 0 Tags
29856620b4196cc46c4e2769060dc2c5d2cfabb0
Commit Graph
27341 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire 29856620b4 Merge pull request #3274 from glitch-soc/i18n/crowdin/translations 
New Crowdin Translations (automated)
 2026-01-02 19:45:03 +01: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 0231b6d350
 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
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]andGitHub Actions 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 ff20ab7510
 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 ba4710debe 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 a8109e50fc 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
Joshua Rogers 38bc7d2864 Use HTTPS when downloading unicode.org's emoji-test.txt (#37290) 2025-12-18 10:11:54 +00:00
github-actions[bot]andGitHub Actions ed2a8c32ce New Crowdin Translations (automated) (#37293) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-12-18 09:20:07 +00:00
diondiondion 830ffbe2da Remove required field markers from unclearable fields in user preferences (#37291) 2025-12-18 08:58:06 +00:00
Echo 177d3c59d0 [Glitch] Emoji: Refresh custom emoji on new 
Port 3d55dcdf7f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-17 18:34:02 +01:00
diondiondion 392a241637 [Glitch] Improve search menu keyboard navigation 
Port c4a760d6ba to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-17 18:32:57 +01:00
Echo 34dbea26a7 [Glitch] Remove rendering of custom emoji using the database 
Port dbc5af6641 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-17 18:32:34 +01:00
diondiondion 516f0ce131 [Glitch] Fix notifications page error in Tor browser 
Port 71af094f97 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-17 18:31:49 +01:00
Claire 22724d2367 [Glitch] Fix hashtag autocomplete replacing suggestion's first characters with input 
Port d6a40c2891 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-17 18:31:31 +01:00
Claire 84feffd6e6 Merge commit '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added a method right next to glitch-soc-only methods.
  Added upstream's method.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed a line right next to a glitch-soc addition.
  Changed the code as upstream did.
 2025-12-17 18:27:14 +01:00
Matt Jankowski 009275e66b Use link_to for contribute translation link (#36011) 2025-12-17 15:19:21 +00:00
Echo 3d55dcdf7f Emoji: Refresh custom emoji on new (#37271) 2025-12-17 14:58:22 +00:00
Matt Jankowski 7e817f2471 Extract filter_keywords helper method for listing filter keyword groups (#35921) 2025-12-17 14:48:58 +00:00
diondiondion c4a760d6ba Improve search menu keyboard navigation (#37255) 2025-12-17 14:42:07 +00:00
Echo dbc5af6641 Remove rendering of custom emoji using the database (#37284) 2025-12-17 14:40:34 +00:00
diondiondion 71af094f97 Fix notifications page error in Tor browser (#37285) 2025-12-17 14:38:46 +00:00
Claire d6a40c2891 Fix hashtag autocomplete replacing suggestion's first characters with input (#37281) 2025-12-17 14:28:53 +00:00
Nicholas La Roux a5362a4002 Upgrade Bundler from 4.0.1 to 4.0.2 (#37283) 2025-12-17 14:06:45 +00:00
renovate[bot] 42d4753d30 Update dependency vite-tsconfig-paths to v6.0.2 (#37279) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-17 13:15:05 +00:00
github-actions[bot]andGitHub Actions 8debc5760b New Crowdin Translations (automated) (#37174) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-12-17 11:18:17 +00:00
David Roetzel 5e8b8f9c23 Extract interaction policy class (#37277) 2025-12-17 10:12:43 +00:00
Claire db62d70492 Change Wrapstodon switch from feature flag to admin setting (#37273) 2025-12-17 09:47:02 +00:00
Matt Jankowski a292162c5f Mark Form::AdminSettings#persisted? as true (#35872) 2025-12-17 08:32:24 +00:00
Claire 6c2d53372b Merge pull request #3316 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 53be8392ec
 2025-12-16 19:09:07 +01:00
diondiondion cfc64a2ea9 [Glitch] Updates Wrapstodon footer with dedicated local server info 
Port e6b0cdcc83 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-16 18:37:45 +01:00
Echo fbacb5ae7a [Glitch] Emojis: Show in embedded statuses 
Port f118d61334 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-16 18:32:54 +01:00