honeymoose/hapi-fhir
1
0
Fork 0
mirror of https://github.com/hapifhir/hapi-fhir.git synced 2025-02-08 22:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,661 Commits 706 Branches 131 Tags
Commit Graph

361 Commits

Author SHA1 Message Date
James Agnew
34d3695c6c Branch now builds successfully 2014-12-18 13:40:31 -05:00
jamesagnew
a044eb51d7 Working on binary resources in DEV 2014-12-18 08:21:07 -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
James Agnew
2d5293c2ef Merge pull request #63 from wdebeau1/master 
Fix for #59
 2014-12-17 12:25:07 -05:00
James Agnew
8e6bb6333f Unit tests 2014-12-16 16:27:00 -05:00
b.debeaubien
2d680b1c33 #59 - Even more sorting out profile vs id problem 2014-12-16 15:09:55 -05:00
James Agnew
35b5f90318 Merge remote-tracking branch 'origin/master' into hl7org_structs 
Conflicts:
	hapi-fhir-structures-hl7org-dev/.gitignore
 2014-12-16 11:32:58 -05:00
b.debeaubien
d0db838f45 #59 - More sorting out profile vs id problem 2014-12-16 09:25:12 -05:00
jamesagnew
cdfebefa67 Work on #61 - Update resource definitions to latest from DSTU1 and DEV SVN 2014-12-16 08:05:38 -05:00
James Agnew
551ffb43b4 More work on DEV operations 2014-12-15 17:41:24 -05:00
James Agnew
2f7cbeb348 Merge branch 'hl7org_v08' of github.com:jamesagnew/hapi-fhir into hl7org_structs 
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
	hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java
 2014-12-11 16:07:00 -05:00
James Agnew
c4c26e482f Fix a compile issue reported by Bill de Beaubien 2014-12-10 10:17:33 -05:00
jamesagnew
23de3c53b7 Merge branch 'issue50' 
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BaseDateTimeDt.java
 2014-11-17 14:41:27 -05:00
lmds1
df2011388c cleanup unintentional changes 2014-11-13 18:43:14 -05:00
lmds1
08ffa55774 tidied up whitespace and imports 2014-11-13 18:40:59 -05:00
lmds1
039e5655a8 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 
Conflicts:
	hapi-tinder-plugin/src/main/resources/vm/resource.vm
	hapi-tinder-plugin/src/main/resources/vm/resource_dstu.vm
 2014-11-10 18:17:29 -05:00
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
d22a35788f Implement handleException on the server interceptor framework, as well 
as some site and documentation enhancements
 2014-11-07 14:26:59 -05:00
lmds1
b227d9ff99 changed iResource to return a String resourcename instead of an enum (to be used for auditing), moved audit classes from base to dstu so they can access dstu classes, updated templates to add new method to generated resources 2014-11-04 17:31:53 -05:00
James Agnew
4e769da4ca Give securityevent a common parent 2014-11-04 13:29:21 -05:00
lmds1
f366cb52f1 merged changes from master 2014-11-03 17:18:33 -05:00
lmds1
730ff7b21a no changes 2014-11-03 16:04:32 -05:00
James Agnew
da6a5d5a24 Move BoundCodeableConceptDt back to where it originally was for DSTU1 
resources
 2014-10-29 16:08:07 -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
c26602f0c8 Versions now builds completely! 2014-10-24 15:43:35 -04:00
James Agnew
81ddb3f1d5 More versions work 2014-10-20 18:59:02 -04:00
lmds1
45a3fa8254 updated tinder to generate resources with a getResourceType method returning the ResourceTypeEnum, removed Test resource 2014-10-20 14:19:18 -04:00
James Agnew
b07b8b9845 Start adding DEV structures 2014-10-17 18:08:37 -04:00
James Agnew
47edfb7b01 Almost have versions tests passing 2014-10-17 14:51:45 -04:00
James Agnew
bb0b39627d Unit tests almost all passing 2014-10-16 17:19:27 -04:00
James Agnew
1d29b2b642 Still more versions work 2014-10-16 13:41:57 -04:00
James Agnew
a8be093b1f Use better valueset enums for SecurityEvent's values 2014-08-28 12:58:13 -04:00
James Agnew
c75c37d24d Rename SecurityEvent.Object to SecurityEvent.ObjectElement 2014-08-27 12:01:46 -04:00
jamesagnew
9413bfa47b Correctly parse List resource 2014-08-26 08:10:15 -04:00
jamesagnew
d01f43e4b3 Add server interceptor layer as well as starting work on property file for versions 2014-08-25 09:11:28 -04:00
jamesagnew
6bc9140def Fix unit test failure 2014-08-19 09:12:25 -04:00
jamesagnew
9ef670aae9 Start getting sorting into fhirtest 2014-08-12 08:00:24 -04:00
jamesagnew
e17af44a09 Add _language search support 2014-08-08 08:34:28 -04:00
James Agnew
e4ceb29460 Fix broken unit test 2014-07-29 16:45:59 -04:00
James Agnew
98d0fe679a Rebuild resource models 2014-07-29 15:59:11 -04:00
jamesagnew
0bc703107c Add suport for composite and sorting to JPA (not yet complete) 2014-07-29 09:10:25 -04:00
James Agnew
622e528f43 Lots of documentation updates 2014-07-22 18:12:01 -04:00
jamesagnew
af3c35cbc0 More API cleanup and documentation 2014-07-22 09:14:02 -04:00
jamesagnew
ad043a1b79 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParameterUtil.java
 2014-07-21 09:24:38 -04:00
James Agnew
2285d3812e Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-07-17 13:02:21 -04:00
James Agnew
bb14ad09ea Start preparingh for multiple versions of FHIR 2014-07-17 09:53:52 -04:00
jamesagnew
84af486d51 Tester now suports chained parameters 2014-07-17 08:32:01 -04:00
James Agnew
28ebda71e1 Let IdDt clone without being heavyweight 2014-07-10 08:50:51 -04:00