Skip to content

Commit 1f52338

Browse files
labkey-martyplabkey-martyp
committed
Merge branch 'develop' into fb_ehr_an_hist_id_search
2 parents 54a3ee9 + 98e4984 commit 1f52338

62 files changed

Lines changed: 342 additions & 474 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.

‎EHR_App/module.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
Description: A ReactJS + EHR demo module
12
ModuleClass: org.labkey.ehr_app.EHR_AppModule
23
ManageVersion: true

‎EHR_App/src/org/labkey/ehr_app/EHR_AppModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public String getName()
5353
@Override
5454
public @Nullable Double getSchemaVersion()
5555
{
56-
return 25.000;
56+
return 26.000;
5757
}
5858

5959
@Override

‎EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.20-12.30.sql‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.30-12.31.sql‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.31-12.32.sql‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.32-12.33.sql‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.33-12.34.sql‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.34-12.35.sql‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.35-12.36.sql‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.36-12.37.sql‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)