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 079d681ac6f279f3a7a6be5c3734549f3be8f912 #2808

Merged
merged 20 commits into from
Aug 8, 2024
Merged

Merge upstream changes up to 079d681ac6f279f3a7a6be5c3734549f3be8f912 #2808

merged 20 commits into from
Aug 8, 2024

Commits on Aug 7, 2024

  1. Replace more font-awesome icons in navigation sidebar area (mastodo… 

    …n#30974)
    @mjankowski
    mjankowski authored Aug 7, 2024
    Configuration menu
    Copy the full SHA
    abc4ed4 View commit details
    Browse the repository at this point in the history

  2. Replace more font-awesome icons in views/settings (mastodon#30963)

    @mjankowski
    mjankowski authored Aug 7, 2024
    Configuration menu
    Copy the full SHA
    e4092cc View commit details
    Browse the repository at this point in the history

  3. Replace more font-awesome icons in app/helpers (mastodon#30962)

    @mjankowski
    mjankowski authored Aug 7, 2024
    Configuration menu
    Copy the full SHA
    52a626f View commit details
    Browse the repository at this point in the history

  4. Replace more font-awesome icons in views/admin area (mastodon#30961)

    @mjankowski
    mjankowski authored Aug 7, 2024
    Configuration menu
    Copy the full SHA
    84c3cc4 View commit details
    Browse the repository at this point in the history

  5. Add unchangeable filtered notification setting for limited accounts (m… 

    …astodon#31324)
    @ClearlyClaire
    ClearlyClaire authored Aug 7, 2024
    Configuration menu
    Copy the full SHA
    f862936 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. Add explainer for filtered notifications from limited accounts (masto… 

    …don#31331)
    @ClearlyClaire
    ClearlyClaire authored Aug 8, 2024
    Configuration menu
    Copy the full SHA
    ac9040b View commit details
    Browse the repository at this point in the history

  2. Follow up tweaking of admin UI changes part 2 (mastodon#31268)

    @vmstan
    vmstan authored Aug 8, 2024
    Configuration menu
    Copy the full SHA
    176ba98 View commit details
    Browse the repository at this point in the history

  3. Really fix duplicate border around search results (mastodon#31305)

    @valtlai
    valtlai authored Aug 8, 2024
    Configuration menu
    Copy the full SHA
    a95fe93 View commit details
    Browse the repository at this point in the history

  4. Convert PrivacyDropdownMenu to Typescript and generalize it to Dropdo… 

    …wnSelector component (mastodon#31338)
    @ClearlyClaire
    ClearlyClaire authored Aug 8, 2024
    Configuration menu
    Copy the full SHA
    2edae5e View commit details
    Browse the repository at this point in the history

  5. New Crowdin Translations (automated) (mastodon#31337) 

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

  6. Fix uninitialized grouped notifications read marker on initial load (m… 

    …astodon#31347)
    @ClearlyClaire
    ClearlyClaire authored Aug 8, 2024
    Configuration menu
    Copy the full SHA
    079d681 View commit details
    Browse the repository at this point in the history

  7. Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-s… 

    …oc/merge-upstream

Conflicts:
- `app/javascript/material-icons/400-24px/code.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/mail.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/manufacturing.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/views/admin/settings/shared/_links.html.haml`:
  Glitch-soc had extra menu items, ported the changes for them too.
- `config/navigation.rb`:
  Glitch-soc had extra menu items, ported the changes for them too.
    @ClearlyClaire
    ClearlyClaire committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    dd2a991 View commit details
    Browse the repository at this point in the history

  8. [Glitch] Add material design icons to admin/settings views 

    Port 32ead51 to glitch-soc

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

  9. [Glitch] Replace more font-awesome icons in views/admin area 

    Port 84c3cc4 to glitch-soc

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

  10. [Glitch] Add unchangeable filtered notification setting for limited a… 

    …ccounts

Port f862936 to glitch-soc

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

  11. [Glitch] Add explainer for filtered notifications from limited accounts 

    Port ac9040b to glitch-soc

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

  12. [Glitch] Follow up tweaking of admin UI changes part 2 

    Port 176ba98 to glitch-soc

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

  13. [Glitch] Really fix duplicate border around search results 

    Port a95fe93 to glitch-soc

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

  14. [Glitch] Convert PrivacyDropdownMenu to Typescript and generalize it … 

    …to DropdownSelector component

Port 2edae5e to glitch-soc

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

  15. [Glitch] Fix uninitialized grouped notifications read marker on initi… 

    …al load

Port 079d681 to glitch-soc

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