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

4955 Commits

Author SHA1 Message Date
root
99ffe4c308 dev work 2026-07-11 13:54:15 -04:00
Tarrien
4c9652c7c7 Final save before migration 2026-07-11 13:53:31 -04:00
Tarrien
a3fc0d1767 Fixing some customization tweaks 2026-07-11 13:53:01 -04:00
Tarrien
d0234df7d5 Wobbl customizations on Glitch-SOC 2026-07-11 13:52:59 -04:00
Tarrien
3f07c3c205 Theming and such 2026-07-11 13:51:49 -04:00
Claire
f8fb62193a Merge commit 'eeb68053a83894190eefae178a661018b9859494' into glitch-soc/merge-4.6 2026-07-03 18:14:36 +02:00
GitHub Actions
776e667017 New Crowdin translations 2026-07-03 15:22:03 +02:00
Claire
f4cdbb9015 Add “Update available” navigation item at top of navbar when new Mastodon versions are available (#39705) 2026-07-03 14:38:32 +02:00
Claire
8941f1f98c Merge commit '06d64519da4c6fc50536744f0d950dae22c6e2b9' into glitch-soc/merge-4.6 2026-07-02 18:31:59 +02:00
GitHub Actions
06d64519da New Crowdin translations 2026-07-02 15:28:12 +02:00
Claire
1fd5fe741c Always use public/packs and not public/packs-test for assets (#39623) 2026-07-02 14:14:43 +02:00
Claire
2f491f0d48 Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version.
   Did it as well.
 2026-06-23 18:01:59 +02:00
GitHub Actions
b5e771b89e New Crowdin translations 2026-06-23 17:57:50 +02:00
David Roetzel
e38abc3801 Add scheduler job to repair collection attribution (#39550) 2026-06-23 11:17:55 +02:00
David Roetzel
7608436b64 Add route constraint to only allow numeric ids (#39523) 2026-06-23 11:17:54 +02:00
Claire
6b4e8c7467 Merge commit 'e8642389912b1059c921f0836825f12a0f2779db' into glitch-soc/merge-4.6 
Conflicts:
- `app/models/account.rb`:
  Upstream changed the display name length limit for local users,
  but glitch-soc has a configurable limit.
  Updated the default limit to be upstream's new limit.
 2026-06-17 14:40:25 +02:00
github-actions[bot]
9d34527db5
New Crowdin Translations for stable-4.6 (automated) (#39469) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-17 12:33:01 +02:00
Claire
6aca68e185 Merge commit 'e2b7096bd3f93afcf4d6b3e7ffb9ccdb417a9def' into glitch-soc/merge-4.6 2026-06-16 21:49:17 +02:00
diondiondion
80f9422ef2 [Accessibility] Return alt text for default server thumbnail (#39439) 2026-06-15 17:01:10 +02:00
Dmytro Oliinyk
72fa17a441 Fix service worker failing to load due to 404 on chunk dependencies (#39433) 2026-06-15 17:01:10 +02:00
Claire
08027edb10 Merge commit 'b902c825054b953599cd0341acf428332fca5044' into glitch-soc/merge-upstream 2026-06-12 18:37:02 +02:00
github-actions[bot]
03ccfc2172
New Crowdin Translations (automated) (#39390) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-12 07:56:12 +00:00
Eugen Rochko
2630e7e7a2
Fix missing string for custom filter import (#39386) 2026-06-12 05:59:23 +00:00
Pia B.
35f3748482
Add import for custom filters (#39256) 2026-06-11 16:32:46 +00:00
Claire
bbbbb24dbd Merge commit '96e23af89258068d05cc8557df914b4a9add385b' into glitch-soc/merge-upstream 2026-06-11 13:26:25 +02:00
github-actions[bot]
b5a2dd20f6
New Crowdin Translations (automated) (#39367) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-11 07:42:56 +00:00
Claire
89c2ac444f Merge commit '9e0a3aaf08e7d4fc700f7f19d61f5f8fee346b6a' into glitch-soc/merge-upstream 2026-06-10 18:52:58 +02:00
github-actions[bot]
6432fa6649
New Crowdin Translations (automated) (#39351) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-10 09:03:15 +00:00
Claire
e08c8b6933 Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/settings_helper.rb`:
  Upstream added a new helper.
  Conflict caused by the fact there is a glitch-soc specific helper.
  Added upstream's new helper in addition to glitch-soc's.
 2026-06-09 21:30:54 +02:00
Matt Jankowski
e0fc0858a1
Use http POST on rules acceptance button during registration (#39345) 2026-06-09 15:39:24 +00:00
github-actions[bot]
7b858ec3e6
New Crowdin Translations (automated) (#39341) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-09 09:25:45 +00:00
Claire
0b0cdd7a77
Remove doorkeeper workaround (#39336) 2026-06-09 08:30:48 +00:00
Pia B.
d139e57628
fix remove unused translation keys (#39326) 2026-06-08 11:14:10 +00:00
github-actions[bot]
a3c6a52117
New Crowdin Translations (automated) (#39314) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-08 08:23:55 +00:00
Eugen Rochko
ea5b613796
Add ability to view individual newsletters in admin UI (#39271) 2026-06-08 07:05:27 +00:00
Claire
c2e6cbb12b Merge commit 'ead13d4826a7ba1699d6bb310e58642b15687671' into glitch-soc/merge-upstream 2026-06-07 14:29:57 +02:00
Claire
2778eeffba
Add link to profile editing from “Privacy and reach” (#39309) 2026-06-05 14:24:42 +00:00
diondiondion
0c78d1fd0f
Remove outdated hint for "Use system scrollbar" preference (#39297) 2026-06-05 09:27:45 +00:00
Matt Jankowski
be3dce70b8
Update doorkeeper to version 5.9.1 (#39132) 2026-06-05 09:22:05 +00:00
github-actions[bot]
8c80fc612a
New Crowdin Translations (automated) (#39295) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-05 08:29:12 +00:00
github-actions[bot]
2713f14447
New Crowdin Translations (automated) (#39259) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-04 08:12:30 +00:00
Claire
659a077616 Merge commit '07236016bcc78a82205093b3e067bf4a1bb07d88' into glitch-soc/merge-upstream 2026-06-03 12:19:05 +02:00
Renaud Chaput
f0359af358
Change Mastodon gGmbH => Mastodon GmbH (#39261) 2026-06-03 09:36:50 +00:00
Claire
dd12ed2b98 Merge commit 'd1c26c1e27348278fb8081b290e300b327a61ca1' into glitch-soc/merge-upstream 2026-06-02 18:01:45 +02:00
github-actions[bot]
f851dcbefb
New Crowdin Translations (automated) (#39244) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-02 08:00:21 +00:00
Claire
3cf0fb7ba0 Merge commit 'facb552c9cdbe8a2ebff0b94ebf2c9e9ec385347' into glitch-soc/merge-upstream 2026-06-01 18:00:03 +02:00
David Roetzel
300bc7ddc5
Add collections to moderation action button/hint text (#39234) 2026-06-01 11:49:48 +00:00
Pia B.
f6c156197e
Add export for custom filters (#39085) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-01 09:56:17 +00:00
github-actions[bot]
1dfad49524
New Crowdin Translations (automated) (#39224) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-01 07:52:25 +00:00
Claire
ae2ff31f32 Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream updated the API version, while we also have a custom glitch API version.
  Updated as upstream did.
 2026-05-30 12:13:35 +02:00