Commit Graph

24 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 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
jamesagnew 43e2cd1653 Version bump to 1.0-SNAPSHOT 2015-03-16 09:06:53 -04:00
jamesagnew 3c6febb668 Preparing for 0.9 release 2015-03-13 08:34:52 -04:00
jamesagnew 1f3991caf9 Bump version to 0.9-SNAPSHOT 2014-12-17 17:04:10 -05:00
jamesagnew 3963bb68e8 Merge remote-tracking branch 'origin/master' into hl7org_structs
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java
	hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java
2014-12-17 16:08:59 -05:00
jamesagnew 7e8f81293e Tagging and deploying 0.8 2014-12-17 14:22:10 -05:00
jamesagnew ebd0f222f4 Remove artifacts from merge 2014-12-13 13:03:38 -05:00
James Agnew 3ca9fbbebb Encoding a Binary resource without a content type set should not result
in a NullPointerException.
2014-12-03 13:46:46 -05:00
James Agnew 3d320a8fe3 Fix test yet again! 2014-10-31 15:05:21 -04:00
James Agnew ae56cf665e Skup failing test on windows 2014-10-31 15:00:26 -04:00
James Agnew 094a617644 Merge branch 'versions'
Conflicts:
	hapi-fhir-base/examples/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java
	hapi-fhir-base/testmindeps/pom.xml
	hapi-fhir-jpaserver-uhnfhirtest/pom.xml
	hapi-fhir-testpage-overlay/pom.xml
	hapi-tinder-plugin/pom.xml
	hapi-tinder-test/pom.xml
	restful-server-example-test/pom.xml
	restful-server-example/.settings/org.eclipse.wst.common.component
	restful-server-example/pom.xml
2014-10-29 15:34:59 -04:00
James Agnew 8f610d2c3a Add some tests 2014-10-29 09:04:44 -04:00
James Agnew c26602f0c8 Versions now builds completely! 2014-10-24 15:43:35 -04:00
jamesagnew 818177f70f Bunp to 0.7 for release 2014-10-23 08:12:58 -04:00
James Agnew b07b8b9845 Start adding DEV structures 2014-10-17 18:08:37 -04:00
James Agnew 751face0a6 Argh. Fix to 0.7-SNAPSHOT, not 0.6-SNAPSHOT 2014-09-30 13:16:09 -04:00
James Agnew 1feb69b545 Revert to 0.6-SNAPSHOT version 2014-09-30 11:59:38 -04:00
t106uhn 686237f970 bump to 0.8-SNAPSHOT 2014-09-26 20:50:36 -04:00
jamesagnew b316d556b7 Fix unit test 2014-09-17 09:07:01 -04:00
James Agnew cdd4b137fb Bump to 0.7-SNAPSHOT 2014-09-11 16:57:45 -04:00
James Agnew 6761e9a945 Starting to rework the oauth2 filter 2014-09-04 18:03:19 -04:00
James Agnew f9419ea910 Fix up examples 2014-09-03 18:03:44 -04:00