tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,803 Commits 5 Branches 0 Tags
0e4878c733a71e9f0e91777134bab773dc09a608
Commit Graph
10720 Commits
Author SHA1 Message Date
diondiondion 0e4878c733 [Glitch] Show collection preview cards and open collections links locally 
Port 478dae0ab3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-25 10:05:05 +02:00
diondiondion 41c68365ff [Glitch] Fix minor collection bugs 
Port 540042dfe3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-25 09:27:27 +02:00
Echo 8f9d4f1463 [Glitch] Profile editing: Fix overflow in advanced view 
Port 1d1deaab2a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-25 09:27:02 +02:00
Echo abc86b8704 [Glitch] Emoji loading performance 
Port 5bc69ea668 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-25 09:26:24 +02: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]andGitHub Actions 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]andGitHub Actions 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
diondiondion 4cbbffb8a6 [Glitch] Fix confusing hover states in admin list items 
Port 5b1891a1ae to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-22 20:35:02 +02:00
diondiondion a7bbc0872a [Glitch] Fix ugly Combobox loading state 
Port e3c0883d32 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-22 20:35:02 +02:00
Echoanddiondiondion c5f07296af [Glitch] Removes React Toggle library 
Port bc09d3c5f2 to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-22 20:35:02 +02:00
Claire b6abf7a69f Merge commit 'c4eec632b92c800ae38dba111c4c76e63bb1c0de' into glitch-soc/merge-upstream 2026-04-22 20:24:21 +02:00
diondiondion 5b1891a1ae Fix confusing hover states in admin list items (#38782) 2026-04-22 14:12:27 +00: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 5f6f53dcb4 Change the default glitch-soc secondary privacy button behavior (#3475) 
“Keep” is confusing and error-prone, “restrict” is consistent with the default button
and much safer.
 2026-04-22 12:41:30 +02:00
diondiondion 73a01fe82f [Glitch] Implement final design for collection editor account dropdown menu 
Port a706fce678 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-21 19:23:08 +02:00
Echo f135486200 [Glitch] Remove animation detection in favour of never cropping GIFs 
Port 57c5d1c8dd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-21 19:22:24 +02:00
diondiondion 0e56e899a0 [Glitch] Add "Must follow" section to account suggestion dropdown menu 
Port d82bada742 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-21 19:22:01 +02: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
diondiondion 582a8a0880 [Glitch] Update design of account search dropdown in collection editor 
Port 05a1c170c2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 18:18:20 +02:00
diondiondion fe712fa5af [Glitch] Allow grouping items in Combobox component 
Port 570f2ef482 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 18:16:16 +02:00
diondiondion 3916132f2f [Glitch] Remove "View other collections from this user" from collection menu 
Port e571994b5c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 18:13:13 +02:00
diondiondion 8257bdcbca [Glitch] Implement new Collection inclusion rules in Collection accounts editor 
Port a40b071640 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 18:12:39 +02:00
Claire fe869936ab [Glitch] Fix Bundle being used with incorrect prop types by using type-dependent key 
Port 0e6180a5af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 18:12:03 +02:00
diondiondion 7c9d73d1cb [Glitch] Update design of collection accounts editor 
Port 5a38246ee8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 18:10:54 +02:00
diondiondion 87c66c8b96 [Glitch] Add more actions to collections notifications & context menus 
Port 543db6d24c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 18:07:21 +02: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