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 9d0bce40724eb77b7cc3917091b62e4ab159e29e #2777

Merged
merged 9 commits into from
Jul 15, 2024
Merged

Merge upstream changes up to 9d0bce40724eb77b7cc3917091b62e4ab159e29e #2777

merged 9 commits into from
Jul 15, 2024

Commits on Jul 15, 2024

  1. Add i18n strings for instance favicon and logo settings label (mastod… 

    …on#31016)
    @mgmn
    mgmn authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    d61b536 View commit details
    Browse the repository at this point in the history

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

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

  3. Add optional filtered attribute to notification entities in REST API ( 

    mastodon#31011)
    @ClearlyClaire
    ClearlyClaire authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    1dd8262 View commit details
    Browse the repository at this point in the history

  4. Add assertion about key columns to account key generate spec (mastodo… 

    …n#30635)
    @mjankowski
    mjankowski authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    91ef4a6 View commit details
    Browse the repository at this point in the history

  5. Clean up theme_helper style builders (mastodon#30617)

    @mjankowski
    mjankowski authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    543b59f View commit details
    Browse the repository at this point in the history

  6. fix(deps): update dependency @babel/core to v7.24.9 (mastodon#31029) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    0b97ec3 View commit details
    Browse the repository at this point in the history

  7. Move filtered notifications bar in scrollable area (mastodon#30996) 

    Co-authored-by: Claire <claire.github-309c@sitedethib.com>
    @oneiros @ClearlyClaire
    oneiros and ClearlyClaire authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    9d0bce4 View commit details
    Browse the repository at this point in the history

  8. Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-s… 

    …oc/merge-upstream

Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because upstream refactored theme-related code, and glitch-soc has
  a different theming system.
    @ClearlyClaire
    ClearlyClaire committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    64b2c71 View commit details
    Browse the repository at this point in the history

  9. [Glitch] Move filtered notifications bar in scrollable area 

    Port 9d0bce4 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
    @oneiros @ClearlyClaire
    oneiros and ClearlyClaire committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    70969ac View commit details
    Browse the repository at this point in the history