Claire
72affd6b45
Merge commit 'a863e68d174b176dc350d8e3472c010cd37b7807' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends/statuses.rb`:
Conflict because of glitch-soc's setting to allow CWs in trends.
Kept glitch-soc's setting but followed upstream's refactor.
- `docker-compose.yml`:
Conflict because of upstream VS glitch-soc repos.
Updated version number as upstream did, but kept glitch-soc repos.
2025-07-24 18:10:38 +02:00
Echo
dfaca794bf
Force modern emoji experimental to be dev mode only ( #35505 )
2025-07-24 14:55:00 +00:00
Mayank
8baed8b90e
remove redundant title text from media modal images in web UI ( #35468 )
2025-07-24 08:58:22 +00:00
Echo
7f9ad7eabf
Enables cross-origin Web Workers ( #35483 )
2025-07-24 07:14:27 +00:00
Claire
a6794c066d
Fix “Expand this post” link including user @undefined ( #35478 )
2025-07-23 23:09:24 +00:00
Claire
63af7ecb1f
Merge commit '7d3ef27a8dc8fb281bae959b245d3db63aa82260' into glitch-soc/merge-upstream
2025-07-23 18:43:56 +02:00
Echo
7d3ef27a8d
Fix accidentally instantiating Web Worker ( #35473 )
2025-07-23 14:01:45 +00:00
Eugen Rochko
14a781fa24
Add button to load new replies in web UI ( #35210 )
2025-07-23 13:42:07 +00:00
Claire
45d79427c4
Merge commit '0af2c4829ff86cf84ed9e7804d023f31e805542b' into glitch-soc/merge-upstream
...
Conflicts:
- `vite.config.mts`:
Conflict because of differently-named theme plugins.
Updated to go with upstream's changes.
2025-07-23 12:08:59 +02:00
Claire
5ff0039d7b
Merge commit 'fab95b8dae3db411318638804a01675dd5b38a01' into glitch-soc/merge-upstream
2025-07-22 23:17:48 +02:00
Echo
760d00b7f7
Emoji Rendering ( #35424 )
2025-07-22 14:43:15 +00:00
Claire
4bc361546e
Merge commit '19626ad89f66a32a3ddecb4f43a7b84e3236d287' into glitch-soc/merge-upstream
2025-07-21 21:19:53 +02:00
diondiondion
ee21f72211
fix: Don't submit post when pressing Enter in CW field ( #35445 )
2025-07-21 15:57:20 +00:00
diondiondion
4de5cbd6f5
refactor: Replace react-hotkeys with custom hook ( #35425 )
2025-07-21 14:43:38 +00:00
diondiondion
a842b14c84
refactor: Disable useDrag hook when main menu is not openable ( #35414 )
2025-07-17 12:39:40 +00:00
diondiondion
138746bdcc
fix: Add lang attribute to current composer language in alt text modal ( #35412 )
2025-07-17 11:12:54 +00:00
diondiondion
faffb73cbd
fix: Improve a11y of custom select menus in notifications settings ( #35403 )
2025-07-17 08:56:00 +00:00
Claire
eeffe580d8
Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream
2025-07-15 18:19:32 +02:00
diondiondion
82a6ff091f
fix: Improve Dropdown component accessibility ( #35373 )
2025-07-15 07:52:34 +00:00
Claire
1716f8da71
Merge commit '3b52dca4057560c58b260433722d91650fcd5040' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream added a `features` attribute where glitch-soc had extra ones.
Added `features` like upstream did.
2025-07-11 18:53:47 +02:00
Echo
853a0c466e
Make bio hashtags open the local page instead of the remote instance ( #35349 )
2025-07-11 15:18:34 +00:00
Claire
e2a867507c
Merge commit 'e9170e2de1d75e02f04ad39f2af131c70189fb50' into glitch-soc/merge-upstream
2025-07-10 01:10:32 +02:00
Claire
e7c5c25de8
Fix replying from media modal or pop-in-player tagging user @undefined ( #35317 )
2025-07-09 12:13:51 +00:00
Echo
a1e8813522
Emoji Indexing and Search ( #35253 )
2025-07-09 09:55:41 +00:00
Claire
3efc857fbc
Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream
2025-07-08 16:41:01 +02:00
diondiondion
b5eebd4d2b
fix: Fix can't skip search field by tabbing ( #35281 )
2025-07-07 15:10:51 +00:00
Echo
52bc2f64f4
Import Emojibase data ( #35229 )
2025-07-02 08:58:39 +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
9576434d47
fix: Fix outdated icon in notifications permissions banner ( #35193 )
2025-06-26 13:25:12 +00:00
diondiondion
b804ed0cba
refactor: Tweak wording of "discard draft?" confirmation dialogs ( #35192 )
2025-06-26 13:03:24 +00: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
c6dddbb66e
fix: Prevent content scrolling behind main menu (part 1) ( #35173 )
2025-06-25 12:12:49 +00:00
Echo
c52848b444
Storybook Helpers ( #35158 )
2025-06-25 11:20:11 +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
Claire
d8b0beb70d
Merge commit 'b9b1500fc516ea31ab21441737c600f9b571a07d' into glitch-soc/merge-upstream
2025-06-24 21:44:33 +02:00
Claire
9fccf0a8c6
Merge commit '6166e616389b051039dc76635048e2519271832a' into glitch-soc/merge-upstream
2025-06-24 20:45:46 +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
b9b1500fc5
fix: Update hashtags when (un)following a hashtag ( #35101 )
2025-06-23 11:44:59 +00:00
diondiondion
d28a4428b5
refactor: Use new main menu as "Getting started" column in Advanced Web UI ( #35117 )
2025-06-23 09:59:47 +00:00
diondiondion
6166e61638
fix: Keep user on Compose page when changing screen size, #34937 ( #35105 )
2025-06-23 09:53:21 +00:00
Claire
fc87ce7ca1
Merge commit '98f98249ffc3de0d020fa2ed9068b1cb82168984' into glitch-soc/merge-upstream
2025-06-17 18:56:38 +02:00
Claire
af157939d9
Fix sidebar rest position on mobile layout on RTL locales ( #35067 )
...
Co-authored-by: diondiondion <mail@diondiondion.com>
2025-06-17 14:41:51 +00:00
Claire
0bb83dfe7d
Merge commit '69f298731e523f7f2e97ddd6a559dfb485d4495c' into glitch-soc/merge-upstream
2025-06-16 21:07:55 +02:00
Claire
2c751a6a19
Merge commit 'c644413f8a068490ddb8038441e5b59112e8294e' into glitch-soc/merge-upstream
2025-06-16 20:08:52 +02:00
diondiondion
69f298731e
fix: Fix glitchy iOS media attachment drag interactions ( #35057 )
2025-06-16 15:37:04 +00:00
Eugen Rochko
7c4393e719
Change order of items in navigation panel in web UI ( #35029 )
2025-06-16 15:06:33 +00:00
diondiondion
ad32834ccd
fix: Fix zoomed images blurry in Safari ( #35052 )
2025-06-16 10:37:41 +00:00
Claire
220b78d4a9
Merge commit '2254f47702368938bdfd0d997f2487fb2950d676' into glitch-soc/merge-upstream
2025-06-12 17:39:03 +02:00
