tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,781 Commits 5 Branches 0 Tags
4cbbffb8a6caddc5370e70d768a0249637b61eea
Commit Graph
5462 Commits
Author SHA1 Message Date
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
Echoanddiondiondion bc09d3c5f2 Removes React Toggle library (#38771) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-04-22 11:31:14 +00:00
github-actions[bot]andGitHub Actions 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]andGitHub Actions 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]andGitHub Actions 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
diondiondion e571994b5c Remove "View other collections from this user" from collection menu (#38728) 2026-04-17 08:50:35 +00:00
github-actions[bot]andGitHub Actions 3c88310f37 New Crowdin Translations (automated) (#38726) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-17 08:08:49 +00:00
diondiondion a40b071640 Implement new Collection inclusion rules in Collection accounts editor (#38719) 2026-04-16 18:05:36 +00:00
Claire 0e6180a5af Fix Bundle being used with incorrect prop types by using type-dependent key (#38721) 2026-04-16 18:05:04 +00:00
diondiondion 5a38246ee8 Update design of collection accounts editor (#38712) 2026-04-16 13:59:38 +00:00
github-actions[bot]andGitHub Actions 18c79e4e45 New Crowdin Translations (automated) (#38705) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-16 09:32:46 +00:00
diondiondion 543db6d24c Add more actions to collections notifications & context menus (#38698) 2026-04-15 18:03:48 +00:00
Claire 3072de056a Merge commit '3a84990780fb1b48999f661f0cea5cb29cca4d33' into glitch-soc/merge-upstream 2026-04-15 16:27:32 +02:00
Echo fab1e799a6 Profile redesign: Make illustration use CSS vars (#38692) 2026-04-15 12:54:10 +00:00
diondiondion 4835c3b7b4 Allow viewing unlisted collections on your own Profile's Featured tab (#38690) 2026-04-15 12:25:43 +00:00
diondiondion 298fc7ce4c Prevent text wrapping in Badge component (#38691) 2026-04-15 12:06:26 +00:00
Echo e71d6fa344 Makes RelativeTimestamp default to not showing the future (#38689) 2026-04-15 11:39:27 +00:00
Claire ff80786d2e Merge commit 'd9ea631d5911ebfe090e0d1ea1b11441aa58c918' into glitch-soc/merge-upstream 2026-04-15 13:36:46 +02:00
Echo d9ea631d59 Featured tab: Check if collections are enabled for loading status (#38688) 2026-04-15 10:21:22 +00:00
github-actions[bot]andGitHub Actions 05c9ebf2ce New Crowdin Translations (automated) (#38683) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-15 09:25:46 +00:00
Claire 817291c692 Merge commit '2b93d19d2ca18366b015e3dcde412e67625fe8f5' into glitch-soc/merge-upstream 2026-04-14 18:19:27 +02:00
Claireandnicolas 2b93d19d2c Update handle explainer copy (#38646) 
Co-authored-by: nicolas <nclm@users.noreply.github.com>
 2026-04-14 13:15:59 +00:00
Echo d931e2f30d Prevents featured tags from flickering (#38667) 2026-04-14 11:58:50 +00:00
github-actions[bot]andGitHub Actions 4fcab304e3 New Crowdin Translations (automated) (#38665) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-14 10:12:20 +00:00
Echo 6142c7b003 Profile redesign: Allow animated and transparent avatars (#38663) 2026-04-14 09:21:06 +00:00
Claire 9177a3e807 Merge commit '02deb0b2381e116b512a826064f6d4008c260cd5' into glitch-soc/merge-upstream 2026-04-13 19:12:08 +02:00
diondiondion 02deb0b238 Allow revealing blocked/muted accounts in a collection (#38660) 2026-04-13 15:41:47 +00:00
github-actions[bot]andGitHub Actions f4f1a86da6 New Crowdin Translations (automated) (#38647) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-13 08:57:02 +00:00
Claire 1eac058989 Merge commit '73fc8d34d98a80cfb32d3c7c5dc4794fad5470d5' into glitch-soc/merge-upstream 2026-04-11 13:22:19 +02:00
diondiondion a896081808 Fix Followers/Following list error when they contain accounts that have never posted (#38640) 2026-04-10 14:06:35 +00:00
diondiondion df4b4f1620 Adds collection notification UI (#38638) 2026-04-10 12:11:11 +00:00
github-actions[bot]andGitHub Actions 9c164aa16c New Crowdin Translations (automated) (#38635) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-10 11:18:59 +00:00
diondiondion d6c0b93c85 Change "My collections" path to /@username/collections (#38630) 2026-04-09 15:31:49 +00:00
diondiondion ef4a583f54 More design tweaks for empty state in Featured tab > Collections (#38626) 2026-04-09 14:37:39 +00:00
diondiondion 2ef9cceccd Fix broken line clamping for bios in AccountListItem (#38632) 2026-04-09 14:24:05 +00:00
diondiondion 19ef4e5c40 Allow hiding featured tab from empty state (#38625) 2026-04-09 10:59:11 +00:00
github-actions[bot]andGitHub Actions 875cd30150 New Crowdin Translations (automated) (#38620) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-09 10:50:03 +00:00
diondiondion 05bed6f3d8 Update Profile Featured tab to latest designs (#38616) 2026-04-09 09:15:05 +00:00
diondiondion 4e60a6f163 Hide bio & familiar followers from Followers/Following lists (#38622) 2026-04-09 09:00:09 +00:00
Claire b9014ec220 Merge commit '66fdd3ae65e13349fbc0b2818d4b91a389075553' into glitch-soc/main 2026-04-08 19:32:32 +02:00
diondiondion 7d9b1e6d1e Update collection account item design (#38586) 2026-04-08 14:26:39 +00:00