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
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
diondiondion
46fd341685
Fix bad visibility of scroll buttons on follow-suggestions carousel ( #37843 )
2026-02-12 15:10:53 +00:00
diondiondion
e4bb347f72
Theme tokens sync ( #37841 )
2026-02-12 11:33:28 +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
Claire
d89db37e93
Merge commit 'fb89198460f9cebf624cc5ca0b139563ae4fd120' into glitch-soc/merge-upstream
2026-02-10 18:02:15 +01:00
Claire
75ba314e6b
Migrate to new theming infrastructure ( #37612 )
2026-02-10 10:59:47 +00: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
Itoh Shimon
96de28dd6f
Enable coexistence of horizontal and vertical posts ( #37204 )
2026-02-06 09:51:22 +00:00
Claire
13499168f8
Merge commit 'c48634cf5f3c5b50fcf6ea075121fa2d88e07c0e' into glitch-soc/merge-upstream
2026-02-03 15:44:04 +01:00
Echo
346ca87ee8
Profile redesign: Follow button and menu reorg ( #37707 )
2026-02-03 11:33:20 +00:00
Claire
5b926157e8
Merge commit '6188de3efc293a6327cabcb858430aa79564dfd7' into glitch-soc/merge-upstream
2026-02-02 18:26:04 +01:00
ahxxm
c6f5315aa9
Add text-autospace to status content ( #37694 )
2026-02-02 14:03:55 +00:00
Claire
b490913ad7
Merge commit 'a7a33ef6bc61cf10ef654313cfb7a45fe2b58ae3' into glitch-soc/merge-upstream
2026-01-30 18:00:16 +01:00
diondiondion
a7a33ef6bc
Adds new Checkbox and CheckboxField components ( #37665 )
2026-01-30 14:44:28 +00:00
Claire
5a45a3203a
Merge commit '7af5ba271d6f04831f000e9b815914375e42abeb' into glitch-soc/merge-upstream
2026-01-27 18:03:27 +01:00
Echo
76ab866d93
Deprecate need for revert-layer CSS ( #37632 )
2026-01-27 14:45:35 +00:00
Claire
95aaefe083
Merge commit '562ea656f495f0619e393b7d93bd07c5abd28e5a' into glitch-soc/merge-upstream
2026-01-21 22:04:02 +01:00
Echo
e79d51ce19
Profile redesign: verified badges ( #37538 )
2026-01-21 13:08:08 +00:00
Claire
7839c8d9af
Merge commit 'cc3c7ba532f75617505bb41297651a5c14f71bdd' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream simplified `theme_style_tags`. Our version is different because of
the different theming system.
Adapted upstream's changes.
- `app/views/layouts/error.html.haml`:
Theming system.
2026-01-16 23:22:19 +01:00
diondiondion
e715bb5075
Add high-contrast styles to common stylesheet ( #37523 )
2026-01-16 13:57:48 +00:00
Claire
ba45eb8764
Merge commit 'bc2f8a358f96a9540e6f39bb1c58273deb4545de' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Upstream changed how theming works, and in particular changed the set of HTML attributes.
Adapted upstream's change.
2026-01-15 18:02:35 +01:00
