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

27928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
bfbe73f127
Merge pull request #3412 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 6ba6285a73c3a8b281123814d45f534e3bcebb96
 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 3d332948703c6bb02d8505e5a12ad6676791980c 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 68a7cd404dfdaff948669803b42a5862c0a9c3a1 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 e24737c612730fd865f62905484dbfa25b82d27e
 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 8e7c3973dc67835e0ce9c7073b9344ec19d3910a
 2026-02-19 23:31:51 +01:00
Echo
d7bbe9c451 [Glitch] Remove conditional check for timeline data 
Port 8e7c3973dc67835e0ce9c7073b9344ec19d3910a 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 39ff07bc89f5e2a73465842ad9fd38400c2c9679 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 c118ff708f849e89fdfda42afcf93e2c005effb9 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 ed4787c1b1de1d7491719be0f45b7a7f16af8c0d 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
renovate[bot]
238d0f8e1d
Update dependency devise to v5.0.2 (#37903) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-19 11:12:08 +00:00
Matt Jankowski
f48a299004
Use validation matchers for UrlValidator spec (#37911) 2026-02-19 11:11:46 +00:00
github-actions[bot]
093528ef17
New Crowdin Translations (automated) (#37915) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-19 11:11:41 +00:00
github-actions[bot]
b6917961d5
New Crowdin translations (#3407) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-18 20:15:57 +01:00
Claire
4977fb1570
Merge pull request #3409 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b
 2026-02-18 20:15:48 +01:00
diondiondion
312c77fdd0 [Glitch] Fix visibility of video overlay controls in light mode 
Port 3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-18 18:59:21 +01:00
diondiondion
93b7678555 [Glitch] Add collection detail page 
Port 488e0b2617ced09e7609e6eec2f0ca46a54a88ca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-18 18:58:57 +01:00
Echo
d67cdcb0b3 [Glitch] Profile redesign: Design fixes 
Port 079f8615fe6208c01ee2dfc072b8cd528d9f0429 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-18 18:55:34 +01:00
Echo
b8b1d3a934 [Glitch] Profile editing: Add initial route 
Port 4b1f66418b0173dd5edcfe9153e00dfe2e4ab948 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-18 18:53:23 +01:00
Claire
925d1ffde5 Fix Ruby linting for glitch-soc code 2026-02-18 18:47:21 +01:00
Claire
b041869887 Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream 2026-02-18 18:40:03 +01:00
diondiondion
3df8fb8fe9
Fix visibility of video overlay controls in light mode (#37906) 2026-02-18 15:28:49 +00:00
Matt Jankowski
66052e3ddd
Use validation matchers for StatusLengthValidator spec (#37905) 2026-02-18 15:22:22 +00:00
Matt Jankowski
e8ecf1719c
Use validation matchers for StatusPinValidator spec (#37904) 2026-02-18 15:09:38 +00:00
Matt Jankowski
a411b7eccb
Use validation matchers for PollOptionsValidator spec (#37901) 2026-02-18 13:44:59 +00:00
Matt Jankowski
9e40d3ef37
Use validation matchers for ReactionValidator spec (#37900) 2026-02-18 13:43:21 +00:00
diondiondion
488e0b2617
Add collection detail page (#37897) 2026-02-18 13:19:39 +00:00
Claire
bd64ca2583
Add new profile settings (#37890) 2026-02-18 13:18:44 +00:00
Echo
079f8615fe
Profile redesign: Design fixes (#37892) 2026-02-18 12:05:02 +00:00
github-actions[bot]
b62ba9e29e
New Crowdin Translations (automated) (#37896) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-18 10:33:31 +00:00