Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 19:21:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
27,948 Commits 75 Branches 73 Tags
5a5560ca451069ff2ccf952d44a529e6ca5b7fe8
Commit Graph

27948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
renovate[bot]
49bcaba628 Update dependency postcss-preset-env to v11.2.0 (#37945) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-24 09:08:37 +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
renovate[bot]
96bff0e4cd Update dependency omniauth-saml to v2.2.5 (#37944) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-24 08:37:41 +00:00
Claire
261c6540f7 Merge pull request #3414 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to ef6405ab28
 2026-02-23 20:55:20 +01: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
David Roetzel
b785f05ddb Add coverage for StatusBatchAction (#37949) 2026-02-23 13:22:24 +00:00
diondiondion
f9c18ba170 Fix overly large avatars in report modal (#37950) 2026-02-23 12:16:54 +00:00
Matt Jankowski
1d513966bd Remove unneeded haml-lint problem matcher (#37930) 2026-02-23 09:54:50 +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
renovate[bot]
5fc2be54c7 Update dependency rspec-sidekiq to v5.3.0 (#37938) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-23 09:03:03 +00:00
Claire
76ce42bef3 Add back follow relationship badge on redesigned profiles (#3413) 2026-02-20 21:44:17 +01:00
Claire
bfbe73f127 Merge pull request #3412 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 6ba6285a73
 2026-02-20 21:29:01 +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
200b1adec0 Merge pull request #3411 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to e24737c612
 2026-02-20 21:07:27 +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
David Roetzel
6ba6285a73 Reject unconfirmed FASPs (#37926) 2026-02-20 14:40:31 +00:00
David Roetzel
7b85d21823 Re-use custom socket class for FASP requests (#37925) 2026-02-20 14:27:50 +00:00
diondiondion
3d33294870 Collection accounts editor: Show info badge on accounts that haven't posted in over a week (#37928) 2026-02-20 14:01:39 +00:00
diondiondion
68a7cd404d Require following accounts before being able to add them to a collection (#37927) 2026-02-20 13:14:36 +00:00
github-actions[bot]
4d2ca8c92a New Crowdin Translations (automated) (#37924) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-20 10:52:57 +00:00
Claire
cc1e65dcec Add GET /api/v1/profile (#37912) 2026-02-20 10:16:04 +00:00
Claire
754ad33640 Merge pull request #3410 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 8e7c3973dc
 2026-02-19 23:31:51 +01:00
Echo
d7bbe9c451 [Glitch] Remove conditional check for timeline data 
Port 8e7c3973dc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-19 22:04:28 +01:00
diondiondion
5c47ed2d47 [Glitch] Only suggest discoverable accounts in collection account editor 
Port 39ff07bc89 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-19 22:04:05 +01:00
diondiondion
79fba522e1 [Glitch] Merge collection settings into single editor page 
Port c118ff708f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-19 22:02:44 +01:00
Echo
3ac5b10dec [Glitch] Profile editing: Name and bio 
Port ed4787c1b1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-19 21:53:24 +01:00
Claire
eebed16f59 Merge commit '8e7c3973dc67835e0ce9c7073b9344ec19d3910a' into glitch-soc/merge-upstream 2026-02-19 21:52:23 +01:00
Renaud Chaput
e24737c612 Replace prettier with oxfmt (#37893) 2026-02-19 18:04:25 +00:00
Echo
8e7c3973dc Remove conditional check for timeline data (#37922) 2026-02-19 17:20:33 +00:00
diondiondion
39ff07bc89 Only suggest discoverable accounts in collection account editor (#37920) 2026-02-19 16:43:31 +00:00
github-actions[bot]
7eb4b907eb New Crowdin Translations (automated) (#37918) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-19 14:42:24 +00:00
Matt Jankowski
2a9de97cb6 Use validation matchers for UserEmailValidator spec (#37908) 2026-02-19 14:25:58 +00:00
diondiondion
c118ff708f Merge collection settings into single editor page (#37916) 2026-02-19 14:09:52 +00:00
Echo
ed4787c1b1 Profile editing: Name and bio (#37907) 2026-02-19 13:53:29 +00:00
Matt Jankowski
157583659a Use validation matchers for UniqueUsernameValidator spec (#37909) 2026-02-19 13:14:12 +00:00
Matt Jankowski
40f92f3af8 Use validation matchers for UnreservedUsernameValidator spec (#37910) 2026-02-19 12:50:09 +00:00
David Roetzel
e288bf6516 Show reported collections in moderation interface (#37898) 2026-02-19 12:46:38 +00:00
renovate[bot]
6f859364fb Update dependency rack to v3.2.5 (#37895) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-19 12:46:32 +00:00