-
-
Notifications
You must be signed in to change notification settings - Fork 7.3k
Add a way to easily unpin profiles from the featured account area #34931
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
e04a635
to
3748872
Compare
Gargron
reviewed
Jun 4, 2025
diondiondion
approved these changes
Jun 5, 2025
sinoru
pushed a commit
to 04-6/mastodon
that referenced
this pull request
Jun 6, 2025
commit a353fea Author: Essem <smswessem@gmail.com> Date: Sun Jun 1 15:35:07 2025 -0500 Fix reaction notifications in web UI commit a194f74 Author: Essem <smswessem@gmail.com> Date: Sun May 18 13:43:06 2025 -0500 Add toot:Emoji and litepub:EmojiReact context extensions to reaction objects commit 70ff824 Author: Essem <smswessem@gmail.com> Date: Sun Mar 30 22:23:04 2025 -0500 Do not fade in emoji reactions on initial load commit 60b5dd6 Author: Essem <smswessem@gmail.com> Date: Sun Mar 30 13:52:12 2025 -0500 Migrate status reactions to react-spring commit cc710c7 Author: Essem <smswessem@gmail.com> Date: Sat Feb 8 14:22:11 2025 -0600 Group reaction notifications by default commit 171eda2 Author: Essem <smswessem@gmail.com> Date: Fri Jan 3 17:10:04 2025 -0600 Remove emoji reaction settings move migration It's now broken and pointless due to the complete removal of legacy user settings. Since this effectively predates the current reaction branch as well, there is little chance that someone running an older iteration will need to use this migration. commit 9a796f3 Author: Essem <smswessem@gmail.com> Date: Sun Dec 29 00:06:41 2024 -0600 Fix old migration commit faf23ea Author: Essem <smswessem@gmail.com> Date: Wed Dec 18 15:40:30 2024 -0600 Update status reaction emails commit 4a22db8 Author: Essem <smswessem@gmail.com> Date: Tue Nov 26 12:32:18 2024 -0600 Fix status reactions not animating on hover when logged out commit f4e52ea Author: Essem <smswessem@gmail.com> Date: Thu Nov 7 15:33:42 2024 -0600 Fix invisible reactions on detailed statuses when logged out commit 57c6de4 Author: Essem <smswessem@gmail.com> Date: Thu Oct 3 15:14:19 2024 -0500 Align mail status check with upstream commit 80020bc Author: Essem <smswessem@gmail.com> Date: Fri Sep 13 16:32:47 2024 -0500 Make addReaction and removeReaction optional props This prevents things from breaking with embeds. commit 3568a12 Author: Essem <smswessem@gmail.com> Date: Thu Aug 22 12:22:36 2024 -0500 Fix grouped reaction notification text commit 5f05c98 Author: Essem <smswessem@gmail.com> Date: Sun Aug 4 19:13:04 2024 -0500 Fix reblog reactions being hydrated improperly commit 0fedd5f Author: Essem <smswessem@gmail.com> Date: Wed Jul 24 23:10:43 2024 -0500 Fix reactions bar alignment in grouped notifications commit 7e5b67e Author: Essem <smswessem@gmail.com> Date: Thu Jul 18 21:01:46 2024 -0500 Add notification grouping for reactions commit d586713 Author: Essem <smswessem@gmail.com> Date: Tue Jun 18 14:10:37 2024 -0500 Turn custom emoji regexps into class level constants commit 953bac2 Author: Essem <smswessem@gmail.com> Date: Sun Jun 16 14:30:22 2024 -0500 Disable reactions in detailed status view when visibleReactions is 0 commit 2749470 Author: Jeremy Kescher <jeremy@kescher.at> Date: Tue May 21 00:46:17 2024 +0200 [Glitch+Emoji reactions] Use modern React context for for identity for emoji reaction code commit 702ee07 Author: Essem <smswessem@gmail.com> Date: Sat Feb 24 17:20:38 2024 -0600 Fix reaction picker dropdown appearance commit a21bd73 Author: Essem <smswessem@gmail.com> Date: Sat Feb 24 16:22:40 2024 -0600 Merge fixes commit 754c1ed Author: Essem <smswessem@gmail.com> Date: Fri Feb 9 17:42:19 2024 -0600 Hydrate reactions on streaming API commit 7ed43a4 Author: Essem <smswessem@gmail.com> Date: Wed Feb 7 17:14:16 2024 -0600 Purge status reactions on account delete commit b39a7ba Author: Essem <smswessem@gmail.com> Date: Sun Jan 28 14:51:10 2024 -0600 Fix rubocop lint issue commit 266fd45 Author: Essem <smswessem@gmail.com> Date: Wed Jan 24 17:50:58 2024 -0600 Refactor status reactions query This was done to announcement reactions in 1b0cb3b. Might as well do it here too. commit c5c0aa3 Author: Essem <smswessem@gmail.com> Date: Tue Jan 23 22:59:42 2024 -0600 Simplify reactions API controller commit 5ef6470 Author: Essem <smswessem@gmail.com> Date: Thu Jan 18 21:38:39 2024 -0600 Update reaction emails Reaction icon made by t3rminus@calamity.world commit 67b47de Author: Essem <smswessem@gmail.com> Date: Wed Jan 17 18:04:11 2024 -0600 Revert variant selector normalization Probably worth tackling later, but for now it's not worth worrying about; some other implementations (e.g. Misskey's) look to have the same behavior anyways. commit e11f8eb Author: Essem <smswessem@gmail.com> Date: Sun Jan 14 15:59:27 2024 -0600 Move reaction normalization to API controller commit c335db4 Author: Essem <smswessem@gmail.com> Date: Sun Jan 14 15:47:55 2024 -0600 Quick fixes commit 3103597 Author: Essem <smswessem@gmail.com> Date: Sat Jan 13 18:18:36 2024 -0600 Make name of like content parser function more general commit ad94a95 Author: Essem <smswessem@gmail.com> Date: Sat Jan 13 18:16:57 2024 -0600 Normalize emojis with variant selectors commit 337a12e Author: Essem <smswessem@gmail.com> Date: Tue Dec 26 14:04:53 2023 -0600 Check for content attribute in Misskey likes commit 57f5f55 Author: Essem <smswessem@gmail.com> Date: Fri Dec 22 16:09:43 2023 -0600 Fix rubocop complaint commit d494dfd Author: Essem <smswessem@gmail.com> Date: Tue Dec 19 22:15:34 2023 -0600 Add reaction notification column settings This was in a previous PR. Not quite sure how it didn't carry over. commit aa8121c Author: Essem <smswessem@gmail.com> Date: Mon Dec 18 18:27:02 2023 -0600 Linting fixes commit 72c84f1 Author: Essem <smswessem@gmail.com> Date: Sun Nov 12 20:59:36 2023 -0600 Refactor react services commit 83789e3 Author: Essem <smswessem@gmail.com> Date: Fri Nov 10 17:36:40 2023 -0600 Fix reblog reactions commit 33ce1e5 Author: Essem <smswessem@gmail.com> Date: Fri Nov 10 15:16:29 2023 -0600 Add notification emails for reactions commit c611a07 Author: Essem <smswessem@gmail.com> Date: Tue Nov 7 18:43:47 2023 -0600 Add support for emoji reactions Squashed, modified, and rebased from glitch-soc#2221. Co-authored-by: fef <owo@fef.moe> Co-authored-by: Jeremy Kescher <jeremy@kescher.at> Co-authored-by: neatchee <neatchee@gmail.com> Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com> Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com> commit ad8f984 Merge: d97910d af314a8 Author: Claire <claire.github-309c@sitedethib.com> Date: Thu Jun 5 19:34:17 2025 +0200 Merge pull request glitch-soc#3090 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes up to 520974e commit af314a8 Author: Claire <claire.github-309c@sitedethib.com> Date: Thu Jun 5 17:36:51 2025 +0200 [Glitch] Add ability to filter quote posts in home timeline Port 520974e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> commit 9a649a2 Author: Echo <ChaosExAnima@users.noreply.github.com> Date: Thu Jun 5 12:23:01 2025 +0200 [Glitch] Add a way to easily unpin profiles from the featured account area Port 1fdcaae to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> commit 802ade6 Author: Claire <claire.github-309c@sitedethib.com> Date: Thu Jun 5 10:49:26 2025 +0200 [Glitch] Fix account note textarea being interactable before the relationship gets fetched Port 375add0 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> commit 4dbbe52 Author: diondiondion <mail@diondiondion.com> Date: Wed Jun 4 17:34:13 2025 +0200 [Glitch] fix: Fix broken audio player layout in Safari Port 1dafd8c to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> commit 6bb29de Author: diondiondion <mail@diondiondion.com> Date: Wed Jun 4 16:35:29 2025 +0200 [Glitch] fix: Fix Safari volume bug Port 6637ecb to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> commit a6a35ad Author: Echo <ChaosExAnima@users.noreply.github.com> Date: Wed Jun 4 16:29:34 2025 +0200 [Glitch] Ensure carousel slides don't overflow Port e9f1977 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> commit 2085b0b Merge: d97910d 520974e Author: Claire <claire.github-309c@sitedethib.com> Date: Thu Jun 5 18:02:40 2025 +0200 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. commit 520974e Author: Claire <claire.github-309c@sitedethib.com> Date: Thu Jun 5 17:36:51 2025 +0200 Add ability to filter quote posts in home timeline (mastodon#34946) commit 3d47480 Author: Claire <claire.github-309c@sitedethib.com> Date: Thu Jun 5 15:53:57 2025 +0200 Change “legacy” non-fast-tracked quote posts to not be displayed as such (mastodon#34945) commit 09208ea Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Jun 5 15:37:43 2025 +0200 chore(deps): update yarn to v4.9.2 (mastodon#34916) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 25c4574 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Jun 5 15:37:37 2025 +0200 chore(deps): update dependency opentelemetry-instrumentation-faraday to '~> 0.27.0' (mastodon#34917) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit e2c5a2a Author: Matt Jankowski <matt@jankowski.online> Date: Thu Jun 5 09:37:33 2025 -0400 Fix `Style/FetchEnvVar` cop in `repo.rake` (mastodon#34903) Co-authored-by: Claire <claire.github-309c@sitedethib.com> commit a80f77a Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Jun 5 15:36:22 2025 +0200 fix(deps): update dependency pino-http to v10.5.0 (mastodon#34920) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 1297ad7 Author: Matt Jankowski <matt@jankowski.online> Date: Thu Jun 5 08:09:05 2025 -0400 Update rubocop to version 1.76.0 (mastodon#34926) commit 1fdcaae Author: Echo <ChaosExAnima@users.noreply.github.com> Date: Thu Jun 5 12:23:01 2025 +0200 Add a way to easily unpin profiles from the featured account area (mastodon#34931) commit 375add0 Author: Claire <claire.github-309c@sitedethib.com> Date: Thu Jun 5 10:49:26 2025 +0200 Fix account note textarea being interactable before the relationship gets fetched (mastodon#34932) commit a4bc438 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Jun 5 09:47:34 2025 +0200 chore(deps): update dependency annotaterb to v4.15.0 (mastodon#34870) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 1d152d2 Author: Matt Jankowski <matt@jankowski.online> Date: Thu Jun 5 03:08:52 2025 -0400 Replace local vars with `let` in JS-enabled system specs (mastodon#34905) commit 250c3b0 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu Jun 5 09:05:25 2025 +0200 New Crowdin Translations (automated) (mastodon#34939) Co-authored-by: GitHub Actions <noreply@github.com> commit 1dafd8c Author: diondiondion <mail@diondiondion.com> Date: Wed Jun 4 17:34:13 2025 +0200 fix: Fix broken audio player layout in Safari, mastodon#34930 (mastodon#34933) commit 6637ecb Author: diondiondion <mail@diondiondion.com> Date: Wed Jun 4 16:35:29 2025 +0200 fix: Fix Safari volume bug, mastodon#34797 (mastodon#34929) commit e9f1977 Author: Echo <ChaosExAnima@users.noreply.github.com> Date: Wed Jun 4 16:29:34 2025 +0200 Ensure carousel slides don't overflow (mastodon#34927)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
area/web interface
Related to the Mastodon web interface
javascript
Pull requests that update Javascript code
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #34924. This PR does the following:
Account
component, which is used in a few areas including followers, following, and featured.Screenshot.2025-06-04.at.16.21.21.mp4