Commit Graph

372 Commits

Author SHA1 Message Date
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 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
jamesagnew cfff2006ec More work on HL7org structs 2015-04-15 07:49:18 -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
James Agnew c484425c78 Update license file generation and gitignores 2015-03-26 11:57:07 -04:00
jamesagnew 986094617a Fix #135 - Remove Eclipse and IntelliJ artifacts from version control 2015-03-26 07:56:24 -04:00
James Agnew c6f65b070a Merge pull request #121 from esteban-aliverti/hl7org-dstu2_fix
Added net.sf.saxon:saxon-he
2015-03-11 15:51:03 -04:00
esteban-aliverti a5c6091896 Added net.sf.saxon:saxon-he 2015-03-09 08:53:09 +01:00
Andrea Scarpino 7c634219e9 Add missing dependence to structures-hl7org-dstu2
saxon is used in Utilities.java
2015-03-05 11:54:07 +01:00
jamesagnew b68d07b546 Work on operation support in client 2015-03-04 08:44:31 -05:00
jamesagnew a81e081798 Work on transaction support for DSTU2 2015-03-01 18:00:06 -05:00
James Agnew db65d5db59 Work on support for new bundle format in DSTU2 2015-02-27 18:09:24 -05:00
jamesagnew 3812260a55 Fix #110 - Support DSTU2 Security Labels, merging in Pull Request from Mohammad Jafari - Merge branch 'master' of https://github.com/mochaholic/hapi-fhir into mochaholic-master
Conflicts:
	hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/UpdateConditionalTest.java
2015-02-24 07:49:31 -05:00
mochaholic 64715477bd Merged with the latest master snapshot. 2015-02-23 11:35:27 -07:00
James Agnew 0f01260301 Get extensions working for HL7.org structures 2015-02-20 17:34:13 -05:00
James Agnew dbeb6c09c6 More work on new structures 2015-02-18 17:00:47 -05:00
jamesagnew 70aa4e812d Work on build 2015-02-16 23:02:50 -05:00
jamesagnew 795041a514 More work on struct integration 2015-02-16 11:33:46 -05:00