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
5476 Commits
Author SHA1 Message Date
Claire a4af7a531d Merge commit 'eb848d082afc8864b2aa15858f414e4867902c65' into glitch-soc/merge-upstream 2026-03-07 17:29:09 +01:00
Echo eb848d082a Profile editing: Rearranging and adding fields (#38083) 2026-03-06 12:57:06 +00:00
github-actions[bot]andGitHub Actions 11fb1df7a6 New Crowdin Translations (automated) (#38091) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-06 11:39:35 +00:00
Claire 0a989af8c6 Merge commit '3d8d5f6dc7625d9638cc2e3387247442225d4e3f' into glitch-soc/merge-upstream 2026-03-05 18:21:07 +01:00
diondiondion 3d8d5f6dc7 Remove minimum account limit on collections (#38082) 2026-03-05 15:57:27 +00:00
diondiondion 3557be5d4d Hide account list in sensitive collections (#38081) 2026-03-05 15:43:57 +00:00
Echo dae0926c1f Profile editing: Custom fields (deleting, editing) (#38066) 2026-03-05 10:48:19 +00:00
github-actions[bot]andGitHub Actions 94954aed5e New Crowdin Translations (automated) (#38070) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-05 09:27:43 +00:00
Claire dd27c7b917 Fix “Unblock” and “Unmute” actions being disabled when blocked (#38075) 2026-03-05 09:10:49 +00:00
diondiondion 748dbf3217 Add "Collections" link to main navigation (#38065) 2026-03-05 09:01:08 +00:00
Claire 753e4bee8d Merge commit 'a70079968c55891e387b1c1e524bb314b9dfb033' into glitch-soc/merge-upstream 2026-03-04 18:40:39 +01:00
diondiondion a70079968c Break ScrollableList component into parts (#38059) 2026-03-04 16:18:05 +00:00
Echo 3fbb7424fa Emoji text input and character counter components (#38052) 2026-03-04 16:13:45 +00:00
Claire c96db36396 Merge commit '8a0261c51caf76b6d12e3801da471759c31c9608' into glitch-soc/merge-upstream 2026-03-04 12:40:16 +01:00
github-actions[bot]andGitHub Actions 078b87bdc1 New Crowdin Translations (automated) (#38047) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-04 11:06:26 +00:00
diondiondion d0e7692d79 Fix local collection link resulting in error page (#38038) 2026-03-03 17:34:37 +00:00
diondiondion c0b2286871 Profile redesign: Fix timeline filter button color on Safari iOS (#38040) 2026-03-03 17:34:01 +00:00
Claire 45b87f31ff Merge commit 'a3aeae02885408381c7c1f3f6a0cc88799823409' into glitch-soc/merge-upstream 2026-03-03 18:12:16 +01:00
diondiondion de4ee8565c Prevent hover card from showing on touch devices (#38039) 2026-03-03 15:26:56 +00:00
diondiondion 1d21d9d4c2 Convert ColumnsArea component to TS (#38031) 2026-03-03 12:48:50 +00:00
diondiondion 6e5aa00436 Anchor post navigation via hotkeys to top of viewport (#38036) 2026-03-03 11:02:04 +00:00
github-actions[bot]andGitHub Actions 80066631ee New Crowdin Translations (automated) (#38032) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-03 10:47:19 +00:00
diondiondion 396d9dd12a Allow scrolling alt text popover with keyboard & improved media focus outlines (#38033) 2026-03-03 10:27:46 +00:00
Claire 1b92ac0729 Merge commit '74b3b6c798d1f137947e80df8eefb7412e70febd' into glitch-soc/merge-upstream 2026-03-02 18:11:45 +01:00
Echo 74b3b6c798 Profile editing: Allow adding arbitrary featured tags (#38012) 2026-03-02 16:32:08 +00:00
diondiondion 03b2f77ad2 Collection share modal cleanup (#38030) 2026-03-02 16:19:13 +00:00
diondiondion 816e63d2a5 Add "skip to content", "skip to navigation" links (#38006) 2026-03-02 14:37:33 +00:00
Antoine Cellerier 87004ddb96 Add g+e keyboard shortcut for /explore (trending) (#38014) 2026-03-02 13:49:28 +00:00
Claire 799bd69189 Merge commit '2f657019201d73c9d86d1ece339e66e72954f0eb' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
  Upstream refactored a line adjacent to a glitch-soc modified line.
  Ported upstream changes.
 2026-03-02 12:19:02 +01:00
github-actions[bot]andGitHub Actions 7444c8f82e New Crowdin Translations (automated) (#38018) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-02 08:51:13 +00:00
Claire 0e1ea3110e Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the mastodon API version, glitch-soc has a change on an adjacent
  line adding a glitch API version.
 2026-02-27 21:25:37 +01:00
Dock 3c8e37907d Fix avatar alt-text running into other elements on image load failure. (#38000) 2026-02-27 15:22:19 +00:00
Echo 1e5cad072e Profile redesign: Profile fields feedback (#38005) 2026-02-27 13:54:08 +00:00
Echo d69d7c0507 Profile editing: Tab display controls (#37994) 2026-02-27 13:36:19 +00:00
github-actions[bot]andGitHub Actions fc1f57b5f1 New Crowdin Translations (automated) (#38001) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-27 09:29:07 +00:00
diondiondion 7970eb392a Add share dialog for collections (#37986) 2026-02-26 17:45:09 +00:00
Claire dc27eccc8e Merge commit 'bca57020a04c552a3c91912a0e0b69ddafaad06a' into glitch-soc/merge-upstream 2026-02-26 18:27:02 +01:00
Echo bca57020a0 Profile redesign: Fix fields in Chromium (#37996) 2026-02-26 17:04:46 +00:00
Echo d18a47b6a7 Profile editing: Utilize new API (#37990) 2026-02-26 13:55:10 +00:00
github-actions[bot]andGitHub Actions 970ac04be7 New Crowdin Translations (automated) (#37985) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-26 10:07:33 +00:00
Claire e3cb4dea42 Merge commit '4d2a148ccbedc818c98fd712a0b44869c1019321' into glitch-soc/merge-upstream 2026-02-25 19:11:22 +01:00
Claire 4d2a148ccb Fix profile redesign profile fields gap (#37979) 2026-02-25 17:45:51 +00:00
Echo dcbf7ab8dc Profile redesign: Account fields grid (#37976) 2026-02-25 16:59:18 +00:00
diondiondion 440466c246 Display public collections on profile "Featured tab" (#37967) 2026-02-25 14:14:55 +00:00
github-actions[bot]andGitHub Actions 953472b40d New Crowdin Translations (automated) (#37968) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-25 10:14:08 +00:00
diondiondion 919b1e69b8 Add collection report modal (#37961) 2026-02-24 14:29:46 +00:00
Claire 5a5560ca45 Merge commit '3ed16489d05d701e62be5038adbe2891c1a3ac1d' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream dependency updated textually adjacent to glitch-soc dependency
 2026-02-24 12:01:25 +01:00
Echo 3ed16489d0 Profile editing: Add singular to translated string (#37958) 2026-02-24 10:04:11 +00:00
github-actions[bot]andGitHub Actions c5b6881c1d New Crowdin Translations (automated) (#37956) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-24 09:08:25 +00:00
Claire 3508c8b2f6 Merge commit 'ef6405ab28e02686c0c9aa69d77eb43909be5f6f' into glitch-soc/merge-upstream 2026-02-23 18:20:47 +01:00