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

28816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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]
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]
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 dc923c6425559266f0665fe2e294f6e412783810
 2026-04-02 19:51:03 +02:00
Echo
ce157ca2f0 [Glitch] Profile redesign: Split fields row when evenly sized 
Port dc923c6425559266f0665fe2e294f6e412783810 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 7e6813e95c8e49a8f5ddc88af5a8c2be5dd5f06c 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 59299c69ffce78bd4f2207ed3a7eb9484bd042a8 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 f90f1e3b75f5bb53716bf264a5957eab9e85f1d0 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 954cc92a6d8e34c78200b8791efaaf603d6a881a 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 f7c00d8d4e6f142495b6c5b9a824ae86710f5bce 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 caf7c214537e5bd3a13a08a6f47efdfa93938ef5 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 225069d1f2161c94c696c74405ce2a058154bafc 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 8afca67b107a355b7c79cda64f533de7817c87ea 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 145dcfadceb7de2616f62bb414f5fa68c833be29 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-02 18:27:49 +02:00
Echo
9758c59f64 [Glitch] Profile redesign: Account featured tab 
Port 8da2fae6ccd50158171a7caa52a809da2e146c26 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 ffcf87e0234a5529652295d2386a8c9c8e43a7ff
 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
diondiondion
f90f1e3b75
Remove collections client-side feature flag (#38540) 2026-04-02 13:53:47 +00:00
Claire
954cc92a6d
Fix being unable to disable sound for quote update notification (#38537) 2026-04-02 13:47:22 +00:00
Echo
f7c00d8d4e
Profile redesign: Move and rearrange number fields (#38535) 2026-04-02 13:44:34 +00:00
diondiondion
caf7c21453
Make description optional in collection editor (#38536) 2026-04-02 13:32:53 +00:00
diondiondion
225069d1f2
Update collection account list design (#38534) 2026-04-02 13:32:05 +00:00
Claire
8afca67b10
Fix regressions in notifications caused by rendering default translation wrapper element (#38533) 2026-04-02 13:08:24 +00:00
David Roetzel
814cd61fd8
Remove description presence validation on collections (#38528) 2026-04-02 12:56:00 +00:00
Echo
145dcfadce
Profile redesign: Make padding consistent with main timeline (#38531) 2026-04-02 12:39:12 +00:00
Echo
8da2fae6cc
Profile redesign: Account featured tab (#38529) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-04-02 12:33:32 +00:00
Eugen Rochko
8a5d6dab5f
Fix relative sign-up path in e-mail subscription notification (#38527) 2026-04-02 11:14:42 +00:00
Echo
9f6d2fd0f0 [Glitch] Profile redesign: Hide tabs when only activity is available 
Port badda51afc2eb4a93fba0fc57dad49963fe8f172 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-02 12:04:35 +02:00
Claire
45bd1ca785 Merge commit 'ffcf87e0234a5529652295d2386a8c9c8e43a7ff' into glitch-soc/merge-upstream 2026-04-02 12:03:44 +02:00
Claire
ffcf87e023
Fix refreshing keys from stale actors on signature verification error (#38515) 2026-04-02 09:07:44 +00:00
Echo
badda51afc
Profile redesign: Hide tabs when only activity is available (#38517) 2026-04-02 09:07:21 +00:00
Claire
6739967c73
Update dependency rack (#38522) 2026-04-02 09:00:51 +00:00
Claire
d9239f95e2
Update dependency action_text-trix (#38523) 2026-04-02 09:00:44 +00:00
Shlee
53f4c00358
Update FFmpeg 8.1 in Dockerfile (#38266) 2026-04-02 08:57:19 +00:00
renovate[bot]
93eb96f220
Update formatjs monorepo (#38457) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-02 08:57:09 +00:00
renovate[bot]
d3fb748b0b
Update dependency libvips to v8.18.2 (#38504) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-02 08:56:19 +00:00
github-actions[bot]
9b5c676468
New Crowdin Translations (automated) (#38520) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-02 08:55:13 +00:00
Claire
2bf97b3a47
Merge pull request #3464 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to ca5c0a144ade4bff7bd10446a39d86116879884e
 2026-04-01 20:15:21 +02:00
Claire
74c87388c9 Fix extraneous padding 2026-04-01 19:48:43 +02:00
Claire
3e71b4baef Piggy-back on upstream's translatable string 
Even if it's not a perfect match for the context, it's not likely to change.
 2026-04-01 19:41:34 +02:00
Echo
73caee93c2 [Glitch] Profile redesign: Remove feature flag 
Port ca5c0a144ade4bff7bd10446a39d86116879884e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-01 19:33:27 +02:00
Eugen Rochko
c315d27f3c [Glitch] Add email subscriptions to profiles in web UI 
Port 93dcca7f12456f446f1e946602ec931fc0c3e48f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-01 19:22:19 +02:00