honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ng_20201218_survivorship_poc

This commit is contained in:
Nick 2021-01-07 11:15:54 -05:00
parent 19341a17b7 128d384153
commit ebefb141f3
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_3_0/2273-correct-js-library-path-in-testpage.yaml Normal file
View File

@ -0,0 +1,5 @@
---
type: fix
issue: 2273
title: "An incorrect HTML resource path led to a utility JavaScript library failing to load in the
TestPage Overlay module. Thanks to Alejandro Medina for the pull request!"

4
hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/tmpl-head.html
View File

@ -31,8 +31,8 @@
<script th:src="@{/resources/moment/min/moment-with-locales.min.js}"></script>
<link th:href="@{/resources/Eonasdan-bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css}" rel="stylesheet" />
<script th:src="@{/resources/Eonasdan-bootstrap-datetimepicker/js/bootstrap-datetimepicker.js}"></script>
<link th:href="@{/resources/select2/css/select2.css}" rel="stylesheet"/>
<script th:src="@{/resources/select2/js/select2.min.js}"></script>
<link th:href="@{/resources/select2/dist/css/select2.css}" rel="stylesheet"/>
<script th:src="@{/resources/select2/dist/js/select2.min.js}"></script>
<script src="js/RestfulTester.js" type="text/javascript"></script>

4
pom.xml
View File

@ -693,6 +693,10 @@
<id>vladonemo</id>
<name>Vladimir Nemergut</name>
</developer>
<developer>
<id>janol77</id>
<name>Alejandro Medina</name>
</developer>
</developers>
<licenses>