Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -1947,8 +1947,6 @@ experiment/src/org/labkey/experiment/DataClassWebPart.java -text
experiment/src/org/labkey/experiment/DataURLRelativizer.java -text
experiment/src/org/labkey/experiment/DefaultCustomPropertyRenderer.java -text
experiment/src/org/labkey/experiment/defaults/DefaultValueServiceImpl.java -text
experiment/src/org/labkey/experiment/DerivedSamplePropertyHelper.java -text
experiment/src/org/labkey/experiment/deriveSamplesChooseTarget.jsp -text
experiment/src/org/labkey/experiment/DotGraph.java -text
experiment/src/org/labkey/experiment/ExpDataFileListener.java -text
experiment/src/org/labkey/experiment/ExperimentAuditProvider.java -text
Expand Down Expand Up @@ -1988,7 +1986,6 @@ experiment/src/org/labkey/experiment/SampleTypeAuditProvider.java -text
experiment/src/org/labkey/experiment/SampleTypeDisplayColumn.java -text
experiment/src/org/labkey/experiment/SampleTypeWebPart.java -text
experiment/src/org/labkey/experiment/StandardAndCustomPropertiesView.java -text
experiment/src/org/labkey/experiment/summarizeMaterialInputs.jsp -text
experiment/src/org/labkey/experiment/types/begin.jsp -text
experiment/src/org/labkey/experiment/types/typeDetails.jsp -text
experiment/src/org/labkey/experiment/types/types.jsp -text
Expand Down
1 change: 0 additions & 1 deletion api/src/org/labkey/api/settings/AppProps.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ public interface AppProps
String SCOPE_OPTIONAL_FEATURE = "ExperimentalFeature"; // Startup property prefix for all optional features; "Experimental" for historical reasons.
String OPTIONAL_NO_GUESTS = "disableGuestAccount";
String EXPERIMENTAL_BLOCKER = "blockMaliciousClients";
String DEPRECATED_DERIVE_SAMPLES_NOT_IN_APP = "deriveSamplesNotInApp";
String ADMIN_PROVIDED_ALLOWED_EXTERNAL_RESOURCES = "allowedExternalResources";
String QUANTITY_COLUMN_SUFFIX_TESTING = "quantityColumnSuffixTesting";
String REJECT_CONTROLLER_FIRST_URLS = "rejectControllerFirstUrls";
Expand Down
257 changes: 0 additions & 257 deletions experiment/src/org/labkey/experiment/DerivedSamplePropertyHelper.java

This file was deleted.

7 changes: 0 additions & 7 deletions experiment/src/org/labkey/experiment/ExperimentModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -267,13 +267,6 @@ protected void init()
ExperimentService.get().registerNameExpressionType("aliquots", "exp", "MaterialSource", "aliquotnameexpression");
ExperimentService.get().registerNameExpressionType("dataclass", "exp", "DataClass", "nameexpression");

OptionalFeatureService.get().addFeatureFlag(new OptionalFeatureFlag(
AppProps.DEPRECATED_DERIVE_SAMPLES_NOT_IN_APP,
"Derive Samples in LabKey Server UI",
"Enables the UI for deriving samples in LabKey Server UI from either the samples grids or a sample lineage page. This option will be removed in LabKey Server 26.11",
false,
false,
OptionalFeatureService.FeatureType.Deprecated));
OptionalFeatureService.get().addExperimentalFeatureFlag(SAMPLE_FILES_TABLE, "Manage Unreferenced Sample Files",
"Enable 'Unreferenced Sample Files' table to view and delete sample files that are no longer referenced by samples", false);

Expand Down
Loading
Loading