Skip to content

Commit 1a870d6

Browse files
DariaBodDariaBod
committed
Merge branch 'develop' into fb_calculatedColumnAssistant
2 parents db3cd17 + 548b4f9 commit 1a870d6

1,048 files changed

Lines changed: 7652 additions & 646 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎buildTestModules/communityArtifacts/src/org/labkey/communityartifacts/CommunityArtifactsController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020 LabKey Corporation
2+
* Copyright (c) 2020-2026 LabKey Corporation
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎buildTestModules/communityArtifacts/src/org/labkey/communityartifacts/CommunityArtifactsManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020 LabKey Corporation
2+
* Copyright (c) 2020-2026 LabKey Corporation
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎buildTestModules/communityArtifacts/src/org/labkey/communityartifacts/view/hello.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<%
22
/*
3-
* Copyright (c) 2020 LabKey Corporation
3+
* Copyright (c) 2020-2026 LabKey Corporation
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎buildTestModules/starterArtifacts/src/org/labkey/starterartifacts/StarterArtifactsController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020 LabKey Corporation
2+
* Copyright (c) 2020-2026 LabKey Corporation
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎buildTestModules/starterArtifacts/src/org/labkey/starterartifacts/StarterArtifactsManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020 LabKey Corporation
2+
* Copyright (c) 2020-2026 LabKey Corporation
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎buildTestModules/starterArtifacts/src/org/labkey/starterartifacts/view/hello.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<%
22
/*
3-
* Copyright (c) 2020 LabKey Corporation
3+
* Copyright (c) 2020-2026 LabKey Corporation
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎data/FolderExport/SampleWithSubfolders.folder/queries/AverageTempPerParticipant.sql‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright (c) 2020-2026 LabKey Corporation
3+
*
4+
* Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
5+
*/
16
SELECT "Physical Exam".ParticipantID, ROUND(AVG("Physical Exam".Temp_C), 1) AS AverageTemp,
27
FROM "Physical Exam"
38
GROUP BY "Physical Exam".ParticipantID

‎data/FolderExport/SampleWithSubfolders.folder/queries/DemGB.sql‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright (c) 2020-2026 LabKey Corporation
3+
*
4+
* Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
5+
*/
16
SELECT COUNT(Demographics.ParticipantId) AS "Count",
27
Demographics.Gender,
38
Demographics.Country,

‎data/FolderExport/SampleWithSubfolders.folder/queries/Demo.sql‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright (c) 2020-2026 LabKey Corporation
3+
*
4+
* Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
5+
*/
16
SELECT Demographics.ParticipantId,
27
Demographics.date,
38
Demographics.StartDate,

‎data/FolderExport/SampleWithSubfolders.folder/queries/ElispotTest.sql‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright (c) 2020-2026 LabKey Corporation
3+
*
4+
* Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
5+
*/
16
SELECT ELISpotAssay.ParticipantId,
27
ELISpotAssay.SampleDescription,
38
ELISpotAssay.SpecimenID,

0 commit comments

Comments
 (0)