Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 11:11:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,018 Commits 75 Branches 73 Tags
799bd691895199625827ad5caa381d725596cc1c
Commit Graph

10312 Commits

Author SHA1 Message Date
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]
7444c8f82e New Crowdin Translations (automated) (#38018) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-02 08:51:13 +00:00
Dock
d6fa72cfdf [Glitch] Fix avatar alt-text running into other elements on image load failure 
Port 3c8e37907d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-27 21:35:02 +01:00
Echo
310acf113b [Glitch] Profile redesign: Profile fields feedback 
Port 1e5cad072e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-27 21:34:07 +01:00
Echo
398806a2b0 [Glitch] Profile editing: Tab display controls 
Port d69d7c0507 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-27 21:33:31 +01:00
diondiondion
9ed23cc8b2 [Glitch] Add share dialog for collections 
Port 7970eb392a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-27 21:31:10 +01: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]
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
Echo
836c41728d [Glitch] Profile redesign: Fix fields in Chromium 
Port bca57020a0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-26 18:31:11 +01:00
Echo
49bed149df [Glitch] Profile editing: Utilize new API 
Port d18a47b6a7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-26 18:30:49 +01: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]
970ac04be7 New Crowdin Translations (automated) (#37985) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-26 10:07:33 +00:00
Claire
2a60f6fb7c [Glitch] Fix profile redesign profile fields gap 
Port 4d2a148ccb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-25 19:12:55 +01:00
Echo
7c631b9ffb [Glitch] Profile redesign: Account fields grid 
Port dcbf7ab8dc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-25 19:11:38 +01:00
Claire
f6d6dc2605 [Glitch] Fix username availability check being wrongly applied on race conditions 
Port ea34d35b32 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-25 19:11:38 +01:00
diondiondion
ae6dbbcc53 [Glitch] Display public collections on profile "Featured tab" 
Port 440466c246 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-25 19:11:38 +01:00
diondiondion
83b4a7845c [Glitch] Add collection report modal 
Port 919b1e69b8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-25 19:11:38 +01: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
Claire
ea34d35b32 Fix username availability check being wrongly applied on race conditions (#37975) 2026-02-25 14:30:01 +00:00
diondiondion
440466c246 Display public collections on profile "Featured tab" (#37967) 2026-02-25 14:14:55 +00:00
github-actions[bot]
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
Echo
2369b90673 [Glitch] Profile editing: Add singular to translated string 
Port 3ed16489d0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-24 12:02:44 +01: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]
c5b6881c1d New Crowdin Translations (automated) (#37956) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-24 09:08:25 +00:00
Echo
ff7c61b82c [Glitch] Profile editing: Featured tags 
Port ef6405ab28 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-23 18:34:58 +01:00
David Roetzel
7309703de4 [Glitch] Collapse posts/collections in moderation interface 
Port e2aecd040c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-23 18:27:09 +01:00
diondiondion
25e1ade5e2 [Glitch] Allow displaying icon in TextInput component 
Port e0cc3a30ef to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-23 18:22:46 +01:00
diondiondion
8ced537389 [Glitch] Fix overly large avatars in report modal 
Port f9c18ba170 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-23 18:21:22 +01:00
Claire
3508c8b2f6 Merge commit 'ef6405ab28e02686c0c9aa69d77eb43909be5f6f' into glitch-soc/merge-upstream 2026-02-23 18:20:47 +01:00
Echo
ef6405ab28 Profile editing: Featured tags (#37952) 2026-02-23 15:53:49 +00:00
David Roetzel
e2aecd040c Collapse posts/collections in moderation interface (#37929) 2026-02-23 15:14:24 +00:00
diondiondion
e0cc3a30ef Allow displaying icon in TextInput component (#37951) 2026-02-23 14:12:02 +00:00
diondiondion
f9c18ba170 Fix overly large avatars in report modal (#37950) 2026-02-23 12:16:54 +00:00
github-actions[bot]
6bd4d79802 New Crowdin Translations (automated) (#37940) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-23 09:03:07 +00:00
Claire
76ce42bef3 Add back follow relationship badge on redesigned profiles (#3413) 2026-02-20 21:44:17 +01:00
diondiondion
29e6db98f2 [Glitch] Collection accounts editor: Show info badge on accounts that haven't posted in over a week 
Port 3d33294870 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-20 21:09:05 +01:00
diondiondion
c16cbb98e5 [Glitch] Require following accounts before being able to add them to a collection 
Port 68a7cd404d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-20 21:08:41 +01:00
Claire
85f72a3940 Merge commit '6ba6285a73c3a8b281123814d45f534e3bcebb96' into glitch-soc/merge-upstream 2026-02-20 21:08:06 +01:00
Claire
3a1e3d7413 Fix formatting issues, remove unused JS script 2026-02-20 20:47:50 +01:00
Claire
d7d102e68f Merge commit 'e24737c612730fd865f62905484dbfa25b82d27e' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream removed it, replaced by `.oxfmtrc.json`.
  We had glitch-specific files in there.
  Updated `.oxfmtrc.json` accordingly and removed `.prettierignore`.
- `config/formatjs-formatter.js`:
  Upstream switched to `oxfmt` from `prettier`, and some rules are slightly different.
  Glitch-soc had extra code in there.
  Reformatted appropriately.
- `eslint.config.mjs`:
  Upstream moved some configuration from `eslint.config.mjs` to `.oxfmtrc.json` where
  glitch-soc had slightly different configuration.
  Removed it from `eslint.config.mjs` as well and updated `.oxfmtrc.json` accordingly.
- `package.json`:
  Upstream changed script definitions textually adjacent to one that we have modified.
  Applied upstream's change, keeping the textually adjacent modified script intact.
 2026-02-20 20:32:58 +01:00