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
28816 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
renovate[bot] 69351b3b74 Update dependency aws-sdk-s3 to v1.213.0 (#37656) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-02 10:27:59 +00:00
renovate[bot] b3086ffbf3 Update dependency annotaterb to v4.21.0 (#37672) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-02 10:27:53 +00:00
renovate[bot] 89be2030d4 Update dependency brakeman to v8 (#37673) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-02 10:27:38 +00:00
Echo 1100035af4 Profile redesign: Additional badges (#37683) 2026-02-02 10:23:08 +00:00
renovate[bot] 65ccf89bfc Update dependency pg-connection-string to v2.11.0 (#37687) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-02 10:02:01 +00:00
github-actions[bot]andGitHub Actions 6bf2b27b5b New Crowdin Translations (automated) (#37688) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-02 09:39:24 +00:00
Claire 4cf98d4a80 Merge pull request #3372 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to a7a33ef6bc
 2026-01-30 19:22:34 +01:00
diondiondion c1a2dd0f4f [Glitch] Adds new Checkbox and CheckboxField components 
Port a7a33ef6bc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-30 18:03:43 +01:00
Claire b490913ad7 Merge commit 'a7a33ef6bc61cf10ef654313cfb7a45fe2b58ae3' into glitch-soc/merge-upstream 2026-01-30 18:00:16 +01:00
diondiondion a7a33ef6bc Adds new Checkbox and CheckboxField components (#37665) 2026-01-30 14:44:28 +00:00
Claire a75790143c Change bundlesize-compare workflow to compare with the result of the merge (#37680) 2026-01-30 13:59:54 +00:00
Claire 2566b46169 Merge pull request #3370 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 0688e64a0b
 2026-01-30 13:47:06 +01:00
Echo fcd00902d1 [Glitch] Fix instance api account merging 
Port 0688e64a0b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-30 12:01:18 +01:00
Claire 0e154b859f Merge commit '6a5578a0db1aed100b6a3ac82b477923d221c350' into glitch-soc/merge-upstream 2026-01-30 12:00:44 +01:00
github-actions[bot]andGitHub Actions 6a5578a0db New Crowdin Translations (automated) (#37668) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-30 10:09:15 +00:00
Claire 3f16c48838 Fix connection recycling pushing symbols to connection pool (#37674) 2026-01-30 09:59:04 +00:00
Echo 0688e64a0b Fix instance api account merging (#37666) 2026-01-30 09:30:22 +00:00
Claire 0997ae0627 Clear affected relationship cache on Move activities (#37664) 2026-01-30 09:15:22 +00:00
Claire 013f281fc8 Merge pull request #3369 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to d0502ac3c1
 2026-01-29 22:05:49 +01:00
diondiondion 94314b2982 [Glitch] Implement editing collection settings and deleting collections 
Port 6f53b0b634 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-29 21:20:52 +01:00
diondiondion 60314c1077 [Glitch] Add initial collections editor page 
Port 2427e14446 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-29 21:13:21 +01:00
Echo a434d73a08 [Glitch] Prevent account note from appearing on your own profile 
Port 8a42689268 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-29 21:10:18 +01:00
Echo 56100254b7 [Glitch] Profile redesign: Featured tags 
Port 9079a75574 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-29 21:09:58 +01:00
Claire d62a7775b5 Merge commit 'd0502ac3c1630e281fda5492cbc28390262b0aeb' into glitch-soc/merge-upstream 2026-01-29 21:08:46 +01:00
Matt Jankowski d0502ac3c1 Use "namespace style" for URL generation in admin/ area forms (#35080) 2026-01-29 15:56:10 +00:00
Daniel KingandDaniel King d5d57ac25a Add flag to preserve cached media on cleanup (#36200) 
Co-authored-by: Daniel King <git@kin.gy>
 2026-01-29 15:53:51 +00:00
renovate[bot]andClaire 0196c12e7f Update dependency dotenv to v17 (#35216) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-29 14:48:09 +00:00
diondiondion 6f53b0b634 Implement editing collection settings and deleting collections (#37658) 2026-01-29 11:01:40 +00:00
github-actions[bot]andGitHub Actions 21f8fc808e New Crowdin Translations (automated) (#37655) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-29 10:59:30 +00:00
renovate[bot] 2cea3ccba0 Update dependency axios to v1.13.4 (#37640) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-29 10:14:44 +00:00
Matt Jankowski 23148dc536 Update rubocop to version 1.8.40 (#37628) 2026-01-29 10:14:14 +00:00
Claire bc3871f992 Fix followers with profile subscription (bell icon) being notified of post edits (#37646) 2026-01-29 09:38:57 +00:00
diondiondion 2427e14446 Add initial collections editor page (#37643) 2026-01-29 09:06:49 +00:00
Echo 8a42689268 Prevent account note from appearing on your own profile (#37653) 2026-01-29 09:02:42 +00:00
Echo 9079a75574 Profile redesign: Featured tags (#37645) 2026-01-29 09:01:36 +00:00
Claire 69a424ff62 Merge pull request #3368 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to a6883242e3
 2026-01-28 20:45:03 +01:00
Claire 32993fbdef Merge commit 'a6883242e3d9f9ed85806b66d40e1a148972bc3c' into glitch-soc/merge-upstream 2026-01-28 19:54:41 +01:00
Claire 7d096dbf63 Merge pull request #3367 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 1ae6b52c47
 2026-01-28 19:52:57 +01:00
PGray 136adfdcad [Glitch] Fix quote cancel button not appearing after edit then delete-and-redraft 
Port f1c00feb5c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-28 19:32:26 +01:00
Echo fd0ab20402 [Glitch] Profile redesign: Timeline filters 
Port ec76288dff to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-28 19:30:54 +01:00
Echo da2cb50aaa [Glitch] Tags component 
Port 3f46034039 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-28 19:30:15 +01:00
Claire 36be9bbebf Merge commit 'a495a0cbfcf9f6111c0e598af0864de2b76e4111' into glitch-soc/merge-upstream 2026-01-28 19:29:10 +01:00
Claire 8a8de5279f Merge pull request #3366 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 1ae6b52c47
 2026-01-28 19:28:15 +01:00
Claire 2e0caa2b73 Merge commit '1ae6b52c471d82d3682a732680549fd849c91957' into glitch-soc/merge-upstream 2026-01-28 19:05:27 +01:00
Tan, Kian-ting 8efcdc04eb Add nan-TW to interface languages (#34923) 2026-01-28 17:56:29 +00:00
Claire a6883242e3 Remove unused nan locale files (replaced by nan-TW) (#37650) 2026-01-28 16:32:19 +00:00
github-actions[bot]andGitHub Actions 42dfd6c031 New Crowdin Translations (automated) (#37647) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-28 16:04:42 +00:00
Matt Jankowski 14ca5d0e6b Use collection partial for rule translation in signup flow (#35932) 2026-01-28 14:05:02 +00:00
Claire a495a0cbfc Fix avatar and header descriptions being returned for suspended accounts (#37641) 2026-01-28 11:06:30 +00:00
Matt Jankowski f861a5cee0 Add action_logs association for account (#36022) 2026-01-28 11:04:00 +00:00