tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,816 Commits 5 Branches 0 Tags
83ea9b94de798a93ca06ea0629e4920e3421c4e5
Commit Graph
17500 Commits
Author SHA1 Message Date
diondiondion 83ea9b94de [Glitch] Increase clickable area around collection items, refactor ListItem component 
Port 2b93a2211f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-27 20:44:53 +02:00
Claire 57017329a4 Merge commit '2dd630bc581dfd73950b45f6c3b1f47619b7ea6c' into glitch-soc/merge-upstream 2026-04-27 20:18:51 +02:00
David Roetzel 2dd630bc58 Only update FASP availability if it actually changed (#38818) 2026-04-27 13:15:53 +00:00
diondiondion 2b93a2211f Increase clickable area around collection items, refactor ListItem component (#38776) 2026-04-27 09:11:07 +00:00
github-actions[bot]andGitHub Actions c53bb2fcd6 New Crowdin Translations (automated) (#38805) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-27 08:09:16 +00:00
diondiondion 2ab8d53694 [Glitch] Add server thumbnail alt text to frontend 
Port 3473b8a652 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-25 10:05:06 +02:00
Echo 77955109ca [Glitch] Profile redesign: Show full join date 
Port e2be688389 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-25 10:05:06 +02:00
diondiondion 66298d8567 [Glitch] Implement collection limit on frontend 
Port 2f0db28aa4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-25 10:05:06 +02:00
diondiondion 5bcb9ae43d [Glitch] Fix preview for local collection links 
Port d7b60a2cb6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-25 10:05:05 +02:00
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
diondiondion a217b633b7 Allow defining alt text for server thumbnail (#38796) 2026-04-23 17:46:50 +00:00
Shlee 7c1d6ab114 Role "collection limit" setting missing in params (#38794) 2026-04-23 13:32:12 +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
David Roetzel fdb2563abf Use /collections/:id as canonical URL for a collection (#38783) 2026-04-23 07:36:35 +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
David Roetzel 1cae543e8f Add per-user maximum number of collections (#38769) 2026-04-22 12:34:08 +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
Matt Jankowski c589530e22 Add constants to track media player height/width (#38755) 2026-04-21 11:10:45 +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
Matt Jankowski 055b739b88 Use with_domain scope in ReportService (#38758) 2026-04-21 09:59:04 +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
Claire ccf5c09ad3 Fix incorrect value for feature_approval.current_user for local users (#38751) 2026-04-20 16:00:15 +00:00
David Roetzel c0b1fbe0a9 Fix item limit on collections (#38749) 2026-04-20 10:17:12 +00:00