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

27842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
4fbd1ad7ae Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream 
Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.

They were all manually resolved by adapting the relevant code.
 2026-02-11 13:32:18 +01:00
Claire
8d1bf0dda5
Merge pull request #3394 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to fb89198460f9cebf624cc5ca0b139563ae4fd120
 2026-02-11 12:52:19 +01:00
Nicholas La Roux
062d0b454b
Update various eslint packages and correct offences (#37814) 2026-02-11 11:24:22 +00:00
diondiondion
8c2c94fa6c
Add Cmd/Ctrl+Enter to submit when Textarea is focused (#37821) 2026-02-11 10:44:20 +00:00
Claire
c53bb3b33e
Rename “Mode” to “Color scheme” (#37819) 2026-02-11 10:36:59 +00:00
renovate[bot]
94524dd29c
Update dependency @vitejs/plugin-react to v5.1.4 (#37798) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-11 10:34:45 +00:00
renovate[bot]
3faefafdcb
Update dependency pino to v10.3.1 (#37799) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-11 10:15:53 +00:00
github-actions[bot]
cc75188a76
New Crowdin Translations (automated) (#37817) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-11 09:11:56 +00:00
Claire
d13d7b4566
Fix server theme migration (#37810) 2026-02-10 20:53:43 +00:00
Echo
0279a52216
Profile redesign: Account filter fixes (#37811) 2026-02-10 17:20:02 +00:00
Echo
b7d5607dd1 [Glitch] Profile redesign: Quality pass 
Port fb89198460f9cebf624cc5ca0b139563ae4fd120 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-10 18:09:26 +01:00
Claire
d89db37e93 Merge commit 'fb89198460f9cebf624cc5ca0b139563ae4fd120' into glitch-soc/merge-upstream 2026-02-10 18:02:15 +01:00
Claire
71f9ec9c08
Merge pull request #3393 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 2774e0fbfa045e883ec94e873e657e9e8fefa98b
 2026-02-10 18:01:36 +01:00
Matt Jankowski
66b09318ed
Remove unneeded rescue from DOB Validator (#37785) 2026-02-10 16:24:23 +00:00
Claire
63aac77b61
Purge custom emojis on domain suspension (#37808) 2026-02-10 16:13:06 +00:00
Matt Jankowski
34514bcfe9
Move theme-related helper methods out of controller (#37807) 2026-02-10 15:34:42 +00:00
Claire
040555be7f
Fix NoMethodError in ActivityPub::FetchFeaturedTagsCollectionService (#37806) 2026-02-10 15:24:54 +00:00
renovate[bot]
f3347b1c67
Update dependency irb to v1.17.0 (#37780) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-10 13:30:21 +00:00
Claire
46e4b5ae37 Fix streaming of disabled timelines with special permissions (#37791) 2026-02-10 13:27:00 +00:00
David Roetzel
ae30c40335
Auto accept account added to collection (#37805) 2026-02-10 12:48:28 +00:00
Claire
1b00b92772 Merge commit '2774e0fbfa045e883ec94e873e657e9e8fefa98b' into glitch-soc/merge-upstream 2026-02-10 12:03:53 +01:00
Claire
5bb2518888
Merge pull request #3392 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 0b8ce7200aa3121d07aa3866ddfc99de3bcf319e
 2026-02-10 12:03:29 +01:00
Claire
75ba314e6b
Migrate to new theming infrastructure (#37612) 2026-02-10 10:59:47 +00:00
Echo
fb89198460
Profile redesign: Quality pass (#37766) 2026-02-10 10:56:03 +00:00
Matt Jankowski
2774e0fbfa
Reduce stubbing SUT for EmailMxValidator spec (#37750) 2026-02-10 10:49:49 +00:00
renovate[bot]
b8d735411f
Update dependency vite-tsconfig-paths to v6.1.0 (#37773) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-10 10:49:41 +00:00
renovate[bot]
920e9fa9d3
Update dependency axios to v1.13.5 [SECURITY] (#37803) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-10 10:30:35 +00:00
github-actions[bot]
662df23793
New Crowdin Translations (automated) (#37797) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-10 10:16:57 +00:00
David Roetzel
03f73377d9
Federate updates to collections (#37790) 2026-02-10 10:08:55 +00:00
David Roetzel
0763ad0d96
Set a more explicit version number for GH Action (#37800) 2026-02-10 10:00:27 +00:00
Claire
8aabc8628d
Fix i18n check for missing source strings (#37801) 2026-02-10 09:56:16 +00:00
Renaud Chaput
837d1decc9
Add a i18n check in pre-commit for JS files (#37793) 2026-02-10 09:13:09 +00:00
Echo
455fa54106 [Glitch] Fix: Changes to pins update immediately 
Port b4fb25643a12e13b909f5681ce747074c341cd7c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-09 21:46:08 +01:00
Claire
c8db60f8d2 Merge commit '0b8ce7200aa3121d07aa3866ddfc99de3bcf319e' into glitch-soc/merge-upstream 2026-02-09 21:45:21 +01:00
Claire
387b9afcfb
Merge pull request #3390 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to d3cef824018a79ba383deab85e09c31d2673d2c3
 2026-02-09 21:44:15 +01:00
Matt Jankowski
0b8ce7200a
Use validation matchers for ExistingUsernameValidator spec (#37749) 2026-02-09 15:24:31 +00:00
Jonny Saunders
e17bbed88f
Change: Consolidate collection handling in jsonld helper (#34595) 2026-02-09 15:19:36 +00:00
renovate[bot]
665f746165
Update artifact actions (major) (major) (#37788) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-09 15:06:12 +00:00
renovate[bot]
da91639b43
Update twk3/rollup-size-compare-action action to v1.2.0 (#37787) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-09 14:52:08 +00:00
renovate[bot]
c1b945425c
Update peter-evans/create-pull-request action to v8 (#37783) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-09 14:11:10 +00:00
renovate[bot]
624c25edd8
Update actions/cache action to v5 (#37781) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-09 14:11:06 +00:00
renovate[bot]
c0f809cb5b
Update actions/checkout action to v6 (#37782) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-09 13:57:47 +00:00
Echo
b4fb25643a
Fix: Changes to pins update immediately (#37765) 2026-02-09 13:14:24 +00:00
Claire
47b0e7897c Merge commit 'd3cef824018a79ba383deab85e09c31d2673d2c3' into glitch-soc/merge-upstream 2026-02-09 13:11:17 +01:00
Claire
d3cef82401
Refactor store_current_location before_action in OAuth::AuthorizationsController (#37779) 2026-02-09 11:05:32 +00:00
David Roetzel
b9a538e57a
Pin Actions to SHA (#37764) 2026-02-09 09:58:42 +00:00
Matt Jankowski
3f845e649b
Use bundler version 4.0.6 (#37745) 2026-02-09 09:43:28 +00:00
github-actions[bot]
6ec4bd5927
New Crowdin Translations (automated) (#37767) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-09 09:04:32 +00:00
renovate[bot]
77bc8f7aac
Update dependency @types/react to v18.3.28 (#37777) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-09 09:04:25 +00:00
renovate[bot]
08f9af986b
Update dependency dotenv to v17.2.4 (#37753) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-09 08:58:21 +00:00