Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merge upstream changes up to 670e4655d13975e0597bd1c74ebeeeeffc4edc37 #2807

Merged
merged 7 commits into from
Aug 7, 2024
Merged

Merge upstream changes up to 670e4655d13975e0597bd1c74ebeeeeffc4edc37 #2807

merged 7 commits into from
Aug 7, 2024

Commits on Aug 7, 2024

  1. Fix logic of block/mute bypass for mentions from moderators (mastodon… 

    …#31271)
    @ClearlyClaire
    ClearlyClaire committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    719cabe View commit details
    Browse the repository at this point in the history

  2. New Crowdin Translations (automated) (mastodon#31321) 

    Co-authored-by: GitHub Actions <noreply@github.com>
    @github-actions @web-flow
    github-actions[bot] and web-flow committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    fc964c9 View commit details
    Browse the repository at this point in the history

  3. Change notification requests to only count mentions (mastodon#31322)

    @ClearlyClaire
    ClearlyClaire committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    af2aec1 View commit details
    Browse the repository at this point in the history

  4. Change group notifications unread markers to only be cleared when foc… 

    …using/navigating again (mastodon#31325)
    @ClearlyClaire
    ClearlyClaire committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    6f285bb View commit details
    Browse the repository at this point in the history

  5. Change dismissing a notification to clear existing filtered notificat… 

    …ions for that account (mastodon#31329)
    @ClearlyClaire
    ClearlyClaire committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    670e465 View commit details
    Browse the repository at this point in the history

  6. Merge commit '670e4655d13975e0597bd1c74ebeeeeffc4edc37' into glitch-s… 

    …oc/merge-upstream
    @ClearlyClaire
    ClearlyClaire committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    06e034d View commit details
    Browse the repository at this point in the history

  7. [Glitch] Change group notifications unread markers to only be cleared… 

    … when focusing/navigating again

Port 6f285bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
    @ClearlyClaire
    ClearlyClaire committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    56b2801 View commit details
    Browse the repository at this point in the history