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
diondiondion
9896bed85f
fix: Fix direction of media gallery arrows ( #35014 )
2025-06-11 15:17:14 +00:00
diondiondion
2c828748a3
fix: Fix cramped layout of follower recommendations on small viewports ( #34967 )
2025-06-11 15:15:12 +00:00
Claire
933ee420c3
Remove some unused CSS classes ( #35012 )
2025-06-11 13:17:07 +00:00
Eugen Rochko
a13b33d851
Change navigation layout on small screens in web UI ( #34910 )
2025-06-11 11:55:43 +00:00
Eugen Rochko
1824b1fd29
Fix broken colors in some themed SVGs in web UI ( #34988 )
2025-06-10 08:36:42 +00:00
Eugen Rochko
f3d60a4a6f
Fix wrong styles on action bar in media modal in web UI ( #34989 )
2025-06-10 07:42:29 +00:00
Claire
564d74ea36
Merge commit 'd887790e86124493df850e9bc52e1e059207b523' into glitch-soc/merge-upstream
2025-06-06 18:16:52 +02:00
diondiondion
c92e21813e
fix: Fix indentation of quote posts in threads ( #34961 )
2025-06-06 12:37:56 +00:00
Claire
2085b0b53a
Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
Not a real conflict, just glitch-soc code textually adjacent to code added
upstream.
2025-06-05 18:02:40 +02:00
Claire
375add0c83
Fix account note textarea being interactable before the relationship gets fetched ( #34932 )
2025-06-05 08:49:26 +00:00
diondiondion
1dafd8c9dd
fix: Fix broken audio player layout in Safari, #34930 ( #34933 )
2025-06-04 15:34:13 +00:00
Echo
e9f197740d
Ensure carousel slides don't overflow ( #34927 )
2025-06-04 14:29:34 +00:00
Claire
088af860b3
Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream
2025-06-02 12:16:06 +02:00
Eugen Rochko
d47199dd4b
Fix not being able to scroll dropdown on touch devices in web UI ( #34873 )
2025-06-02 08:07:42 +00:00
Claire
c2989e231d
Merge commit '44d71d59efd79ee723a1dec72ec77833560c45cf' into glitch-soc/merge-upstream
2025-05-31 15:30:19 +02:00
Eugen Rochko
44d71d59ef
Add icon to header of pinned posts carousel in web UI ( #34869 )
2025-05-30 22:24:34 +00:00
Claire
c00e27aa55
Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream
2025-05-30 17:41:31 +02:00
Nicholas La Roux
0789ec93f8
Make account header profile pic exactly 2x post profile pic ( #34807 )
2025-05-30 12:33:30 +00:00
diondiondion
975db93e3f
feat: Add relationship info to hover card ( #34792 )
2025-05-30 12:32:19 +00:00
