tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,591 Commits 5 Branches 0 Tags
facbda862bd81bd98873570614ca2f55fcaae53b
Commit Graph
28591 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire facbda862b Merge pull request #3470 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to db13dddcf9
 2026-04-07 21:36:08 +02:00
Echo 0a6b75dd90 [Glitch] Profile redesign: Changes verified field border colors 
Port db13dddcf9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-07 20:14:00 +02:00
Eugen Rochkoanddiondiondion 701f285e3f [Glitch] Change design of e-mail subscription form 
Port 927c7d747f to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-07 20:13:37 +02:00
Echo 4cb71b3d93 [Glitch] Fix importing emoji loader statically inside worker 
Port 8e212fca59 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-07 20:13:05 +02:00
Echo 09f6759084 [Glitch] Profile editing: Adds bot toggle 
Port 31d2885d95 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-07 20:12:40 +02:00
Echo 631ec59f9c [Glitch] Profile editing: Fix regression with adding tags 
Port 85fb9218a7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-07 20:12:14 +02:00
Echo bd18207c65 [Glitch] Profile redesign: Handle + tab changes 
Port ed6ceda71d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-07 20:11:49 +02:00
Echo 6ddebfdd04 [Glitch] Profile redesign: Persist filter setting 
Port f2f07404b5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-07 20:09:58 +02:00
Claire 69b70d48c6 Merge commit 'db13dddcf90343574dee320fff7e8bb9bf3707e4' into glitch-soc/merge-upstream 2026-04-07 20:08:57 +02:00
Echo db13dddcf9 Profile redesign: Changes verified field border colors (#38585) 2026-04-07 13:51:07 +00:00
Eugen Rochkoanddiondiondion 927c7d747f Change design of e-mail subscription form (#38582) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-04-07 13:31:59 +00:00
Echo 8e212fca59 Fix importing emoji loader statically inside worker (#38541) 2026-04-07 13:17:07 +00:00
Echo 31d2885d95 Profile editing: Adds bot toggle (#38581) 2026-04-07 12:14:50 +00:00
Echo 85fb9218a7 Profile editing: Fix regression with adding tags (#38580) 2026-04-07 12:05:06 +00:00
Echo ed6ceda71d Profile redesign: Handle + tab changes (#38579) 2026-04-07 11:21:39 +00:00
Matt Jankowski 9fdc8246f2 Use consistent style in *Filter classes to skip pagination (#38559) 2026-04-07 09:59:36 +00:00
Echo f2f07404b5 Profile redesign: Persist filter setting (#38575) 2026-04-07 09:58:57 +00:00
Matt Jankowski 71e6e50846 Simplify media attachment lookup in show/player actions (#38565) 2026-04-07 09:58:37 +00:00
renovate[bot] 4633b97c55 chore(deps): update dependency test-prof to v1.6.1 (#38545) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-07 09:35:42 +00:00
github-actions[bot]andGitHub Actions 0a64bcae63 New Crowdin Translations (automated) (#38564) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-07 09:34:30 +00:00
Claire 577a327349 Merge pull request #3468 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to 8fa91b4b81
 2026-04-04 10:48:57 +02:00
Echo c6f9a60e1f [Glitch] Profile redesign: Adds a "Follows you" badge 
Port 759e97fd36 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-04 09:39:19 +02:00
Claire da85a16692 Merge commit '8fa91b4b81951f884a773d0aa56fc4f1a48da03e' into glitch-soc/merge-upstream 2026-04-04 09:31:50 +02:00
Matt Jankowski 8fa91b4b81 Use partial to render settings/featured_tags (#36174) 2026-04-03 16:29:00 +00:00
Matt JankowskiandBrendan Jones 621628e2cf Clarify that language filter does not impact home/lists (#38490) 
Co-authored-by: Brendan Jones <16049594+brendanjones@users.noreply.github.com>
 2026-04-03 14:46:29 +00:00
Matt Jankowski ee69290003 Use collection partial for "software updates" list in admin area (#38550) 2026-04-03 13:28:50 +00:00
Echo 759e97fd36 Profile redesign: Adds a "Follows you" badge (#38549) 2026-04-03 09:39:29 +00:00
github-actions[bot]andGitHub Actions 627023b452 New Crowdin Translations (automated) (#38553) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-03 09:36:56 +00:00
Matt Jankowski 83ac8979c2 Use rubocop --format github instead of problem matcher (#38519) 2026-04-03 08:44:57 +00:00
Matt Jankowski 671568aec9 Use "batch" concern in admin routes (#38551) 2026-04-03 08:37:41 +00:00
github-actions[bot]andGitHub Actions 93e7a3318b New Crowdin translations (#3446) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-02 19:53:52 +02:00
Claire 3c0f43b5a7 Merge pull request #3466 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to dc923c6425
 2026-04-02 19:51:03 +02:00
Echo ce157ca2f0 [Glitch] Profile redesign: Split fields row when evenly sized 
Port dc923c6425 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-02 18:33:37 +02:00
diondiondion a63744e528 [Glitch] Use compact buttons in collection account list 
Port 7e6813e95c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-02 18:33:14 +02:00
Echo de57fec9b6 [Glitch] Profile redesign: Add alt to avatar and header 
Port 59299c69ff to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-02 18:32:45 +02:00
diondiondion 093858e31a [Glitch] Remove collections client-side feature flag 
Port f90f1e3b75 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-02 18:31:43 +02:00
Claire 4028172753 [Glitch] Fix being unable to disable sound for quote update notification 
Port 954cc92a6d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-02 18:31:04 +02:00
Echo ed14c03f24 [Glitch] Profile redesign: Move and rearrange number fields 
Port f7c00d8d4e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-02 18:30:36 +02:00
diondiondion 6b8b43b3f1 [Glitch] Make description optional in collection editor 
Port caf7c21453 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-02 18:30:09 +02:00
diondiondion b43005ac12 [Glitch] Update collection account list design 
Port 225069d1f2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-02 18:28:47 +02:00
Claire 1505cdd3a2 [Glitch] Fix regressions in notifications caused by rendering default translation wrapper element 
Port 8afca67b10 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-02 18:28:12 +02:00
Echo baa253cd8e [Glitch] Profile redesign: Make padding consistent with main timeline 
Port 145dcfadce to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-02 18:27:49 +02:00
Echoanddiondiondion 9758c59f64 [Glitch] Profile redesign: Account featured tab 
Port 8da2fae6cc to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-02 18:25:51 +02:00
Claire cb62beca08 Merge commit 'dc923c6425559266f0665fe2e294f6e412783810' into glitch-soc/merge-upstream 2026-04-02 18:20:01 +02:00
Claire ff18860990 Merge pull request #3465 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to ffcf87e023
 2026-04-02 18:19:07 +02:00
Matt Jankowski 47f58212de Use approvable concern for repeated API approve/reject routes (#38542) 2026-04-02 16:11:37 +00:00
Echo dc923c6425 Profile redesign: Split fields row when evenly sized (#38544) 2026-04-02 15:46:14 +00:00
Shlee fdce2d3b9c fix: webfinger is not declared as an attribute in actor_serializer.rb (#38538) 2026-04-02 15:45:16 +00:00
diondiondion 7e6813e95c Use compact buttons in collection account list (#38543) 2026-04-02 14:56:03 +00:00
Echo 59299c69ff Profile redesign: Add alt to avatar and header (#38532) 2026-04-02 14:47:11 +00:00