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 0c3c06f7cc50c9207a44f56e184ce6a41f953171 #2842

Merged
merged 9 commits into from
Sep 12, 2024
Merged

Merge upstream changes up to 0c3c06f7cc50c9207a44f56e184ce6a41f953171 #2842

merged 9 commits into from
Sep 12, 2024

Commits on Sep 10, 2024

  1. Change design of hide media button in web UI (mastodon#31807)

    @Gargron
    Gargron authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    3929e3c View commit details
    Browse the repository at this point in the history

  2. Add ability to manage which websites can credit you in link previews (m… 

    …astodon#31819)
    @Gargron
    Gargron authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    e0c27a5 View commit details
    Browse the repository at this point in the history

  3. Add CustomEmoji.enabled scope (mastodon#31830)

    @mjankowski
    mjankowski authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    da07adf View commit details
    Browse the repository at this point in the history

  4. Extract method for account-referencing in CLI prune task (mastodon#31824 

    )
    @mjankowski
    mjankowski authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    c4b09d6 View commit details
    Browse the repository at this point in the history

  5. Second attempt at disabling Codecov annotations (mastodon#31841)

    @ClearlyClaire
    ClearlyClaire authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    4ffaced View commit details
    Browse the repository at this point in the history

  6. Remove vendor prefix from mobile-web-app-capable meta tag (mastodon… 

    …#31845)
    @mjankowski
    mjankowski authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    0c3c06f View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-s… 

    …oc/merge-upstream
    @ClearlyClaire
    ClearlyClaire committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    10e2b87 View commit details
    Browse the repository at this point in the history

  2. [Glitch] Change design of hide media button in web UI 

    Port 3929e3c to glitch-soc

Signed-off-by: Claire <[email protected]>
    @Gargron @ClearlyClaire
    Gargron authored and ClearlyClaire committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    abe1717 View commit details
    Browse the repository at this point in the history

  3. [Glitch] Add ability to manage which websites can credit you in link … 

    …previews

Port CSS changes from e0c27a5 to glitch-soc

Signed-off-by: Claire <[email protected]>
    @Gargron @ClearlyClaire
    Gargron authored and ClearlyClaire committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    77cbe23 View commit details
    Browse the repository at this point in the history