Commit Graph

7 Commits

Author SHA1 Message Date
James Agnew
0f88181943 Merge branch 'master' into more_properties 2019-03-15 11:30:37 -04:00
James Agnew
18ead60ef0 Add support for websocket subscriptions 2019-03-14 17:34:15 -04:00
Sean McIlvenna
b13bf8cf10 Merge branch 'master' of https://github.com/hapifhir/hapi-fhir-jpaserver-starter into more_properties
# Conflicts:
#	src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
2019-02-13 11:39:15 -08:00
Xiaocheng Luan
ca308fac2c Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
	src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java
2019-02-13 12:36:48 -05:00
Sean McIlvenna
269dd77351 Setting properties for ModelConfig in addition to DaoConfig
Setting properties for handling Email via the emailSender() bean
2019-02-12 14:08:07 -08:00
Sean McIlvenna
0bf713a60d Merge branch 'master' into more_properties
# Conflicts:
#	src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java
#	src/main/resources/hapi.properties
2019-02-11 11:57:32 -08:00
James Agnew
c604d8be53 Improve multiversion support 2019-02-11 08:59:37 -05:00