Claire
e53421b548
Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream
...
Conflicts:
- `config/settings.yml`:
Not a real conflict, upstream removed settings that are identical in glitch-soc
but textually adjacent to glitch-soc-only settings.
Removed what upstream removed.
2025-07-30 20:05:45 +02:00
Eugen Rochko
92bf55afd0
Change design of quote posts in web UI ( #35584 )
2025-07-30 15:53:42 +00:00
Claire
63af7ecb1f
Merge commit '7d3ef27a8dc8fb281bae959b245d3db63aa82260' into glitch-soc/merge-upstream
2025-07-23 18:43:56 +02:00
diondiondion
d36236cbcd
fix: Fix glitchy status keyboard navigation ( #35455 )
2025-07-23 07:39:36 +00:00
Claire
5ff0039d7b
Merge commit 'fab95b8dae3db411318638804a01675dd5b38a01' into glitch-soc/merge-upstream
2025-07-22 23:17:48 +02:00
diondiondion
3771f9e04b
fix: Fix quote posts styling on notifications page ( #35411 )
2025-07-17 17:28:30 +00:00
Claire
d6ce7de2d3
Merge commit '331599fa2b335a7b832adcab594a833f09b808f0' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/ISSUE_TEMPLATE/1.web_bug_report.yml`:
We don't use the github features that upstream does, so kept our version.
- `.github/ISSUE_TEMPLATE/2.server_bug_report.yml`:
We don't use the github features that upstream does, so kept our version.
2025-07-16 21:31:28 +02:00
diondiondion
558b9c90a6
fix: Fix selected item in poll select menus is unreadable in Firefox ( #35402 )
2025-07-16 12:03:39 +00:00
Claire
eeffe580d8
Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream
2025-07-15 18:19:32 +02:00
diondiondion
74fc4dbacf
refactor: Only remove pointer-events when necessary ( #35390 )
2025-07-15 15:57:31 +00:00
diondiondion
82a6ff091f
fix: Improve Dropdown component accessibility ( #35373 )
2025-07-15 07:52:34 +00:00
Claire
3efc857fbc
Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream
2025-07-08 16:41:01 +02:00
diondiondion
3c0767f543
fix: Remove focus highlight when status is clicked in light mode ( #35251 )
2025-07-03 07:51:12 +00:00
Claire
98e90b7c1f
Merge commit 'a203a05eb10db82e1db2d75398e0261cfe4d33e4' into glitch-soc/merge-upstream
2025-07-01 18:47:15 +02:00
diondiondion
e6e8974785
fix: Fix column header overlapping mobile menu on old Safari ( #35225 )
2025-07-01 08:53:43 +00:00
Claire
2eec4da8fc
Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream
2025-06-30 17:52:22 +02:00
diondiondion
e8a603b18f
fix: Fix popover/dialog backgrounds not blurred on older Webkit browsers ( #35220 )
2025-06-30 12:16:54 +00:00
Claire
f7b4580b49
Merge commit '0d650780e26735621f08bbdd545b162871e4562c' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a file, glitch-soc had extra files.
Took upstream's changes and moved glitch-soc's additions at the end.
2025-06-26 18:04:37 +02:00
diondiondion
c1ef1f62d5
fix: Prevent scrolling behind menus and modals in Safari iOS ( #35183 )
2025-06-25 19:22:11 +00:00
Claire
c9a1e27a49
Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
glitch-soc had extra paths under `app/javascript/flavours`, but upstream
added `app/javascript` as a whole, so updated to upstream's.
2025-06-25 19:29:09 +02:00
diondiondion
8fa32ca8ba
fix: Fix search icon overlapping text on Trending page ( #35175 )
2025-06-25 13:26:44 +00:00
diondiondion
c6dddbb66e
fix: Prevent content scrolling behind main menu (part 1) ( #35173 )
2025-06-25 12:12:49 +00:00
Emelia Smith
72f2f35bfb
Implement Instance Moderation Notes ( #31529 )
2025-06-25 08:15:44 +00:00
Claire
93bdb16817
Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
Conflict due to glitch-soc having modified specs ages ago.
The covered code is the same as upstream, though.
Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
Conflict because glitch-soc tests for an extra glitch-soc-specific
method.
Added upstream's changes while keeping the glitch-soc method.
2025-06-24 22:43:43 +02:00
diondiondion
8ba1487f30
fix: Fix inaccessible "Clear search" button ( #35152 )
2025-06-24 14:36:05 +00:00
diondiondion
644da36336
feat: More obvious loading state when submitting a post ( #35153 )
2025-06-24 14:08:48 +00:00
diondiondion
fb5b8ae0a5
fix: Improve status focus indicators ( #35150 )
2025-06-24 09:34:43 +00:00
Claire
9cb5a77c3e
Merge commit 'ac039d5f1323c46062d004896996f50549bfa38b' into glitch-soc/merge-upstream
2025-06-21 22:59:04 +02:00
diondiondion
3f743b1a07
fix: Fix SCSS lint warnings ( #35102 )
2025-06-21 08:58:12 +00:00
Claire
f8f458e5e6
Merge commit '0ec6c26af3d7dc9a0eeb5631ebb9f56b724aaa8e' into glitch-soc/merge-upstream
2025-06-20 12:01:02 +02:00
diondiondion
102a7635d6
fix: Prevent mobile navbar from overscrolling ( #35074 )
2025-06-18 11:55:16 +00:00
diondiondion
474464ffff
fix: Tweak focus style & spacing of list/hashtags expand/collapse button ( #35075 )
2025-06-17 17:54:23 +00:00
Claire
fc87ce7ca1
Merge commit '98f98249ffc3de0d020fa2ed9068b1cb82168984' into glitch-soc/merge-upstream
2025-06-17 18:56:38 +02:00
diondiondion
9d07a31380
fix: Bring back vertical borders on search input in new mobile menu (light theme) ( #35072 )
2025-06-17 13:46:07 +00:00
diondiondion
59dc0bd6f3
fix: Improve support for safe area insets ( #35065 )
2025-06-17 09:53:14 +00:00
Claire
0bb83dfe7d
Merge commit '69f298731e523f7f2e97ddd6a559dfb485d4495c' into glitch-soc/merge-upstream
2025-06-16 21:07:55 +02:00
diondiondion
69f298731e
fix: Fix glitchy iOS media attachment drag interactions ( #35057 )
2025-06-16 15:37:04 +00:00
Echo
af6ee7f230
Change color of pinned carousel to avoid confusion with PMs ( #35056 )
2025-06-16 15:32:59 +00:00
Eugen Rochko
7c4393e719
Change order of items in navigation panel in web UI ( #35029 )
2025-06-16 15:06:33 +00:00
Claire
7da6b07c75
Merge commit '71d4ce1c228bab470fa9d3bcb5a130cf53665103' into glitch-soc/merge-upstream
2025-06-13 18:07:59 +02:00
diondiondion
71d4ce1c22
fix: Ensure digits in media player time readout have a consistent width ( #35038 )
2025-06-13 15:30:40 +00:00
diondiondion
e28f86cbe5
fix: Fix glitchy video player controls in Safari ( #35034 )
2025-06-13 14:28:49 +00:00
diondiondion
672d411c2c
fix: Fix unreadable text in high-contrast-mode ( #35032 )
2025-06-13 12:58:30 +00:00
diondiondion
f92ff6d699
fix: Hide limited user info in hover card ( #35024 )
2025-06-12 16:13:17 +00:00
Claire
220b78d4a9
Merge commit '2254f47702368938bdfd0d997f2487fb2950d676' into glitch-soc/merge-upstream
2025-06-12 17:39:03 +02:00
diondiondion
2254f47702
fix: Avatars too large on notifications page ( #35023 )
2025-06-12 14:05:34 +00:00
Eugen Rochko
ccf7760205
Change viewport behaviour to cover ( #34986 )
...
Co-authored-by: diondiondion <mail@diondiondion.com >
2025-06-12 12:26:24 +00:00
Claire
86a7a1ef3b
Merge commit '3aed93711c0118ab68fa09f4d3ac2635cb3344b8' into glitch-soc/merge-upstream
2025-06-11 22:52:21 +02:00
Claire
aa6d1d4ac1
Merge commit '629bb74451242060298c6fb305c5337002379cc2' into glitch-soc/merge-upstream
2025-06-11 18:55:03 +02:00
Eugen Rochko
f53bb4cd7d
Add "More" to the sidebar menu with links to mutes, blocks, and so on ( #34987 )
2025-06-11 16:12:04 +00:00
