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
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
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
diondiondion
e0cc3a30ef
Allow displaying icon in TextInput component ( #37951 )
2026-02-23 14:12:02 +00:00
Claire
85f72a3940
Merge commit '6ba6285a73c3a8b281123814d45f534e3bcebb96' into glitch-soc/merge-upstream
2026-02-20 21:08:06 +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
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
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
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
Claire
b041869887
Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream
2026-02-18 18:40:03 +01:00
diondiondion
488e0b2617
Add collection detail page ( #37897 )
2026-02-18 13:19:39 +00:00
Echo
079f8615fe
Profile redesign: Design fixes ( #37892 )
2026-02-18 12:05:02 +00:00
Echo
4b1f66418b
Profile editing: Add initial route ( #37885 )
2026-02-17 15:45:24 +00:00
Claire
f47e2937cf
Merge commit '0b66e744263a4af1f14d03886ea2a9da4ca156db' into glitch-soc/merge-upstream
2026-02-17 12:11:33 +01:00
diondiondion
a644a4a762
Allow managing collection accounts ( #37812 )
2026-02-16 18:17:20 +00:00
Claire
02ad266b81
Merge commit 'cff25c186bb8bb7cdd29de8938949c775dc0ec7f' into glitch-soc/merge-upstream
2026-02-16 18:27:08 +01:00
Echo
f7bf804a3f
Profile redesign: Switch to server flag ( #37876 )
2026-02-16 13:06:49 +00:00
Claire
5f72148834
Merge commit '56ecdde1523cec87c55d3d0e7e9b6757dcfe2491' into glitch-soc/merge-upstream
2026-02-13 18:26:08 +01:00
Echo
3d0a6ba831
Emoji: Cache data by path instead of just Etag ( #37858 )
2026-02-13 15:23:22 +00:00
Echo
f5aa5adcf7
Profile redesign: About tab ( #37851 )
2026-02-13 13:37:39 +00:00
Claire
ddc7df2064
Merge commit '6c3bd944f8890e1a349bd06e9585cb5ec25507e6' into glitch-soc/merge-upstream
2026-02-13 13:03:51 +01:00
Echo
45057d1df2
Fixes appearing in Following list ( #37854 )
2026-02-13 10:03:57 +00:00
Claire
e451416d90
Merge commit 'c44cc1f5c3bafb49a324f8f72a42a91d09eecfe3' into glitch-soc/merge-upstream
2026-02-12 18:00:45 +01:00
diondiondion
c44cc1f5c3
Implement Collection list item design ( #37850 )
2026-02-12 16:30:10 +00:00
diondiondion
e4bb347f72
Theme tokens sync ( #37841 )
2026-02-12 11:33:28 +00:00
Claire
2373c5a132
Merge commit 'ca9966ce2ff79dcac90b2feced65fa991534d53e' into glitch-soc/merge-upstream
2026-02-11 20:26:56 +01:00
diondiondion
f99c60a8f3
Add useStorageState hook ( #37825 )
2026-02-11 13:30:53 +00:00
Echo
bbd88d356d
Profile redesign: Show yourself in follower list ( #37813 )
2026-02-11 13:19:18 +00:00
Claire
4fbd1ad7ae
Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream
...
Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.
They were all manually resolved by adapting the relevant code.
2026-02-11 13:32:18 +01:00
Echo
0279a52216
Profile redesign: Account filter fixes ( #37811 )
2026-02-10 17:20:02 +00:00
Claire
d89db37e93
Merge commit 'fb89198460f9cebf624cc5ca0b139563ae4fd120' into glitch-soc/merge-upstream
2026-02-10 18:02:15 +01:00
Echo
fb89198460
Profile redesign: Quality pass ( #37766 )
2026-02-10 10:56:03 +00:00
Claire
8f58c42ca3
Merge commit '2e30044a374811bc94fd62a8159cb2c9ffe18a4d' into glitch-soc/merge-upstream
2026-02-06 22:45:55 +01:00
Echo
2e30044a37
Profile redesign: Pinned posts ( #37761 )
...
Co-authored-by: diondiondion <mail@diondiondion.com >
2026-02-06 14:53:34 +00:00
diondiondion
7e27ba990e
Move account search into hook ( #37762 )
2026-02-06 13:08:29 +00:00
Echo
7a4945c0d3
Show mute end date in badge ( #37747 )
2026-02-05 20:01:28 +00:00
Claire
3bbc8ecf92
Merge commit '8ebe2e673e2fd175140df7275eb362c8eecfec31' into glitch-soc/merge-upstream
2026-02-04 19:23:24 +01:00
diondiondion
8ebe2e673e
Split collection editor into dedicated routes ( #37731 )
2026-02-04 17:45:41 +00:00
Claire
13499168f8
Merge commit 'c48634cf5f3c5b50fcf6ea075121fa2d88e07c0e' into glitch-soc/merge-upstream
2026-02-03 15:44:04 +01:00
