Skip to content

[bot] Fast-forward for 25.11.6 #7314

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

Merged
github-actions merged 3 commits into from
Jan 6, 2026
Merged

[bot] Fast-forward for 25.11.6 #7314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60d028a
Handle multiple special chars in plate based assay measure field (#7288)
labkey-tchad Dec 24, 2025
bfb0020
Add webpack protocol to ContentSecurityPolicyFilter (#7298)
labkey-martyp Dec 30, 2025
90fa6ba
Merge 25.7 to 25.11
labkey-teamcity Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/src/org/labkey/filters/ContentSecurityPolicyFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ public String getHeaderName()
static
{
// ReactJS hot reload uses localhost port 3001. If in dev mode, allow the browser to access that port for fonts
// and connections.
// and connections. Also allow webpack: protocol for source map loading by some external packages.
if (AppProps.getInstance().isDevMode())
{
registerAllowedSources("reactjs.hot.reload", Directive.Connection, "localhost:3001 ws://localhost:3001");
registerAllowedSources("reactjs.hot.reload", Directive.Connection, "localhost:3001 ws://localhost:3001 webpack:");
registerAllowedSources("reactjs.hot.reload", Directive.Font, "localhost:3001");
}
}
Expand Down
11 changes: 5 additions & 6 deletions assay/src/org/labkey/assay/plate/AssayPlateMetadataServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@
import org.labkey.api.util.logging.LogHelper;
import org.labkey.api.view.ActionURL;
import org.labkey.assay.TSVProtocolSchema;
import org.labkey.assay.plate.data.WellData;
import org.labkey.assay.plate.model.WellBean;
import org.labkey.assay.plate.query.PlateSchema;
import org.labkey.assay.plate.query.PlateTable;
Expand Down Expand Up @@ -706,13 +705,13 @@ public PlateGridInfo(PlateUtils.GridInfo info, PlateSet plateSet, Set<String> me

private @Nullable String getPrefixedValue(String annotation, String prefix)
{
if (annotation != null && annotation.trim().toLowerCase().startsWith(prefix))
if (annotation != null)
{
String[] parts = annotation.split(":");
if (parts.length > 1)
// Issue 52782: measure name may contain a colon
String[] parts = annotation.split(":", 2);
if (parts.length == 2 && parts[0].trim().equalsIgnoreCase(prefix))
{
// Issue 52782: measure name may contain a colon, so we need to join the rest of the parts
return StringUtils.join(parts, ":", 1, parts.length).trim();
return parts[1].trim();
}
}
return null;
Expand Down