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

[bot] Merge 24.1 to develop (Conflicts) #5137

Merged
merged 7 commits into from
Jan 17, 2024
Merged

[bot] Merge 24.1 to develop (Conflicts) #5137

merged 7 commits into from
Jan 17, 2024

Commits on Jan 11, 2024

  1. consistency between jackson/org.json.JSONObject/PageFlowUtil (#5117)

    @labkey-matthewb
    labkey-matthewb authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    fb5fcfe View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. Add nonce to tracking script template (#5122)

    @labkey-tchad
    labkey-tchad authored Jan 12, 2024
    Configuration menu
    Copy the full SHA
    21aff3f View commit details
    Browse the repository at this point in the history

  2. Merge 23.3 to 23.7

    @labkey-teamcity
    labkey-teamcity committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    d4a74e9 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. Merge 23.7 to 23.11

    @labkey-teamcity
    labkey-teamcity committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    bdb4167 View commit details
    Browse the repository at this point in the history

  2. Backport latest participant group related updates to 24.1 (#5133) 

    * [Dataspace] - FR 48359: Active Filters - Update category label (#5087)
* [Dataspace] - FR 48359: Curated groups and plots improvements - Active Filters - Add null check (#5115)
    @labkey-bpatel
    labkey-bpatel authored Jan 15, 2024
    Configuration menu
    Copy the full SHA
    842f900 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. Merge 23.11 to 24.1

    @labkey-teamcity
    labkey-teamcity committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    8c100c7 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Merge 24.1 to develop 

    # Conflicts:
#	api/src/org/labkey/api/util/PageFlowUtil.java
    @cnathe
    cnathe committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    563ae85 View commit details
    Browse the repository at this point in the history