tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,438 Commits 5 Branches 0 Tags
e33a8d5bfbde67e3f37f592d168aee165abffc3d
Commit Graph
16532 Commits
Author SHA1 Message Date
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
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
github-actions[bot]andGitHub Actions 6cb533311a New Crowdin Translations (automated) (#37466) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-13 09:14:27 +00:00
Claire 478462ab25 Merge commit 'ed17b3a7ec52c0421ae2483a8e08431316f08b1c' into glitch-soc/merge-upstream 2026-01-12 21:00:14 +01:00
github-actions[bot]andGitHub Actions 8f70cfc8b1 New Crowdin Translations (automated) (#37447) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-12 09:54:19 +00:00
David Roetzel a9cfddf28e AP/AS serialization of Collections (#37434) 2026-01-12 08:39:25 +00:00
github-actions[bot]andGitHub Actions 6541d7ed39 New Crowdin translations (#3335) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-10 19:47:20 +01:00
Echo aff69de399 [Glitch] Fix bug with how Emojibase wasn't stripping characters 
Port a4b8b9fe98 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:18:55 +01:00
diondiondion 18d4606cce [Glitch] Further clean up types for the card object 
Port 973fef4b69 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:18:34 +01:00
Echoanddiondiondion 124d6e37eb [Glitch] Emoji: Adds search 
Port 628fc9b95b to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:18:05 +01:00
Echo c5fd0d47da [Glitch] Remove trailing variation selector code for legacy emojis 
Port f254b47067 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:17:30 +01:00
Joshua Rogersanddiondiondion 9d33d43006 [Glitch] Fix modal closeModal ignoreFocus payload type 
Port 25053db22b to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:15:12 +01:00
Echo bb640bd845 [Glitch] Video modals should not be pushed down on mobile 
Port de7b405e55 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:14:49 +01:00
Claire d7254ecec4 Merge commit 'a4b8b9fe98c677f718e4b2c1ffe1755d58e7f8d7' into glitch-soc/merge-upstream 2026-01-10 13:12:36 +01:00
Claire 3c1bf72e1a Fix custom emojis not being rendered in status prepend (#3342) 2026-01-10 13:11:50 +01:00
Echo a4b8b9fe98 Fix bug with how Emojibase wasn't stripping characters (#37442) 2026-01-09 18:38:22 +00:00
Joshua Rogers b55982cc1a Fix Vary parsing in cache control enforcement (#37426) 2026-01-09 16:21:18 +00:00
Joshua Rogers b35b3a8bcc Fix arg order for non_matching_uri_hosts? call in QuoteRequest (#37425) 2026-01-09 16:21:05 +00:00
Joshua Rogers 48ce49260d Fix thread-unsafe ActivityPub activity dispatch (#37423) 2026-01-09 16:20:59 +00:00
Shlee f97a015cf9 SharedConnectionPool - NoMethodError: undefined method 'site' for Integer (#37374) 2026-01-09 16:20:50 +00:00
diondiondion 973fef4b69 Further clean up types for the card object (#37023) 2026-01-09 14:40:27 +00:00
Echoanddiondiondion 628fc9b95b Emoji: Adds search (#37418) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-01-09 10:37:14 +00:00
Joshua Rogersanddiondiondion 25053db22b Fix modal closeModal ignoreFocus payload type (#37424) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-01-08 13:22:31 +00:00
github-actions[bot]andGitHub Actions 780c6378e0 New Crowdin Translations (automated) (#37407) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-08 11:18:50 +00:00
ShleeandClaire e0cca5c3ba Fix SignatureParser accepting duplicate parameters in HTTP Signature header (#37375) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-08 10:47:53 +00:00
Echo de7b405e55 Video modals should not be pushed down on mobile (#37421) 2026-01-08 09:44:17 +00:00
Essem 5c358ceaf1 Merge pull request #3340 from TheEssem/fix/quote-cw-fallback-md 
Fix quotes with only CWs not having fallback link when posting with other content types
 2026-01-07 21:39:27 +01:00
David Roetzel aa2110025e Fix URI generation for reblogs by accounts with numerical AP ids (#37415) 2026-01-07 15:39:22 +00:00
Claire bdcdd539f6 Fix unnecessary downcasing of some words in moderation/settings interface (#37364) 2026-01-07 15:34:39 +00:00
Claire aa6ec435d2 Merge commit '9fe14a30724e18425aedaba59ca63c63d8b14083' into glitch-soc/merge-upstream 2026-01-07 14:53:51 +01:00
Claire 0f79e29188 Merge commit from fork 2026-01-07 14:15:14 +01:00
Claire 0b1b98c4f2 Merge commit from fork 2026-01-07 14:14:42 +01:00
Claire 3e4cd799fd Merge commit '7e634eecbc5dc2f65b7bdbfc5c2b5c8a0955156d' into glitch-soc/merge-upstream 2026-01-06 18:11:26 +01:00
github-actions[bot]andGitHub Actions 7e634eecbc New Crowdin Translations (automated) (#37394) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-06 10:40:22 +00:00
Claire 0aa70234aa [Glitch] Fix custom emojis not being rendered in profile fields 
Port b622f4c698 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-05 18:24:51 +01:00
Claire 550240281e [Glitch] Fix outdated link target for “locked” warning 
Port e8a49bd6ae to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-05 18:24:29 +01:00
Claire b1d219afd0 Merge commit '82fb2596c70a18fc4a2d99ab51106180196bfe98' into glitch-soc/merge-upstream 2026-01-05 18:19:58 +01:00
Claire 82fb2596c7 Fix posts with edited out media attachments being returned in /api/v1/accounts/:id/statuses?only_media=true (#37363) 2026-01-05 15:06:20 +00:00
Claire b622f4c698 Fix custom emojis not being rendered in profile fields (#37365) 2026-01-05 14:24:59 +00:00
Claire b5bc301cbd Fix serialization of context pages (#37376) 2026-01-05 11:59:10 +00:00
Claire f711e222dc Fix quotes with CWs but no text not having fallback link (#37361) 2026-01-05 10:35:35 +00:00
Claire 1fe737e0bd Add translation string for Webauthn key nickname (#37371) 2026-01-05 10:35:28 +00:00
Claire e8a49bd6ae Fix outdated link target for “locked” warning (#37366) 2026-01-05 10:35:23 +00:00
github-actions[bot]andGitHub Actions bdf490e949 New Crowdin Translations (automated) (#37378) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-05 09:56:40 +00:00
Chan Nyein TunandChan Nyein Tun e826e0e281 [Glitch] Hide empty padding box if no status in Wrapstodon highlighted post 
Port 54bc97cfce to glitch-soc

Co-authored-by: Chan Nyein Tun <29679269+channyeintun@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-03 16:10:04 +01:00
Echo 06a49fa0d0 [Glitch] Prevents swiping when zoomed in 
Port 4bae3da85c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-03 16:08:16 +01:00
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
diondiondion cf461c79ca [Glitch] Add dedicated user preferences for theme mode & contrast 
Port a0ce77673c 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