1412 Commits

Author SHA1 Message Date
jamesagnew
5bcd6a4751 Don't include an mpty text element in Bundles being returned by the server 2015-04-23 08:04:05 -04:00
James Agnew
e18433d709 Trying to remove empty text node 2015-04-22 17:45:00 -04:00
James Agnew
5310d684df Add some tests 2015-04-22 17:17:52 -04:00
James Agnew
11584beb7d Bump spring back to 4.1.5 because of weird exception in 4.1.6 2015-04-22 10:33:13 -04:00
James Agnew
37ed62f863 Add advanced JPA example 2015-04-22 10:08:33 -04:00
jamesagnew
147305b70e More work on getting HL7org structs working 2015-04-22 07:46:33 -04:00
jamesagnew
b222b76611 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs
Conflicts:
	hapi-fhir-android/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java
	hapi-fhir-testpage-overlay/.gitignore
	src/changes/changes.xml
2015-04-21 13:30:58 -04:00
James Agnew
91167733c6 Don't return a Content-Location header when returning the new bundle
format
2015-04-20 17:32:20 -04:00
James Agnew
4f1d2a3c75 Merging cleanup from local branch with commit from #153 2015-04-20 15:28:20 -04:00
James Agnew
dfbfed2d35 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-04-20 14:48:18 -04:00
James Agnew
02070affbf Merge pull request #153 from mochaholic/master
Read server interceptors from the spring context.
2015-04-20 14:47:24 -04:00
James Agnew
89519faa6f Just add some unit tests 2015-04-20 12:07:52 -04:00
James Agnew
b42737262b Work on HL7org structs 2015-04-20 07:31:45 -04:00
James Agnew
eddcf5f4d8 Merge branch 'hl7org_structs' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-04-15 16:37:35 -04:00
James Agnew
3db46c2db2 More work on hl7org strfucts 2015-04-15 16:37:24 -04:00
b.debeaubien
addcad7749 #157 - removed published from the xml embedded into tests 2015-04-15 11:25:58 -04:00
b.debeaubien
de1effbf52 #157 - removed published from dstu1 bundle, as it should only be present for bundleEntry 2015-04-15 11:10:08 -04:00
James Agnew
41c215efe2 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-04-15 10:57:43 -04:00
James Agnew
ddd68b8d57 Credit for #155 2015-04-15 10:57:15 -04:00
James Agnew
7f7ff5c936 Merge pull request #155 from wdebeau1/master
#154 - FhirTerser now uses the complete path to a resource when creating...
2015-04-15 10:48:52 -04:00
jamesagnew
1008f02988 Merge branch 'hl7org_structs' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-04-15 07:49:37 -04:00
jamesagnew
cfff2006ec More work on HL7org structs 2015-04-15 07:49:18 -04:00
James Agnew
4c82e1f87b Merge branch 'hl7org_structs' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-04-14 11:59:53 -04:00
James Agnew
93de15b83a More work on HL7org structs 2015-04-14 11:58:08 -04:00
jamesagnew
2edc7eadab Work on HL7.org structs 2015-04-13 08:32:49 -04:00
James Agnew
c5e75ebe60 Work 2015-04-10 18:14:42 -04:00
jamesagnew
b6f2b57ed9 Work on HL7 structs 2015-04-10 08:02:05 -04:00
jamesagnew
8c873ef023 Remove hard coded persistence context name 2015-04-09 21:44:18 -04:00
b.debeaubien
6918bb6b4b #154 - FhirTerser now uses the complete path to a resource when creating ResourceReferenceInfo entries 2015-04-09 14:06:14 -04:00
mochaholic
3003b5e17b Update to the latest upstream. 2015-04-09 07:25:09 -06:00
mochaholic
e4b5943314 Merge remote-tracking branch 'origin/master'
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
2015-04-09 07:24:40 -06:00
jamesagnew
1f51c69126 Fix #139 - ContactPointDt fields don't index in JPA module 2015-04-05 16:18:14 -04:00
jamesagnew
1ec742350a Fix site example 2015-04-05 14:56:57 -04:00
jamesagnew
11507ef97c Fix #148 - Add _count support to everything operation 2015-04-05 14:53:15 -04:00
jamesagnew
8c37973a78 Fix #147 - no duplicates in 'everything' operation 2015-04-04 23:36:04 -04:00
jamesagnew
461fdb50ce Fix #143 and fix #146 - Issues with resource references for non contained resources when parsing a DSTU2 bundle, and issues encoding contained resources when encoding JSON 2015-04-03 15:42:02 -04:00
jamesagnew
18d45e7cc8 Remove file from VCS 2015-04-02 15:02:06 -04:00
jamesagnew
4054aa781a Fix unit test 2015-04-02 15:01:25 -04:00
James Agnew
67a88a003f Doc on #138 2015-04-02 13:17:48 -04:00
James Agnew
29140691d1 Add a bit of documentation to note the inclusion of #138 2015-04-02 13:06:17 -04:00
James Agnew
94af375e4d Fix #116 - Preserve _include links across pages 2015-04-02 12:49:45 -04:00
James Agnew
317251ca4d Add servlet-api classes to android build 2015-04-02 12:26:26 -04:00
James Agnew
f2322064f3 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-04-02 11:38:08 -04:00
James Agnew
1bdd2daa8e One last synchronization to DSTU2 2015-04-02 11:37:40 -04:00
jamesagnew
0ca1b9feab Add unit tests for #144 2015-04-01 22:47:30 -04:00
jamesagnew
e63323ca5c Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-04-01 21:46:49 -04:00
James Agnew
065b87c31e Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-04-01 16:29:04 -04:00
James Agnew
25a9c254e3 Sync to DSTU2 again 2015-04-01 16:03:54 -04:00
b.debeaubien
243b9a71a4 #138 - rewrote to always use super's address base, then fixup the host name and protocol 2015-03-31 12:53:40 -04:00
b.debeaubien
d111d19071 #138 - if x-forwarded-proto is set, use that 2015-03-30 17:23:50 -04:00