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

29556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Echo
628fc9b95b
Emoji: Adds search (#37418) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-01-09 10:37:14 +00:00
Joshua Rogers
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]
780c6378e0
New Crowdin Translations (automated) (#37407) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-08 11:18:50 +00:00
renovate[bot]
13fcb6d2f1
Update dependency ws to v8.19.0 (#37397) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-08 10:58:09 +00:00
Shlee
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
renovate[bot]
f840d7bf9f
Update dependency sass to v1.97.2 (#37395) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-07 14:36:26 +00:00
Matt Jankowski
dd26964f1b
Use bundler version 4.0.3 (#37392) 2026-01-07 14:36:21 +00:00
Claire
29950a120d
Merge pull request #3339 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 9fe14a30724e18425aedaba59ca63c63d8b14083
 2026-01-07 15:15:28 +01:00
Claire
aa6ec435d2 Merge commit '9fe14a30724e18425aedaba59ca63c63d8b14083' into glitch-soc/merge-upstream 2026-01-07 14:53:51 +01:00
Claire
9fe14a3072
Bump version to v4.5.4 (#37413) 2026-01-07 13:40:06 +00: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
84128e1526
Downgrade sidekiq-unique-jobs (#37402) 2026-01-07 09:00:16 +00:00
Claire
5e6b813e7d
Merge pull request #3333 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 7e634eecbc5dc2f65b7bdbfc5c2b5c8a0955156d
 2026-01-06 19:16:40 +01:00
Claire
3e4cd799fd Merge commit '7e634eecbc5dc2f65b7bdbfc5c2b5c8a0955156d' into glitch-soc/merge-upstream 2026-01-06 18:11:26 +01:00
github-actions[bot]
7e634eecbc
New Crowdin Translations (automated) (#37394) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-06 10:40:22 +00:00
Nicholas La Roux
fd5539084c
Increase OCR spec timeout from 10 to 20 seconds to improve CI stability (#37393) 2026-01-06 09:51:57 +00:00
Claire
d9cd75400c
Fix heartbeat comment not being its own event (#37389) 2026-01-06 09:50:28 +00:00
Claire
ea59a3d71d
Merge pull request #3332 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 82fb2596c70a18fc4a2d99ab51106180196bfe98
 2026-01-05 21:32:29 +01:00
Claire
0aa70234aa [Glitch] Fix custom emojis not being rendered in profile fields 
Port b622f4c698fe4d22e6f35be39b7e91199d9eceec 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 e8a49bd6ae5b2a0f02a2049ffcea0f9cfaf6c9a9 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
renovate[bot]
2d711d63d0
Update dependency simple_form to v5.4.1 (#37387) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-05 14:38:10 +00:00
Claire
b622f4c698
Fix custom emojis not being rendered in profile fields (#37365) 2026-01-05 14:24:59 +00:00
renovate[bot]
ad9cc10014
Update dependency vite_rails to v3.0.20 (#37380) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-05 14:22:44 +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]
bdf490e949
New Crowdin Translations (automated) (#37378) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-05 09:56:40 +00:00
renovate[bot]
ab7293238f
Update dependency public_suffix to v7.0.2 (#37385) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-05 09:38:35 +00:00
renovate[bot]
cd980645d6
Update dependency public_suffix to v7.0.1 (#37383) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-05 08:43:55 +00:00
Claire
c3cc6b5895
Merge pull request #3328 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to e89acc2302df49cbd7815b031e9c2939632bd204
 2026-01-03 16:57:31 +01:00
Chan Nyein Tun
e826e0e281 [Glitch] Hide empty padding box if no status in Wrapstodon highlighted post 
Port 54bc97cfce757d9520db1e63ce5975141b94aad3 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 4bae3da85c8ee935539aacc92429bdb55aaf145e 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
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