Claire
30bb39fe54
Merge commit '8e00f7cc8fab9b447f80a27a972eef78186633ad' into glitch-soc/merge-upstream
2026-03-27 18:15:50 +01:00
diondiondion
8e00f7cc8f
Improve contrast for text-warning and text-success tokens ( #38459 )
2026-03-27 16:28:29 +00:00
diondiondion
098d698a7e
Implement new collection page design ( #38450 )
2026-03-27 15:30:06 +00:00
diondiondion
e26c6fa256
Fix styling regressions: familiar followers layout & alert action hover color ( #38438 )
2026-03-27 10:12:41 +00:00
Claire
2ac493ee8e
Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream
2026-03-26 18:23:45 +01:00
diondiondion
2124be8a81
Update collection list item design ( #38425 )
2026-03-26 14:56:36 +00:00
diondiondion
39ad873589
Fix regressions caused by rendering default translation wrapper element ( #38412 )
2026-03-26 11:16:55 +00:00
Echo
dd8602a928
Profile editing: Add notice in profile preferences ( #38404 )
2026-03-26 11:03:40 +00:00
Claire
79958d9442
Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/post_status_service.rb`:
Upstream added a line adjacent to one that had been modified due to local-only posting.
Added upstream's change.
- `tsconfig.json`:
Upstream updated Typescript and updated `tsconfig` in the process by changing paths, where
glitch-soc had extra paths. Updated as upstream did.
2026-03-25 21:36:32 +01:00
Eugen Rochko
bcf0718a9a
Add email subscriptions ( #38163 )
2026-03-25 16:25:45 +00:00
diondiondion
37236acd3b
Update web theme tokens with latest design system tokens ( #38387 )
2026-03-25 14:34:38 +00:00
Claire
3d8e40f7c9
Merge commit 'c72ca33fac1ae1518371f5954ae9487692b17709' into glitch-soc/merge-upstream
2026-03-24 17:05:53 +01:00
Echo
c7e90ee67a
Remove column header button ( #38362 )
...
Co-authored-by: diondiondion <mail@diondiondion.com >
2026-03-24 13:28:09 +00:00
Claire
291f141a02
Merge commit '1ee457f2d37c2b77a7fbce246a7c72ac9f9d3056' into glitch-soc/merge-upstream
2026-03-19 18:14:55 +01:00
Claire
1ee457f2d3
Split invite_users permission into invite_bypass_approval ( #38278 )
2026-03-19 15:25:54 +00:00
Claire
fac3080289
Merge commit 'cffa8de6267a57673b7f6264fab671153f965d23' into glitch-soc/merge-upstream
2026-03-19 12:38:31 +01:00
diondiondion
43d66959aa
Sign-up server rules: Show different icon on toggle button when description is expanded ( #38293 )
2026-03-19 10:58:59 +00:00
Claire
842bac86f6
Merge commit 'db074fc3e2b671e28a44ae379e6df1fcbdbbce53' into glitch-soc/merge-upstream
2026-03-18 18:01:57 +01:00
diondiondion
380b898d0d
Improve accessibility of server rules list in sign-up flow ( #38257 )
2026-03-18 16:08:23 +00:00
Claire
2b0531914f
Merge commit 'd52d0e4dedcc4c8ca12781681debe68f77c007e2' into glitch-soc/merge-upstream
2026-03-18 12:01:23 +01:00
Claire
3593ddff11
Merge commit 'b320c9e4c901bf99ccbca321bad2ceb2f51de140' into glitch-soc/merge-upstream
2026-03-17 18:58:19 +01:00
Claire
bd9e7d6060
Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/settings/discovery/show.html.haml`:
Glitch-soc has an extra setting textually adjacent to a line upstream has changed.
Applied upstream's change while keeping glitch-soc's setting.
2026-03-17 18:53:00 +01:00
diondiondion
11112fa9dc
Remove superfluous SCSS imports file ( #38261 )
2026-03-17 17:39:21 +00:00
Itoh Shimon
efa76ace8a
Fix vertically written textareas ( #38205 )
2026-03-17 15:43:49 +00:00
diondiondion
75c4ff35d2
Improve accessibility of sign-up progress indicator ( #38252 )
2026-03-17 12:44:40 +00:00
diondiondion
68984de5b5
Revamp heading levels in settings & admin pages ( #38230 )
2026-03-17 10:32:24 +00:00
Claire
3afb58ad18
Merge commit '89b7a3d7fb73ba79d33cab9755424b4aa2050b1b' into glitch-soc/merge-upstream
2026-03-14 11:41:24 +01:00
diondiondion
89b7a3d7fb
A11y improvements on login & settings pages ( #38188 )
2026-03-13 17:14:04 +00:00
Echo
91407ecc15
Fix incorrect SASS addition ( #38194 )
2026-03-13 14:21:39 +00:00
Claire
3833eadfbf
Merge commit 'adede83c7c9a943cf9954fe865becf6a0c2d2280' into glitch-soc/merge-upstream
2026-03-12 18:48:32 +01:00
Echo
420136e83b
Profile editing: Edit image menu ( #38156 )
...
Co-authored-by: diondiondion <mail@diondiondion.com >
2026-03-12 10:42:29 +00:00
diondiondion
13c94db9e7
Fix extra border on accounts in settings page ( #38168 )
2026-03-12 10:19:06 +00:00
Eugen Rochko
51894ac247
Change order of onboarding steps ( #38121 )
2026-03-11 21:07:31 +00:00
Claire
0a989af8c6
Merge commit '3d8d5f6dc7625d9638cc2e3387247442225d4e3f' into glitch-soc/merge-upstream
2026-03-05 18:21:07 +01:00
diondiondion
3557be5d4d
Hide account list in sensitive collections ( #38081 )
2026-03-05 15:43:57 +00:00
Claire
45b87f31ff
Merge commit 'a3aeae02885408381c7c1f3f6a0cc88799823409' into glitch-soc/merge-upstream
2026-03-03 18:12:16 +01:00
diondiondion
6e5aa00436
Anchor post navigation via hotkeys to top of viewport ( #38036 )
2026-03-03 11:02:04 +00:00
diondiondion
396d9dd12a
Allow scrolling alt text popover with keyboard & improved media focus outlines ( #38033 )
2026-03-03 10:27:46 +00:00
Claire
1b92ac0729
Merge commit '74b3b6c798d1f137947e80df8eefb7412e70febd' into glitch-soc/merge-upstream
2026-03-02 18:11:45 +01:00
diondiondion
03b2f77ad2
Collection share modal cleanup ( #38030 )
2026-03-02 16:19:13 +00:00
David Roetzel
ceaadc791e
Change cursor to make clear summary is clickable ( #38029 )
2026-03-02 15:13:56 +00:00
diondiondion
816e63d2a5
Add "skip to content", "skip to navigation" links ( #38006 )
2026-03-02 14:37:33 +00: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
diondiondion
7970eb392a
Add share dialog for collections ( #37986 )
2026-02-26 17:45:09 +00:00
Claire
3508c8b2f6
Merge commit 'ef6405ab28e02686c0c9aa69d77eb43909be5f6f' into glitch-soc/merge-upstream
2026-02-23 18:20:47 +01:00
David Roetzel
e2aecd040c
Collapse posts/collections in moderation interface ( #37929 )
2026-02-23 15:14:24 +00:00
diondiondion
f9c18ba170
Fix overly large avatars in report modal ( #37950 )
2026-02-23 12:16:54 +00: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
Claire
e451416d90
Merge commit 'c44cc1f5c3bafb49a324f8f72a42a91d09eecfe3' into glitch-soc/merge-upstream
2026-02-12 18:00:45 +01:00
