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

[ENG-6025] Hotfix - API and admin aren't inheriting settings from website #10692

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

[ENG-6025] Hotfix - API and admin aren't inheriting settings from website #10692

wants to merge 7 commits into from

Commits on Jul 22, 2024

  1. Merge branch 'release/24.05.0' into develop

    @mfraezz
    mfraezz committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    1c677a0 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Merge branch 'hotfix/24.05.1' into develop

    @mfraezz
    mfraezz committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    a24ec14 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. Merge branch 'hotfix/24.05.2' into develop

    @mfraezz
    mfraezz committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    dc84403 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. fixed settings propagation

    @opaduchak
    opaduchak committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    fd18790 View commit details
    Browse the repository at this point in the history

  2. fixed admin settings using osf_settings

    @opaduchak
    opaduchak committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    0edfad1 View commit details
    Browse the repository at this point in the history

  3. fixed django assets location

    @opaduchak
    opaduchak committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    cf3f0a0 View commit details
    Browse the repository at this point in the history

  4. fixed some imports in tests

    @opaduchak
    opaduchak committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    44028a5 View commit details
    Browse the repository at this point in the history