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

28413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
79958d9442 Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/post_status_service.rb`:
  Upstream added a line adjacent to one that had been modified due to local-only posting.
  Added upstream's change.
- `tsconfig.json`:
  Upstream updated Typescript and updated `tsconfig` in the process by changing paths, where
  glitch-soc had extra paths. Updated as upstream did.
 2026-03-25 21:36:32 +01:00
Claire
24bc05f3a4
Merge pull request #3459 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to 664efcf4c3f9713894054fb642a252d8752a4123
 2026-03-25 21:30:45 +01:00
Echo
166f932d1e [Glitch] Profile editing: Fix incorrect label 
Port 74123950be00e498fa1b78fcfaf9f5b9ec3246eb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-25 21:11:10 +01:00
diondiondion
237440f2ec [Glitch] Hide empty state of topic suggestions dropdown in Collection editor 
Port bafc552a722fc6875c9adc845fd32ba031e58f66 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-25 21:10:41 +01:00
Claire
572f18c322 Merge commit '664efcf4c3f9713894054fb642a252d8752a4123' into glitch-soc/merge-upstream 2026-03-25 21:09:30 +01:00
Matt Jankowski
31abef8917
Remove archive screenshots step from search CI job (#38403) 2026-03-25 16:37:02 +00:00
David Roetzel
2884abacef
Fix item count (#38402) 2026-03-25 16:31:04 +00:00
Eugen Rochko
bcf0718a9a
Add email subscriptions (#38163) 2026-03-25 16:25:45 +00:00
Claire
b46d003e20
Don't install recommended packages in CI tasks (#38401) 2026-03-25 15:59:50 +00:00
Echo
61e0ec8844
Profile editing: Re-adds the character counter with the new limit (#38400) 2026-03-25 15:31:58 +00:00
David Roetzel
2a4b205c75
Make sure Delete reaches collection owner (#38399) 2026-03-25 15:28:20 +00:00
diondiondion
e3dfb7ddd6
Render FormattedMessage translations into React.Fragment by default (#38398) 2026-03-25 15:01:40 +00:00
Claire
15dbf8040e
Add support for multiple keypairs for remote accounts (#38279) 2026-03-25 14:52:12 +00:00
Echo
1820a03622
Refactor: Update FormatJS (#38388) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-25 14:38:35 +00:00
diondiondion
37236acd3b
Update web theme tokens with latest design system tokens (#38387) 2026-03-25 14:34:38 +00:00
David Roetzel
c9eefd0ae7
Persist activity URI of a FeatureRequest (#38393) 2026-03-25 14:32:15 +00:00
David Roetzel
a0f6b6d365
Fix off-by-one error when creating collection items (#38394) 2026-03-25 14:29:11 +00:00
renovate[bot]
864d7b1267
Update dependency typescript to v6 (#38344) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2026-03-25 13:43:41 +00:00
Matt Jankowski
2112ea4d63
Drop support for ruby 3.2 (#37476) 2026-03-25 13:18:34 +00:00
Matt Jankowski
664efcf4c3
Add have_attachment matcher for attached file exports (#38389) 2026-03-25 13:18:14 +00:00
David Roetzel
bcead76410
Only federate accepted collection items (#38385) 2026-03-25 13:04:09 +00:00
David Roetzel
84ea8334fe
Do not auto-accept remote collection items (#38386) 2026-03-25 13:04:05 +00:00
Claire
7583d07d3a
Change avatar and account header description limit and expose it in API (#38384) 2026-03-25 12:32:47 +00:00
renovate[bot]
45e7c7a5e1
Update storybook (non-major) (#38353) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-25 11:22:11 +00:00
David Roetzel
d9db4779cf
Handle local/remote collection items differently when deleting (#38383) 2026-03-25 10:57:34 +00:00
Echo
74123950be
Profile editing: Fix incorrect label (#38382) 2026-03-25 10:46:18 +00:00
Matt Jankowski
5d7682c7dd
Extract security_key_options endpoint to standalone controller (#38367) 2026-03-25 10:35:09 +00:00
diondiondion
bafc552a72
Hide empty state of topic suggestions dropdown in Collection editor (#38356) 2026-03-25 10:24:19 +00:00
Matt Jankowski
b399dc3191
Add coverage for "fields" feature of Account (#38369) 2026-03-25 10:23:45 +00:00
renovate[bot]
d6da3bdf1f
Update dependency react-easy-crop to v5.5.7 (#38355) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-25 10:18:14 +00:00
renovate[bot]
5267a99fb8
Update dependency ws to v8.20.0 (#38328) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-25 10:17:17 +00:00
Claire
ea54c266ed
Update dependency bcrypt (#38381) 2026-03-25 10:14:39 +00:00
Matt Jankowski
52a8bf4118
Add constants for delay in services (#38375) 2026-03-25 09:59:38 +00:00
Matt Jankowski
d42182d9a2
Use more granular content check via parsed_body (#38378) 2026-03-25 09:58:04 +00:00
github-actions[bot]
c6691e77bd
New Crowdin Translations (automated) (#38380) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-25 09:51:42 +00:00
Claire
88c7d3bf3f
Merge pull request #3458 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to c72ca33fac1ae1518371f5954ae9487692b17709
 2026-03-24 17:54:34 +01:00
David Roetzel
a3bdcc71e7
Fix serialization when an account is missing (#38370) 2026-03-24 16:42:57 +00:00
Echo
8c385b89c3 [Glitch] Profile editing: Visual fixes 
Port 2d4b5b6c51d4acf3ae35c3e479ba179a9bb5f27d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-24 17:23:00 +01:00
Echo
eb3d54eac9 [Glitch] Remove column header button 
Port c7e90ee67a744b63524eb3e4d0a3632c84c86456 to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-24 17:23:00 +01:00
Echo
6d3cf92a2b [Glitch] Profile redesign: Remove hashtags from featured page 
Port aef70991f862ab0dfd173b54bb9de8609e6787f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-24 17:23:00 +01:00
Echo
2e47579bd2 [Glitch] Profile redesign: Simplify header for follower/following lists 
Port 000199f003eecafbf2e6a6166d5e179fea4e5948 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-24 17:22:59 +01:00
Echo
889706a317 [Glitch] Profile redesign: Ensure boost and languages menu items are only for following 
Port 5ba5a2e55250ad52556caa627a0e486338f9d5ea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-24 17:07:34 +01:00
Claire
3d8e40f7c9 Merge commit 'c72ca33fac1ae1518371f5954ae9487692b17709' into glitch-soc/merge-upstream 2026-03-24 17:05:53 +01:00
Claire
c72ca33fac
Bump version to v4.5.8 (#38374) 2026-03-24 15:51:03 +00:00
David Roetzel
7788281759
Fix adding items without a position (#38368) 2026-03-24 14:43:50 +00:00
Claire
4559e4ed1a
Merge commit from fork 2026-03-24 15:44:08 +01:00
Claire
ab251290d6
Merge commit from fork 2026-03-24 15:42:40 +01:00
Claire
2458d6ea8e
Merge pull request #3454 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to 0ef43a431d353a17419ea6664ed745b5dbfbf2f9
 2026-03-24 15:03:35 +01:00
Echo
2d4b5b6c51
Profile editing: Visual fixes (#38346) 2026-03-24 13:47:07 +00:00
Echo
c7e90ee67a
Remove column header button (#38362) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-03-24 13:28:09 +00:00