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

5378 Commits

Author SHA1 Message Date
Claire
7a4747122e Merge commit 'ca5c0a144ade4bff7bd10446a39d86116879884e' into glitch-soc/merge-upstream 
- `CODE_OF_CONDUCT.md`:
  Adopt upstream's new Code of Conduct
 2026-04-01 19:11:21 +02:00
Claire
b5c1a13341 Merge commit '30275cd80e8552d6cbcdeb11f83a4d5028aa6eae' into glitch-soc/merge-upstream 2026-04-01 18:37:21 +02:00
Echo
ca5c0a144a
Profile redesign: Remove feature flag (#38513) 2026-04-01 15:03:43 +00:00
Eugen Rochko
93dcca7f12
Add email subscriptions to profiles in web UI (#38487) 2026-04-01 14:24:28 +00:00
Echo
36d85f8521
Fix jump when loading more media gallery items (#38512) 2026-04-01 14:02:00 +00:00
Echo
e8f4896b08
Profile redesign: Profile fields overflow (#38510) 2026-04-01 14:01:22 +00:00
nicole mikołajczyk
1f7d6cde5e
Don't end account dropdown menu with a separator (#38481) 2026-04-01 13:22:19 +00:00
MitarashiDango
8733d09dc4
Improve relative time display when post time is in the future (#38488) 2026-04-01 10:40:54 +00:00
Echo
0d20f2367a
Profile redesign: Remove extra underline from number fields (#38509) 2026-04-01 10:40:02 +00:00
github-actions[bot]
eda0f62f89
New Crowdin Translations (automated) (#38505) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-01 09:16:06 +00:00
github-actions[bot]
6736b50c14
New Crowdin Translations (automated) (#38496) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-31 14:53:38 +00:00
Claire
b1bb3baefb
Fix text layout in edition history dropdown (#38485) 2026-03-30 13:27:00 +00:00
github-actions[bot]
ac69a3374c
New Crowdin Translations (automated) (#38470) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-30 09:37:48 +00:00
Claire
30bb39fe54 Merge commit '8e00f7cc8fab9b447f80a27a972eef78186633ad' into glitch-soc/merge-upstream 2026-03-27 18:15:50 +01:00
Echo
6e103636f2
Add error notice when bundle load fails (#38458) 2026-03-27 16:21:58 +00:00
diondiondion
e303c89e4d
Refactor NumberFields to standalone component (#38455) 2026-03-27 16:13:07 +00:00
diondiondion
098d698a7e
Implement new collection page design (#38450) 2026-03-27 15:30:06 +00:00
Echo
9a076359b9
Profile redesign: Add Intl.Segmenter fallback (#38456) 2026-03-27 15:15:36 +00:00
diondiondion
43adb2c91d
Revert translation wrapper for counters (#38453) 2026-03-27 15:04:07 +00:00
Echo
db54c59df4
Shows loading state for gallery correctly (#38451) 2026-03-27 15:03:52 +00:00
Echo
a8c08dfeb3
Profile editing: Minor size fixes (#38446) 2026-03-27 12:57:46 +00:00
Echo
931f43c8b8
Profile redesign: Re-adds title for profile counts and join date (#38445) 2026-03-27 12:50:34 +00:00
Echo
92fa8ce88c
Profile redesign: Include replies in pinned posts (#38443) 2026-03-27 12:45:59 +00:00
Echo
57a4f6b6ec
Profile editing: Field inline messages (#38442) 2026-03-27 12:41:54 +00:00
Echo
9b6f877be5
Profile editing: Make field buttons vanish instead of disable (#38440) 2026-03-27 12:40:34 +00:00
diondiondion
e26c6fa256
Fix styling regressions: familiar followers layout & alert action hover color (#38438) 2026-03-27 10:12:41 +00:00
github-actions[bot]
28284b8452
New Crowdin Translations (automated) (#38435) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-27 08:26:09 +00:00
Claire
2ac493ee8e Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream 2026-03-26 18:23:45 +01:00
diondiondion
dad7f0e869
Update outer spacing of new profile page (#38426) 2026-03-26 15:07:39 +00:00
diondiondion
2124be8a81
Update collection list item design (#38425) 2026-03-26 14:56:36 +00:00
Echo
87dc8f9036
Profile redesign: Fix follower/following pagination (#38417) 2026-03-26 14:15:05 +00:00
diondiondion
39ad873589
Fix regressions caused by rendering default translation wrapper element (#38412) 2026-03-26 11:16:55 +00:00
github-actions[bot]
1dd604df20
New Crowdin Translations (automated) (#38408) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-26 10:35:06 +00:00
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
572f18c322 Merge commit '664efcf4c3f9713894054fb642a252d8752a4123' into glitch-soc/merge-upstream 2026-03-25 21:09:30 +01:00
Echo
61e0ec8844
Profile editing: Re-adds the character counter with the new limit (#38400) 2026-03-25 15:31:58 +00:00
diondiondion
e3dfb7ddd6
Render FormattedMessage translations into React.Fragment by default (#38398) 2026-03-25 15:01:40 +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
Echo
74123950be
Profile editing: Fix incorrect label (#38382) 2026-03-25 10:46:18 +00:00
diondiondion
bafc552a72
Hide empty state of topic suggestions dropdown in Collection editor (#38356) 2026-03-25 10:24:19 +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
3d8e40f7c9 Merge commit 'c72ca33fac1ae1518371f5954ae9487692b17709' into glitch-soc/merge-upstream 2026-03-24 17:05:53 +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
Echo
aef70991f8
Profile redesign: Remove hashtags from featured page (#38363) 2026-03-24 13:10:27 +00:00
Echo
000199f003
Profile redesign: Simplify header for follower/following lists (#38366) 2026-03-24 13:03:44 +00:00
Echo
5ba5a2e552
Profile redesign: Ensure boost and languages menu items are only for following (#38365) 2026-03-24 12:58:19 +00:00
Claire
60236bffe6 Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream 2026-03-24 12:13:39 +01:00
github-actions[bot]
65952f9b4c
New Crowdin Translations (automated) (#38354) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-24 09:40:31 +00:00