Claire
9c5c86c947
Merge commit 'c93b2c6809905d24262b5973efe20832f1b04a6d' into glitch-soc/merge-upstream
2025-03-26 18:18:07 +01:00
Claire
c93b2c6809
Add new filter action to blur media ( #34256 )
2025-03-26 07:31:05 +00:00
Claire
4ace929129
Merge commit '94d71c992e0fd88fc3a3fc92b598f139c874ab3f' into glitch-soc/merge-upstream
2025-03-25 21:12:37 +01:00
Claire
745c445e7e
Merge commit 'e1dbbf6c9db6dbf3f356dae4c59fa05299372370' into glitch-soc/merge-upstream
2025-03-25 19:59:59 +01:00
Eugen Rochko
94d71c992e
Refactor alerts to TypeScript, remove react-notification dependency ( #34239 )
2025-03-25 18:25:07 +00:00
Claire
2eb6d815d6
Fix bookmarks and favourites not being filtered ( #34260 )
2025-03-25 15:20:36 +00:00
Claire
8c3eeb4d29
Fix filters not applying in detailed view ( #34259 )
2025-03-25 13:11:49 +00:00
Claire
e7498887a7
Merge commit '2e9b2df570af19b67a5ccc754c7b581034ca79c6' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
Upstream removed some code that somehow had been modified in glitch-soc.
Removed it as upstream did.
2025-03-24 20:06:25 +01:00
Eugen Rochko
2e9b2df570
Add double tap to zoom and swipe to dismiss to media modal in web UI ( #34210 )
...
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com >
2025-03-24 17:25:30 +00:00
Claire
958953a687
Refactor spoiler button logic into separate SpoilerButton component ( #34257 )
2025-03-24 13:58:37 +00:00
Claire
f1fa6b3cd0
Merge commit '1960aac90b16fce1ec620ac990aa931efcf04700' into glitch-soc/merge-upstream
2025-03-22 15:41:48 +01:00
Eugen Rochko
1960aac90b
Fix display of failed-to-load image attachments in web UI ( #34217 )
2025-03-21 10:23:49 +00:00
Claire
290d57d6d9
Prevent duplicate REST API requests on submitting account personal note with ctrl+enter ( #34213 )
2025-03-19 23:29:26 +00:00
Claire
6f2979b0b0
Merge commit '547658f086b2bfb396f69822d7ba938e4c0caf80' into glitch-soc/merge-upstream
2025-03-18 22:03:50 +01:00
Claire
9d5cbbbf0f
Fix account notes not being displayed ( #34166 )
2025-03-18 10:32:35 +00:00
Claire
d2c4f69148
Merge commit '30e334b51a4e7add05401895bff5a2ea4a97e0bd' into glitch-soc/merge-upstream
2025-03-17 20:25:32 +01:00
Claire
30e334b51a
Fix language detection sometimes kicking in *after* posting ( #34193 )
2025-03-17 16:49:09 +00:00
Claire
399fbf97de
Merge commit '420ffdfb6259740602d4ce727ed5c60432c776a5' into glitch-soc/merge-upstream
2025-03-11 18:44:32 +01:00
Claire
725a68d273
Fix unnecessary rerenders in composer dropdown menu ( #34133 )
2025-03-11 15:36:31 +00:00
Claire
4bea9a0a66
Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream
2025-03-07 18:34:27 +01:00
Claire
dbd3e05812
Merge commit 'b57687083f4af178f2e2f43665eb4e49d32a50c2' into glitch-soc/merge-upstream
2025-03-07 17:37:36 +01:00
Claire
2bf5aee469
Fix avatar fallback in media gallery ( #34106 )
2025-03-07 13:22:05 +00:00
Claire
9d5a9123b9
Merge commit 'ce23342d72a7f2ca6f8c35727c86ba54c9c365ca' into glitch-soc/merge-upstream
2025-03-07 13:15:10 +01:00
Claire
b6f3cfb302
Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream
2025-03-06 20:10:00 +01:00
renovate[bot]
d2ce9a6064
chore(deps): update eslint (non-major) ( #33061 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com >
2025-03-06 13:55:44 +00:00
Damien Erambert
debe6c0545
Add emoji from Twemoji 15.0 to the emoji picker/completion ( #33395 )
2025-03-05 17:05:15 +00:00
Claire
b57687083f
Move app/javascript/hooks to app/javascript/mastodon/hooks ( #34077 )
2025-03-05 16:55:53 +00:00
Eugen Rochko
cadda2f957
Add effective date to terms of service ( #33993 )
2025-03-05 09:01:33 +00:00
Claire
26a3081699
Fix preview cards under Content Warnings not being shown in detailed statuses ( #34068 )
2025-03-05 08:43:31 +00:00
Eugen Rochko
43f616a1c8
Fix infinite scroll not working on profile media tab in web UI ( #33860 )
2025-03-03 14:16:17 +00:00
Eugen Rochko
d399244d4d
Fix moved notice on profiles in web UI ( #34052 )
2025-03-03 08:24:06 +00:00
Eugen Rochko
d50110a17a
Change alt text reminder to not appear for private mentions in web UI ( #33784 )
2025-02-28 18:02:58 +00:00
Claire
1cdd91d6f1
Merge commit '6b519cfefa93a923b19d0f20c292c7185f8fd5f5' into glitch-soc/merge-upstream
2025-02-27 15:52:20 +01:00
Eugen Rochko
ebde60ca82
Refactor <Header> into TypeScript ( #33956 )
2025-02-25 15:30:46 +00:00
Claire
1dbeac2196
Merge commit '3b1ba46c93de63268d20104dee63374d0708deb0' into glitch-soc/merge-upstream
2025-02-04 18:38:41 +01:00
Claire
44f5f1f0a5
Fix emoji rewrite adding unnecessary curft to the DOM for most emoji ( #33818 )
2025-02-03 13:43:45 +00:00
Claire
c85616ee3a
Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/feed_manager.rb`:
Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
Added upstream's code.
- `app/models/user_settings.rb`:
Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
setting added upstream.
Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
Same.
- `app/services/precompute_feed_service.rb`:
Not a real conflict, glitch-soc has extra code for the direct feed.
Added upstream's new code for populating lists.
2025-02-01 19:07:13 +01:00
Eugen Rochko
796187c1e8
Add ability to dismiss alt text badge by tapping it in web UI ( #33737 )
2025-01-29 12:51:47 +00:00
Eugen Rochko
1e70da5e3c
Add reminder when about to post without alt text in web UI ( #33760 )
2025-01-29 11:37:56 +00:00
Claire
844ae90dad
Merge commit '2beab34ca405a0beb3ea9f5ab684779dc2eb6374' into glitch-soc/merge-upstream
2025-01-29 12:05:09 +01:00
Claire
85668becde
Change language detection debouncing behavior to refresh at least once every 1.5 seconds ( #33770 )
2025-01-29 09:26:06 +00:00
Claire
fcc5262f60
Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
Upstream tests for changing themes in there, but glitch-soc has
its own place for that.
Updated upstream's change while skipping the theme test.
2025-01-27 18:19:09 +01:00
Claire
e97335191d
Add hover cards to follow suggestions ( #33749 )
2025-01-27 16:24:41 +00:00
Eugen Rochko
956873362e
Remove system tooltip for alt text in web UI ( #33736 )
2025-01-27 08:17:59 +00:00
Eugen Rochko
52a5c8ae05
Refactor <LanguageDropdown> into TypeScript ( #33723 )
2025-01-27 08:06:33 +00:00
Claire
9a0166c3f3
Convert LanguageDropdownMenu to functional component ( #33704 )
2025-01-24 16:11:23 +00:00
Eugen Rochko
0885c31633
Add information about alt text to alt text modal in web UI ( #33702 )
2025-01-23 13:01:11 +00:00
Claire
db146046c4
Convert LanguageDropdown to a functional component ( #33701 )
2025-01-23 12:54:23 +00:00
Claire
19fa4cfcf2
Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream
2025-01-23 13:38:23 +01:00
Claire
3178acc5cb
Fix language detection taking mentions and URLs into account ( #33700 )
2025-01-23 10:25:14 +00:00