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

28894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
6935fce458 Merge commit 'ba83509ff4ed3f7193f3ca5c5deb3038c39620b1' into glitch-soc/merge-upstream 2026-05-04 21:08:25 +02:00
renovate[bot]
ba83509ff4
Update dependency FFmpeg/FFmpeg to v8.1.1 (#38888) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-05-04 16:24:22 +00:00
diondiondion
a23b3c7c25
Update block dialog copy to include quotes & collections (#38897) 2026-05-04 15:22:24 +00:00
Eugen Rochko
ee88da4511
Add admin UI for managing email subscriptions (#38741) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-04 13:56:04 +00:00
Juan José Martos
46ccfa6e8d
Updating rollup and flatted dependencies [SECURITY] (#38497) 2026-05-04 13:09:09 +00:00
renovate[bot]
5922d0181e
Update formatjs monorepo (#38804) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-05-04 12:29:58 +00:00
Claire
030104a30c
Change how invalid-but-not-expired invites are shown in moderation interface (#38736) 2026-05-04 11:38:11 +00:00
Jeong Arm
ff99131776
Fix unblocking domain from blocked domains column does not update the list (#38882) 2026-05-04 11:37:56 +00:00
Echo
a7001f52ab
Wraps content in Callout component (#38893) 2026-05-04 10:18:43 +00:00
Echo
708fe31908
Keep trying to load emojis if data isn't available yet (#38892) 2026-05-04 09:50:24 +00:00
Gomasy
00c2089e81
Fix emoji picker not rendering when no custom emojis (#38885) 2026-05-04 09:09:17 +00:00
Matt Jankowski
696aaa616b
Update rubocop-capybara to version 2.23.0 (#38868) 2026-05-04 07:52:29 +00:00
github-actions[bot]
e4b8bbe6e8
New Crowdin Translations (automated) (#38875) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-04 07:49:54 +00:00
renovate[bot]
aa6baf15aa
Update dependency jsdom to v29.1.1 (#38816) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-05-04 07:28:56 +00:00
renovate[bot]
ea52f76314
Update opentelemetry-ruby (non-major) (#38834) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-05-04 07:28:52 +00:00
renovate[bot]
b44aa94853
Update dependency playwright-ruby-client to v1.59.1 (#38848) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-05-04 07:28:46 +00:00
Claire
19e13fb5d7
Merge pull request #3492 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to c6facd27ed191177afb003640b8ee7d0742c7f63
 2026-05-02 14:34:17 +02:00
Echo
b58de2c340 [Glitch] Change handle explainer to refer to the Fediverse 
Port c79bd3123425ff8bcd1f08d1a718852d9f18bdbf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-30 20:11:22 +02:00
Echo
fb7dda40ea [Glitch] Fixes minor profile visual glitches 
Port d63ca75422b3d087e5bd3cd7fef7f87135d8d17a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-30 20:11:22 +02:00
Echo
4f319747c5 [Glitch] Profile editing: Control follower/following list visibility 
Port c270634565a3dcf311857bfac6d59c27ac67e9be to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-30 20:11:22 +02:00
diondiondion
0ec0d84c67 [Glitch] Add "Featuring you" tab to Collections page 
Port b076808fd288df8e0c50e3b8fd03cab1cace8bdd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-30 20:11:22 +02:00
Echo
d33d25121b [Glitch] Remove and move profile code 
Port 945ac23910dff9e7d901f5faa6ee55292812f032 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-30 20:11:22 +02:00
Echo
1f0fb21039 [Glitch] Fixes custom emoji not appearing in autocomplete 
Port a47ed3104718ce6f69bca2c028b267988a28c26b to glitch-soc

Co-authored-by: Copilot <copilot@github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-30 19:19:27 +02:00
diondiondion
e4fba99ab5 [Glitch] Improve collection page loading states 
Port afeb63d287a888d0ae475ab0c66ce53c0595d489 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-30 19:18:18 +02:00
diondiondion
675c19a18b [Glitch] Fix stale collections list after deleting a collection 
Port b761310823926d7f30e46f401ce17f35027c114e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-30 19:17:50 +02:00
diondiondion
26cee35f50 [Glitch] Mark pending accounts in collection editor 
Port 41a3679d83f5f767c013dd4a29c153869469b03a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-30 19:17:09 +02:00
diondiondion
49f60c0b76 [Glitch] Add date & correct icon to "You are in this collection" callout 
Port 614eda43ff5c662cf74bcfb17d2ddace510af6c9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-30 19:14:13 +02:00
diondiondion
1e7c8912d6 [Glitch] Mark pending accounts on the collection detail page 
Port b193913f462702981d20d4a58249a1bceaf3b974 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-30 19:12:14 +02:00
diondiondion
57ed939d00 [Glitch] Fix error when collection is null in collection notification 
Port 31f89617d80ce65ac9d3a89dca7f66a4485a9074 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-30 19:11:43 +02:00
diondiondion
20e9618e6d [Glitch] Add "Follows you" badge to AccountListItem component 
Port ffd7160980a98111323c8608a3e557b7fba00c59 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-30 19:11:31 +02:00
Echo
11f3393825 [Glitch] Remove custom emojis from Redux 
Port 5d9796afb2ab07f64e9876273c363c35ab864bd5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-30 19:05:06 +02:00
Echo
f37da7d231 [Glitch] Allow keyboard modal form submission 
Port 03045425b7323e8ce4e6ce81942d798a500c655a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-30 19:03:31 +02:00
diondiondion
b08e2b8e60 [Glitch] Update design of Collections list page 
Port 3d5cb624ba1bf861d41f4bf42f7ecf02b010718e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-30 19:03:05 +02:00
Claire
44394878a4 Merge commit 'c6facd27ed191177afb003640b8ee7d0742c7f63' into glitch-soc/merge-upstream 2026-04-30 19:00:48 +02:00
github-actions[bot]
c6facd27ed
New Crowdin Translations (automated) (#38871) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-30 16:44:20 +00:00
Echo
c79bd31234
Change handle explainer to refer to the Fediverse (#38872) 2026-04-30 16:32:48 +00:00
Claire
322ada898f
Update dependency minimatch (#38869) 2026-04-30 16:21:38 +00:00
Echo
d63ca75422
Fixes minor profile visual glitches (#38870) 2026-04-30 16:17:14 +00:00
Matt Jankowski
59f3d8a993
Handle IPv6 scenario in custom Request::Socket (#38866) 2026-04-30 16:03:55 +00:00
Echo
c270634565
Profile editing: Control follower/following list visibility (#38845) 2026-04-30 14:16:30 +00:00
Matt Jankowski
b1703467f1
Use bundler version 4.0.11 (#38867) 2026-04-30 14:16:15 +00:00
diondiondion
b076808fd2
Add "Featuring you" tab to Collections page (#38865) 2026-04-30 14:10:25 +00:00
Echo
945ac23910
Remove and move profile code (#38863) 2026-04-30 13:58:22 +00:00
Matt Jankowski
3021cd8002
Update puma to version 8.0.1 (#38738) 2026-04-30 13:28:15 +00:00
renovate[bot]
a8c261ae7c
Update dependency aws-sdk-s3 to v1.220.0 (#38788) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-30 13:22:03 +00:00
renovate[bot]
d4e7af910c
Update dependency vite to v8.0.10 (#38748) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-30 12:59:56 +00:00
github-actions[bot]
20e3265f3b
New Crowdin Translations (automated) (#38864) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-30 12:32:25 +00:00
renovate[bot]
88b21e587c
Update dependency irb to v1.18.0 (#38773) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-30 09:53:20 +00:00
renovate[bot]
c18db97254
Update dependency stoplight to v5.8.2 (#38752) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-30 09:52:13 +00:00
renovate[bot]
d4e60dae9a
Update codecov/codecov-action digest to 75cd116 (#38747) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-30 09:25:22 +00:00