Claire
8941f1f98c
Merge commit '06d64519da4c6fc50536744f0d950dae22c6e2b9' into glitch-soc/merge-4.6
2026-07-02 18:31:59 +02:00
diondiondion
9bd073bf0b
Fix duplicate "clear" button shown in main search input in Chrome ( #39679 )
2026-07-02 14:14:43 +02:00
Thomas Pike
a45af2e1a4
Fix encryption warning "read more" link ( #39635 )
2026-07-02 14:14:43 +02:00
Claire
6aca68e185
Merge commit 'e2b7096bd3f93afcf4d6b3e7ffb9ccdb417a9def' into glitch-soc/merge-4.6
2026-06-16 21:49:17 +02:00
Echo
6cf9be9880
Emoji: Add back to state ( #39402 )
2026-06-15 17:01:10 +02:00
Claire
08027edb10
Merge commit 'b902c825054b953599cd0341acf428332fca5044' into glitch-soc/merge-upstream
2026-06-12 18:37:02 +02:00
Eugen Rochko
9910018b0d
Fix poll options being below uploads in compose form in web UI ( #39388 )
2026-06-12 05:59:36 +00:00
Claire
bbbbb24dbd
Merge commit '96e23af89258068d05cc8557df914b4a9add385b' into glitch-soc/merge-upstream
2026-06-11 13:26:25 +02:00
diondiondion
782ceb3795
Auto-focus mobile composer ( #39360 )
2026-06-11 08:15:40 +00:00
Claire
89c2ac444f
Merge commit '9e0a3aaf08e7d4fc700f7f19d61f5f8fee346b6a' into glitch-soc/merge-upstream
2026-06-10 18:52:58 +02:00
Eugen Rochko
1bbe3872f2
Change validation to permit polls and media being combined ( #39203 )
2026-06-10 15:20:21 +00:00
matrix07012
f2094164c4
Fix being unable to unmark media as sensitive when "always mark media as sensitive" is enabled ( #39339 )
2026-06-10 09:27:38 +00:00
Claire
83e77e88ae
Merge commit '9215e1ec53dcf3714080c84af7af070bcb8d9978' into glitch-soc/merge-upstream
2026-05-27 20:04:47 +02:00
Echo
d229157f19
Collections: Handle URLs in search ( #39182 )
2026-05-27 13:13:38 +00:00
Claire
06176deee2
Merge commit 'd20d04922672ed016029c40ed64798f341ebca91' into glitch-soc/merge-upstream
2026-05-26 20:48:49 +02:00
Eugen Rochko
f6d1795da5
Fix some server-side limits not being respected in web UI ( #39163 )
2026-05-26 11:51:25 +00:00
diondiondion
e1aa4e3a8c
Accessibility: Add landmark regions to Web UI ( #39133 )
2026-05-26 10:22:22 +00:00
Claire
487c814eb9
Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Glitch-soc allows a wider range of HTML than upstream.
Upstream added `:all => %w(lang)`, which was not supported by glitch-soc,
added it there too.
2026-05-22 19:43:42 +02:00
zunda
fd4a9c25dd
Honor configuration.statuses.max_characters from /api/v2/instance ( #39138 )
2026-05-22 09:21:29 +00:00
diondiondion
e68c1c824a
Accessibility: Add visible focus outlines to main search & composer fields ( #39111 )
2026-05-21 06:41:34 +00:00
Claire
aaf06a8186
Merge commit '6f8558a6b96041541d911439421563c1e9e7b3f4' into glitch-soc/merge-upstream
2026-05-20 11:31:39 +02:00
Claire
f28715d370
Fix custom emoji selection ( #39088 )
2026-05-20 07:23:29 +00:00
Claire
99f0a03dec
Merge commit 'b2aa476abbe82e2b49d84c9fb8ef654f95391fd3' into glitch-soc/merge-upstream
2026-05-07 18:26:17 +02:00
Echo
d0c8eb2f1b
Swap from React Helmet to Unhead ( #38896 )
2026-05-07 09:09:27 +00:00
Claire
44394878a4
Merge commit 'c6facd27ed191177afb003640b8ee7d0742c7f63' into glitch-soc/merge-upstream
2026-04-30 19:00:48 +02:00
Echo
5d9796afb2
Remove custom emojis from Redux ( #38825 )
2026-04-28 13:49:10 +00:00
Claire
2ac493ee8e
Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream
2026-03-26 18:23:45 +01:00
diondiondion
39ad873589
Fix regressions caused by rendering default translation wrapper element ( #38412 )
2026-03-26 11:16:55 +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
Echo
1820a03622
Refactor: Update FormatJS ( #38388 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-25 14:38:35 +00:00
Claire
753e4bee8d
Merge commit 'a70079968c55891e387b1c1e524bb314b9dfb033' into glitch-soc/merge-upstream
2026-03-04 18:40:39 +01:00
Echo
3fbb7424fa
Emoji text input and character counter components ( #38052 )
2026-03-04 16:13:45 +00:00
Claire
8b95254883
Merge commit 'c36db57acedf0033c090748125c665a0360cd11f' into glitch-soc/merge-upstream
2026-01-23 17:57:20 +01:00
Echo
42b2fdb0ac
Re-download Material Icons ( #37571 )
2026-01-22 12:04:15 +00:00
Claire
b1d219afd0
Merge commit '82fb2596c70a18fc4a2d99ab51106180196bfe98' into glitch-soc/merge-upstream
2026-01-05 18:19:58 +01:00
Claire
e8a49bd6ae
Fix outdated link target for “locked” warning ( #37366 )
2026-01-05 10:35:23 +00:00
Claire
84feffd6e6
Merge commit '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream added a method right next to glitch-soc-only methods.
Added upstream's method.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream changed a line right next to a glitch-soc addition.
Changed the code as upstream did.
2025-12-17 18:27:14 +01:00
diondiondion
c4a760d6ba
Improve search menu keyboard navigation ( #37255 )
2025-12-17 14:42:07 +00:00
Claire
1fdb48c668
Merge commit 'cbe135210305c0ce4455130c4e75680e53ff1425' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
Conflict caused by glitch-soc's theming system.
Updated upstream changes.
2025-12-15 20:22:20 +01:00
diondiondion
a9e228361c
Fix badly visible focus outlines in composer ( #37250 )
2025-12-15 12:39:04 +00:00
Claire
44e6abe48b
Merge commit '0004ed4c8021ebd400d32eb32a5e479ebd7bcf91' into glitch-soc/merge-upstream
2025-11-30 16:40:18 +01:00
diondiondion
8c772028ac
Replace most unsafe React lifecycle methods ( #36970 )
2025-11-25 13:49:45 +00:00
Claire
652ed7ab50
Merge commit '585545d0d5678a6ea4b958af4a3bc6593134d0f6' into glitch-soc/merge-upstream
2025-11-21 19:33:14 +01:00
diondiondion
8a235dd187
Refactor PrivacyDropdown to TypeScript ( #36979 )
2025-11-21 13:33:27 +00:00
Claire
7a56972381
Merge commit '366856f3bcdc2ff008b04e493a5de317ab83d5d0' into glitch-soc/merge-upstream
2025-11-19 21:49:09 +01:00
Claire
a4fd9b704a
Merge commit '284b46fee7ad682b52c99d0455a1134e1d4e3fc3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream added an experimental feature flag to try out theme refactors.
Glitch-soc's theming system is too different, so skips the new feature flag.
- `stylelint.config.js`:
Ditto.
2025-11-19 21:34:53 +01:00
Claire
c820c66d3c
Change private quote education modal to not show up on self-quotes ( #36926 )
2025-11-18 16:17:26 +00:00
diondiondion
284b46fee7
Implement CSS theme tokens behind feature flag ( #36861 )
2025-11-17 09:44:55 +00:00
Claire
e0d7230f97
Merge commit 'c87b05282909383353a9561e97b9f18a2db0766d' into glitch-soc/merge-upstream
2025-11-14 18:19:00 +01:00
Claire
c87b052829
Fix inability to paste links ( #36896 )
2025-11-14 16:44:08 +00:00
