Claire
b2d10eab3b
Merge pull request #3421 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 4d2a148ccb
2026-02-25 19:45:52 +01:00
Claire
2a60f6fb7c
[Glitch] Fix profile redesign profile fields gap
...
Port 4d2a148ccbclaire.github-309c@sitedethib.com >
2026-02-25 19:12:55 +01:00
Echo
7c631b9ffb
[Glitch] Profile redesign: Account fields grid
...
Port dcbf7ab8dcclaire.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 ea34d35b32claire.github-309c@sitedethib.com >
2026-02-25 19:11:38 +01:00
diondiondion
ae6dbbcc53
[Glitch] Display public collections on profile "Featured tab"
...
Port 440466c246claire.github-309c@sitedethib.com >
2026-02-25 19:11:38 +01:00
diondiondion
83b4a7845c
[Glitch] Add collection report modal
...
Port 919b1e69b8claire.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
David Roetzel
f9326efef6
Add moderation consequences for collections ( #37974 )
2026-02-25 14:32:07 +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
Matt Jankowski
32873e63cf
Remove references to removed prettier config files ( #37962 )
2026-02-25 14:13:32 +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
David Roetzel
e2c9426c77
Split status batch and moderation actions ( #37970 )
2026-02-25 10:07:46 +00:00
Claire
c857c91508
Merge pull request #3420 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 1e87bd178d
2026-02-24 15:54:29 +01:00
diondiondion
919b1e69b8
Add collection report modal ( #37961 )
2026-02-24 14:29:46 +00:00
David Roetzel
72406a1cd1
Refactor: Introduce admin base action class ( #37960 )
2026-02-24 14:22:44 +00:00
Claire
c15c49b5b6
Merge commit '1e87bd178d96ab7d760f019fcf651ecc1585e701' into glitch-soc/merge-upstream
2026-02-24 15:14:25 +01:00
Claire
1e87bd178d
Bump version to v4.5.7 ( #37965 )
2026-02-24 13:54:33 +00:00
Claire
c7338bb819
Merge pull request #3416 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 3ed16489d0
2026-02-24 13:06:06 +01:00
Echo
2369b90673
[Glitch] Profile editing: Add singular to translated string
...
Port 3ed16489d0claire.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
Claire
43ef9f66b6
Add PATCH /api/v1/profile ( #37934 )
2026-02-24 10:48:56 +00: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 ef6405ab28claire.github-309c@sitedethib.com >
2026-02-23 18:34:58 +01:00
David Roetzel
7309703de4
[Glitch] Collapse posts/collections in moderation interface
...
Port e2aecd040cclaire.github-309c@sitedethib.com >
2026-02-23 18:27:09 +01:00
diondiondion
25e1ade5e2
[Glitch] Allow displaying icon in TextInput component
...
Port e0cc3a30efclaire.github-309c@sitedethib.com >
2026-02-23 18:22:46 +01:00
diondiondion
8ced537389
[Glitch] Fix overly large avatars in report modal
...
Port f9c18ba170claire.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 3d33294870claire.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 68a7cd404dclaire.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
