jamesagnew
|
66bb291e04
|
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
examples/pom.xml.orig
hapi-deployable-pom/pom.xml
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseOperationOutcome.java
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/BaseServerResponseException.java
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java
hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component
hapi-fhir-structures-dev/.gitignore
hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/CustomObservation.java
hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderStructuresMojo.java
hapi-tinder-plugin/src/main/resources/vm/resource.vm
hapi-tinder-plugin/src/main/resources/vm/resource_dstu.vm
pom.xml
restful-server-example/.settings/org.eclipse.wst.common.component
restful-server-example/.settings/org.eclipse.wst.common.component.orig
src/changes/changes.xml
src/site/resources/svg/restful-server-interceptors.svg
src/site/site.xml
|
2014-11-08 10:58:35 -05:00 |
|
jamesagnew
|
5c9cf8ddf8
|
More merging cleanup
|
2014-11-08 10:38:25 -05:00 |
|
jamesagnew
|
d1fb878c55
|
Merging
|
2014-11-08 10:36:27 -05:00 |
|
James Agnew
|
ece0e83609
|
Site updates
|
2014-10-31 16:09:42 -04:00 |
|
James Agnew
|
103b1ba99f
|
Hopefully fix Windows build issue
|
2014-10-31 14:30:33 -04:00 |
|
James Agnew
|
567fd1219c
|
Fix conflict between DSTU and DEV
|
2014-10-31 10:35:12 -04:00 |
|
James Agnew
|
135ba9d9e6
|
Moving site generation into root project
|
2014-10-30 13:57:29 -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
|
d170c1e408
|
More work on DEV
|
2014-10-24 16:10:54 -04:00 |
|
James Agnew
|
c26602f0c8
|
Versions now builds completely!
|
2014-10-24 15:43:35 -04:00 |
|
James Agnew
|
084d0d3010
|
Doc updates
|
2014-10-21 13:23:25 -04:00 |
|
James Agnew
|
81ddb3f1d5
|
More versions work
|
2014-10-20 18:59:02 -04:00 |
|
James Agnew
|
b07b8b9845
|
Start adding DEV structures
|
2014-10-17 18:08:37 -04:00 |