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

5498 Commits

Author SHA1 Message Date
Claire
44394878a4 Merge commit 'c6facd27ed191177afb003640b8ee7d0742c7f63' into glitch-soc/merge-upstream 2026-04-30 19:00:48 +02:00
github-actions[bot]
c6facd27ed
New Crowdin Translations (automated) (#38871) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-30 16:44:20 +00:00
Echo
c79bd31234
Change handle explainer to refer to the Fediverse (#38872) 2026-04-30 16:32:48 +00:00
Echo
d63ca75422
Fixes minor profile visual glitches (#38870) 2026-04-30 16:17:14 +00:00
Echo
c270634565
Profile editing: Control follower/following list visibility (#38845) 2026-04-30 14:16:30 +00:00
diondiondion
b076808fd2
Add "Featuring you" tab to Collections page (#38865) 2026-04-30 14:10:25 +00:00
Echo
945ac23910
Remove and move profile code (#38863) 2026-04-30 13:58:22 +00:00
github-actions[bot]
20e3265f3b
New Crowdin Translations (automated) (#38864) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-30 12:32:25 +00:00
github-actions[bot]
deb72a4c91
New Crowdin Translations (automated) (#38859) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-30 08:21:13 +00:00
Echo
a47ed31047
Fixes custom emoji not appearing in autocomplete (#38854) 
Co-authored-by: Copilot <copilot@github.com>
 2026-04-29 19:44:42 +00:00
diondiondion
afeb63d287
Improve collection page loading states (#38847) 2026-04-29 15:49:52 +00:00
diondiondion
b761310823
Fix stale collections list after deleting a collection (#38852) 2026-04-29 14:42:23 +00:00
github-actions[bot]
578836f9ae
New Crowdin Translations (automated) (#38842) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-29 13:47:29 +00:00
diondiondion
41a3679d83
Mark pending accounts in collection editor (#38843) 2026-04-29 10:35:09 +00:00
diondiondion
614eda43ff
Add date & correct icon to "You are in this collection" callout (#38844) 2026-04-29 10:35:07 +00:00
diondiondion
b193913f46
Mark pending accounts on the collection detail page (#38830) 2026-04-28 16:31:18 +00:00
diondiondion
31f89617d8
Fix error when collection is null in collection notification (#38831) 2026-04-28 15:25:17 +00:00
diondiondion
ffd7160980
Add "Follows you" badge to AccountListItem component (#38828) 2026-04-28 15:18:02 +00:00
Echo
5d9796afb2
Remove custom emojis from Redux (#38825) 2026-04-28 13:49:10 +00:00
Echo
03045425b7
Allow keyboard modal form submission (#38826) 2026-04-28 12:37:58 +00:00
github-actions[bot]
4f76bdfcb7
New Crowdin Translations (automated) (#38824) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-28 11:39:12 +00:00
diondiondion
3d5cb624ba
Update design of Collections list page (#38822) 2026-04-28 11:32:27 +00:00
Claire
57017329a4 Merge commit '2dd630bc581dfd73950b45f6c3b1f47619b7ea6c' into glitch-soc/merge-upstream 2026-04-27 20:18:51 +02:00
diondiondion
2b93a2211f
Increase clickable area around collection items, refactor ListItem component (#38776) 2026-04-27 09:11:07 +00:00
github-actions[bot]
c53bb2fcd6
New Crowdin Translations (automated) (#38805) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-27 08:09:16 +00:00
Claire
b3bae7e78f Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Upstream added a new setting textually adjacent to ones modified by glitch-soc's.
  Added upstream's new setting.
 2026-04-25 09:20:39 +02:00
diondiondion
3473b8a652
Add server thumbnail alt text to frontend (#38801) 2026-04-24 10:28:04 +00:00
github-actions[bot]
a4e5c3244f
New Crowdin Translations (automated) (#38800) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-24 08:46:34 +00:00
Echo
e2be688389
Profile redesign: Show full join date (#38687) 2026-04-23 12:47:01 +00:00
diondiondion
2f0db28aa4
Implement collection limit on frontend (#38786) 2026-04-23 12:44:30 +00:00
diondiondion
d7b60a2cb6
Fix preview for local collection links (#38793) 2026-04-23 11:47:31 +00:00
diondiondion
478dae0ab3
Show collection preview cards and open collections links locally (#38643) 2026-04-23 09:16:54 +00:00
github-actions[bot]
a8741495c4
New Crowdin Translations (automated) (#38790) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-23 08:42:05 +00:00
diondiondion
540042dfe3
Fix minor collection bugs (#38785) 2026-04-23 08:37:22 +00:00
Echo
1d1deaab2a
Profile editing: Fix overflow in advanced view (#38791) 2026-04-23 08:28:14 +00:00
Echo
5bc69ea668
Emoji loading performance (#38784) 2026-04-23 07:48:00 +00:00
Claire
b6abf7a69f Merge commit 'c4eec632b92c800ae38dba111c4c76e63bb1c0de' into glitch-soc/merge-upstream 2026-04-22 20:24:21 +02:00
diondiondion
e3c0883d32
Fix ugly Combobox loading state (#38778) 2026-04-22 13:33:34 +00:00
Echo
bc09d3c5f2
Removes React Toggle library (#38771) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-04-22 11:31:14 +00:00
github-actions[bot]
a3127a146d
New Crowdin Translations (automated) (#38774) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-22 10:42:55 +00:00
Claire
0b3c848958 Merge commit 'a706fce6781104b3aa1315be14f1fb8ccd4fcb1b' into glitch-soc/merge-upstream 2026-04-21 19:20:05 +02:00
diondiondion
a706fce678
Implement final design for collection editor account dropdown menu (#38767) 2026-04-21 14:12:44 +00:00
Echo
57c5d1c8dd
Remove animation detection in favour of never cropping GIFs (#38766) 2026-04-21 11:40:09 +00:00
github-actions[bot]
9717dc64d0
New Crowdin Translations (automated) (#38762) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-21 11:10:06 +00:00
diondiondion
d82bada742
Add "Must follow" section to account suggestion dropdown menu (#38750) 2026-04-20 17:50:37 +00:00
Claire
e7ee3a997c Merge commit '28e5c3bb5116d012a1f58b4cbfe1a5fb302ac227' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added fallback behavior for when the admin-set theme does not exist.
  Glitch-soc has a different theming system, but already had similar fallback,
  so not changing glitch-soc code.
- `spec/helpers/theme_helper_spec.rb`:
  Upstream adapted existing tests for the new fallback behavior, and added some
  tests accordingly.
  Glitch-soc has a different theming system, adapted the new tests accordingly.
 2026-04-20 18:51:00 +02:00
github-actions[bot]
d9149bfed9
New Crowdin Translations (automated) (#38743) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-20 07:47:02 +00:00
Claire
e0a34e6d89 Merge commit 'b15d234ccb5d004180561c440dd45536d70e67b2' into glitch-soc/merge-upstream 2026-04-17 18:06:10 +02:00
diondiondion
05a1c170c2
Update design of account search dropdown in collection editor (#38739) 2026-04-17 15:13:18 +00:00
diondiondion
570f2ef482
Allow grouping items in Combobox component (#38730) 2026-04-17 13:18:04 +00:00