450b270c00
Fix compile issues in previous merge
2014-11-08 11:18:04 -05:00
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
5c9cf8ddf8
More merging cleanup
2014-11-08 10:38:25 -05:00
d1fb878c55
Merging
2014-11-08 10:36:27 -05:00
d22a35788f
Implement handleException on the server interceptor framework, as well
...
as some site and documentation enhancements
2014-11-07 14:26:59 -05:00
8f704030ed
Added RES_ID property to BaseResource to facilitate searching for resources based on _id.
2014-11-07 12:24:16 -05:00
f303e174fc
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-11-04 17:32:00 -05:00
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
4e769da4ca
Give securityevent a common parent
2014-11-04 13:29:21 -05:00
f366cb52f1
merged changes from master
2014-11-03 17:18:33 -05:00
0c7cf18914
refactored auditing interceptor, added additional securityevent info
2014-11-03 17:01:52 -05:00
48a6d9ba6a
no changes
2014-11-03 16:03:32 -05:00
07de445a5e
this looks like it doesn't actually have changes but git won't let me pull because it thinks it does so committing
2014-11-03 16:02:48 -05:00
4a4dd90f6e
Added the ProvidesResources annotation and supporting classes, which allows server authors to specify resources that should be added to the initial resource list (and thus show up in the list of profiles returned from a search)
2014-11-03 09:04:16 -05:00
9c3ce5be86
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-10-31 15:00:38 -04:00
ae56cf665e
Skup failing test on windows
2014-10-31 15:00:26 -04:00
11894710f9
Updated docs in ResourceDef to indicate what id is used for (potentially it's also used for other things, though I didn't find any)
...
Added a test that demonstrates using ResourceDef.id to set the id for a custom resource's profile
2014-10-31 12:14:54 -04:00
60425a003c
Add credit for #44
2014-10-30 14:01:45 -04:00
c7d4441d3b
Merge branch 'master' of github.com:petromykhailysyn/hapi-fhir into petromykhailysyn-master
2014-10-30 13:59:12 -04:00
e9ab9c8259
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
...
Conflicts:
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java
2014-10-30 13:58:33 -04:00
135ba9d9e6
Moving site generation into root project
2014-10-30 13:57:29 -04:00
c474839f01
IOException is removed from CustomThymeleafNarrativeGenerator
2014-10-30 16:59:10 +02:00
b733b1a1dd
https://github.com/jamesagnew/hapi-fhir/issues/39
...
AddProfileTagEnum is now public, so that one can actually call setAddProfileTag.
2014-10-30 10:07:34 -04:00
f2f09d03df
Add constructor and javadocs
2014-10-29 16:23:19 -04:00
d2e6fc2253
Test updates to make Jenkins happy
2014-10-29 15:48:05 -04:00
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
8f610d2c3a
Add some tests
2014-10-29 09:04:44 -04:00
5abdb5680a
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-10-28 11:16:07 -04:00
7f965c447f
ServerProfileProvider now uses IdDt.getIdPart() rather than getValue() so that it can find the profiles in in FhirContext's myIdToResourceDefinition.
2014-10-27 13:53:01 -04:00
d756b73fa5
Docs
2014-10-24 16:24:06 -04:00
c0ed32c49a
More work on versions
2014-10-24 16:21:01 -04:00
d170c1e408
More work on DEV
2014-10-24 16:10:54 -04:00
c26602f0c8
Versions now builds completely!
2014-10-24 15:43:35 -04:00
69ee8a4777
Documentation updates
2014-10-23 12:32:54 -04:00
8f02bd734e
Docs for release 0.7
2014-10-23 10:58:15 -04:00
818177f70f
Bunp to 0.7 for release
2014-10-23 08:12:58 -04:00
084d0d3010
Doc updates
2014-10-21 13:23:25 -04:00
81ddb3f1d5
More versions work
2014-10-20 18:59:02 -04:00
ebb906adae
updated generated files with license comment from hapi-fhir-base build
2014-10-20 15:17:09 -04:00
11f5a08814
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-10-20 14:19:25 -04:00
45a3fa8254
updated tinder to generate resources with a getResourceType method returning the ResourceTypeEnum, removed Test resource
2014-10-20 14:19:18 -04:00
b07b8b9845
Start adding DEV structures
2014-10-17 18:08:37 -04:00
4f8eec4075
Add an example for #35 - Cookie Interceptor
2014-10-17 16:39:47 -04:00
e31970f095
Merge pull request #35 from petromykhailysyn/master
...
Added Cookie interceptor.
2014-10-17 16:29:54 -04:00
79f92e8728
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-10-17 16:03:48 -04:00
b2efa07a05
Doc updates
2014-10-17 16:03:33 -04:00
d140e0b829
Merge pull request #34 from jjathman/remove-validation-exception
...
Fixes #32 - removes new validation API that doesn't use exceptions
2014-10-17 15:41:21 -04:00
cdb1b2d03e
Move Vagrant documentation into its own file
2014-10-17 15:23:04 -04:00
47edfb7b01
Almost have versions tests passing
2014-10-17 14:51:45 -04:00
10c49d2bd3
Added Cookie interceptor.
2014-10-17 12:52:09 +03:00
bb0b39627d
Unit tests almost all passing
2014-10-16 17:19:27 -04:00
1d29b2b642
Still more versions work
2014-10-16 13:41:57 -04:00
dbc07dcb50
More versions work
2014-10-16 11:46:25 -04:00
a642745095
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-10-16 10:48:58 -04:00
5a742a492b
added missing resourcetypeenums
2014-10-16 10:48:51 -04:00
287162af91
Fix #33 - Server was incorrectly returning contained resources as
...
top-level resources
2014-10-15 16:46:28 -04:00
9f62d18b9f
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-10-15 15:22:45 -04:00
fdd9939d16
added resource type to IResource so all resource subclasses must declare what type they are (to facilitate auditing of resources)
2014-10-15 15:22:42 -04:00
b22bcaec32
More cleanup for contained resources
2014-10-15 14:34:14 -04:00
2741f1cae5
Fixes #32
...
Creates new methods that return a ValidationResult object instead of throwing an exception which requires catching and inspecting the exception itself. Migrating from the old to the new API should be pretty simple as the method calls match quite closely.
2014-10-15 12:26:30 -05:00
2a9d92df7a
Clean up encoding of contained resources so that resources are not
...
modified as a part of the encoding
2014-10-14 14:20:19 -04:00
6049df0bfa
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-10-10 15:42:29 -04:00
abecee2766
Some work on supporting multiple versions
2014-10-02 09:54:52 -04:00
507ea9bedf
One more windows unit test break
2014-10-01 16:27:47 -04:00
c6dcd4b1af
Fix broken unit tests on Windows
2014-10-01 16:02:22 -04:00
751face0a6
Argh. Fix to 0.7-SNAPSHOT, not 0.6-SNAPSHOT
2014-09-30 13:16:09 -04:00
3eeea9b0fc
Merge branch 'tags-set'
2014-09-30 11:58:00 -04:00
24caec9f44
Get tags working as a set instead of a list
2014-09-30 11:57:15 -04:00
75c5123797
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
...
Conflicts:
hapi-fhir-base/src/changes/changes.xml
2014-09-29 21:07:01 -04:00
dcccf5553e
Return a content-location header on update
2014-09-29 21:05:55 -04:00
2e89fd7554
fixed compile error with org-apache-commons.StringUtils
2014-09-26 18:38:38 -04:00
0d6eca70a9
Work on #30 , still not working though...
2014-09-26 17:16:37 -04:00
1d084fe6b0
Fix #29 - Encoding resources with contained resources caused the parent
...
resource to grow with each encode pass.
2014-09-26 10:58:19 -04:00
c362e21997
Add test for contained binary resources. Close #26 fixed by Alexander
...
Kley
2014-09-26 09:37:41 -04:00
e4009bcb4a
Merge pull request #28 from Cloudyle/issue-#26
...
Thanks for the submission! Looks good to me.
2014-09-26 09:32:35 -04:00
69c5663128
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
...
Conflicts:
hapi-fhir-base/src/changes/changes.xml
2014-09-26 09:24:28 -04:00
4f4fdfd279
Docs
2014-09-26 09:23:03 -04:00
4622af7a82
Docs
2014-09-26 07:43:25 -04:00
86b5e4acf9
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-09-25 11:21:07 -04:00
d159584b43
Don't fail is Woodstox isn't the default StAX parser
2014-09-25 08:35:15 -04:00
b380a8f797
Update PraserState.java
...
Issue #26 : XMLParser doesn't read Binary content from XML. Binary content is discarded during xml parsing, because attribute check of ID is missing in BinaryResourceState.attributeValue(...)
2014-09-25 10:36:29 +02:00
bdad121f01
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-09-24 19:09:45 -04:00
88e95c1b0a
fixed exception handling for auditing interceptor
2014-09-24 19:09:35 -04:00
dd5e442bcb
Add an explicit dependency on phloc-commons to fix a build error, thanks to Odysseas Pentakalos for the contribution.
2014-09-24 17:36:59 -04:00
8c45f32ce3
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-09-24 15:52:57 -04:00
e0d160ad7e
added AuditingInterceptor and IAuditDataStore with various ResourceAuditors to provide pluggable auditing functionality to FHIR server
2014-09-24 15:52:48 -04:00
a610c1cb38
Add client interceptor which adds bearer tokens for OAUTH2
2014-09-24 14:57:37 -04:00
5c0ccaab9a
Resources containing entities which are not valid in basic XML (e.g.
...
§) will have those
entities converted to their equivalent
unicode characters when resources are encoded, since FHIR does
not allow extended entities in resource
instances.
2014-09-22 16:44:59 -04:00
c214f7fe19
Fix #24 - Add a bunch of elements to the automatically generated
...
conformance profiles to ensure that they validate against the HL7
schemas.
2014-09-22 16:27:57 -04:00
7192c9348a
Doc tweaks
2014-09-19 08:52:39 -04:00
b67a4cc4e4
Allow read/vread/search using absolute URL - Thanks to Doug Martin for
...
the contribution
2014-09-18 17:13:43 -04:00
06e2b6632d
Fix build
2014-09-17 11:43:18 -04:00
cb8dca13d2
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-09-17 11:36:41 -04:00
62bf2620f1
Properly handle bundle entry summary element
2014-09-17 11:35:57 -04:00
4b730cc418
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-09-17 11:35:44 -04:00
9906b61987
added UserInfoInterceptor to pass user context for auditing, added narratives for Medication Prescription, moved URL into RequestDetails so it's available to interceptors
2014-09-17 11:35:15 -04:00
b316d556b7
Fix unit test
2014-09-17 09:07:01 -04:00
594b04d838
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
...
Conflicts:
hapi-fhir-base/src/changes/changes.xml
2014-09-17 08:33:52 -04:00
1fecb8ad76
Parameter type cleanup from connectathon
2014-09-17 08:32:15 -04:00
83f9c1c6a9
Still working on unit tests
2014-09-16 17:21:04 -04:00
774e38eacc
Just logging in unit test
2014-09-16 17:16:03 -04:00
49726fb17c
Properly escape characters in narrative blocks
2014-09-16 17:06:48 -04:00
e7d2a19ac6
Fix broken build - Thanks Jenkins!
2014-09-16 15:25:20 -04:00
af64f1b9e1
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-09-16 12:06:42 -04:00
ef57a5f47e
Work on #21 - Don't depend on Servlet 3+ APIs
2014-09-16 12:05:44 -04:00
5701572e08
Fix url determination
2014-09-13 12:15:35 -05:00
1f0f9176fe
Work on base server URL determination code
2014-09-13 12:05:57 -05:00
f3ae6cbffd
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
...
Conflicts:
hapi-fhir-base/src/changes/changes.xml
hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component
restful-server-example/.settings/org.eclipse.wst.common.component
2014-09-12 18:57:57 -05:00
cdd4b137fb
Bump to 0.7-SNAPSHOT
2014-09-11 16:57:45 -04:00
0b6c985f3a
Merge branch 'oauth2'
...
Conflicts:
2014-09-11 16:29:08 -04:00
960c89989c
Documentation tweaks
2014-09-11 16:28:29 -04:00
8a77ac939d
Documentation enhancements
2014-09-10 14:12:11 -04:00
09af35e5d8
Site tweaks for release
2014-09-08 07:51:21 -04:00
13dd6d5e11
Complete 0.6
2014-09-08 07:41:44 -04:00
6761e9a945
Starting to rework the oauth2 filter
2014-09-04 18:03:19 -04:00
f9419ea910
Fix up examples
2014-09-03 18:03:44 -04:00
095945562b
Potential #19
2014-09-03 12:57:17 -04:00
93c54f57fe
More work on fixing #19
2014-09-03 09:08:55 -04:00
c704aa185d
Fix #19 - Now have a whitelist and a blacklist for parameter names
2014-09-02 16:41:01 -04:00
9217ee28bf
Starting work on #19
2014-09-02 08:21:06 -04:00
bda33737f1
Doc updates as suggested by David Hay
2014-09-01 20:05:16 -04:00
e7f34e8dbb
Check compartment support in
2014-08-29 13:05:04 -04:00
ce99ee8324
Whitespace
2014-08-28 17:42:35 -04:00
a8be093b1f
Use better valueset enums for SecurityEvent's values
2014-08-28 12:58:13 -04:00
4d426cb2b2
Fix resource reference encode order
2014-08-28 09:47:59 -04:00
46fbfeb66e
Fix encoding issue on narrative blocks
2014-08-28 09:44:04 -04:00
d205075e35
More validator work
2014-08-28 07:53:41 -04:00
c75c37d24d
Rename SecurityEvent.Object to SecurityEvent.ObjectElement
2014-08-27 12:01:46 -04:00
9a58e2e56e
Close #14 - HAPI will now not ignore _id parameter when choosing a
...
backing method
2014-08-27 11:34:13 -04:00
5d2d6f410f
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-08-27 10:37:19 -04:00
f549cd5cc4
Unit test for #14 - Doesn't pass yet though
2014-08-27 10:36:56 -04:00
bfd6329303
Performance improvements
2014-08-27 08:55:00 -04:00
794db6a141
Document interceptor framework
2014-08-26 18:18:00 -04:00
9bb10a5968
More tweaks
2014-08-26 16:23:56 -04:00
812870f5dc
Make this a bit easier to read
2014-08-26 16:22:43 -04:00
f5823a8e2f
Server logging interceptor enhancements
2014-08-26 16:10:27 -04:00
84c479927e
Add test for #11
2014-08-26 10:13:35 -04:00
faa28cb825
Fix unit test, should close #13 . Our hudson server is temporarily
...
offline and I need to do a better job of manually running the tests
until it is back!
2014-08-26 10:04:26 -04:00
9413bfa47b
Correctly parse List resource
2014-08-26 08:10:15 -04:00
e6d6ec88b2
Fix unit test
2014-08-25 21:53:21 -04:00
2cad32aa08
Detect invalid read method
2014-08-25 17:07:02 -04:00
d01f43e4b3
Add server interceptor layer as well as starting work on property file for versions
2014-08-25 09:11:28 -04:00
8d462f3cda
Add validator support
2014-08-23 16:40:26 -04:00
3808f95f6a
Start working on server interceptors
2014-08-22 19:15:49 -04:00
ab17c9f3d1
Let server return profile info if configured to do so
2014-08-21 00:34:19 -04:00
731d369be0
Improve documentation on exception handling for servers
2014-08-20 22:46:15 -04:00
45253cba5d
Eclipse settings
2014-08-20 19:21:41 -04:00
1ec49a4f80
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
...
Conflicts:
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
2014-08-20 15:24:39 -04:00
47c522ac6f
Exception enhancements
2014-08-20 15:22:25 -04:00
f8a5acfed9
Exception enhancements
2014-08-20 09:01:09 -04:00
71e6efbc31
Fix resource reference encoding for JSON parser - Thanks Tommy Nguyen for reporting!
2014-08-20 07:48:51 -04:00
6bc9140def
Fix unit test failure
2014-08-19 09:12:25 -04:00
598eec53ed
Add model visitor, and allow bundles to have categories (as allowed in the spec)
2014-08-19 07:48:06 -04:00
fd41bafa82
Allow bundle as param in transaction method
2014-08-17 22:58:30 -04:00
8078452f78
Lots more documentation and let users interact with link self/search
2014-08-16 17:46:30 -04:00
d67a29a366
Unit tests
2014-08-15 15:55:39 -04:00
d5c6623da0
Start adding ability to override fields in extended definition classes
2014-08-15 09:19:07 -04:00
901ce12e8e
Start adding view generator
2014-08-13 18:16:34 -04:00
04b4d5acb7
Server sending some named queries to non named query method
2014-08-13 16:43:54 -04:00
408114235f
Start server profiles
2014-08-12 17:22:05 -04:00
0ff847ac21
Fix failing unit tests
2014-08-12 12:27:51 -04:00
d0edc03f14
Linked resources in server now correctly returned
2014-08-12 11:04:41 -04:00
e2b9b3318d
Add OperationOutcome narrative template
2014-08-11 09:09:01 -04:00
04bc96ff8e
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-08-09 12:18:54 -04:00
3e2cfcd02d
Doc updates
2014-08-09 12:18:47 -04:00
2ede952342
Fix up CORS support
2014-08-08 17:40:43 -04:00
8149df964e
Annotation client will not return incorrect resource types
2014-08-08 15:15:10 -04:00
b43b6c6d2f
Fix #6 : Allow update operation to create a resource if it doesn't
...
already exist
2014-08-08 14:07:03 -04:00
e17af44a09
Add _language search support
2014-08-08 08:34:28 -04:00
ba3bc70eae
Fix CORS support
2014-08-08 07:33:12 -04:00
95f5031251
Documentation enhancements
2014-08-07 18:41:33 -04:00
4ba4226dad
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-08-07 12:18:38 -04:00
deef33317d
Annotation documentation updates
2014-08-07 08:27:52 -04:00
0b7cfec06b
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-08-06 09:05:21 -04:00
f36be04168
Typo edits
2014-08-06 09:05:01 -04:00
2c44a4f76e
Correctly handle contained resources in client
2014-08-05 17:06:35 -04:00
aef7ea5e9f
Correctly encode JSON composite elements with extensions
2014-08-05 14:57:53 -04:00
f29349f537
Improve conformance provider documentation
2014-08-05 13:15:08 -04:00
1793f6d9ab
Fix #4- Create operation should return HTTP 200
2014-08-05 10:46:46 -04:00
33d667d448
Doc updates
2014-08-05 07:55:58 -04:00
cac3306c64
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-08-01 07:35:59 -04:00
9d4eff967e
Doc updates
2014-08-01 07:35:44 -04:00
fa3bd7f25d
Start adding OpenID support
2014-07-31 18:06:04 -04:00
0ba7a63803
Allow repeatable prarmater values
2014-07-30 17:43:15 -04:00
0a57647b17
Tag 0.5
2014-07-30 07:58:57 -04:00
67fb593146
Finalize 0.5
2014-07-29 22:26:19 -04:00
de5aeb5c7a
More tests
2014-07-29 17:27:16 -04:00
98d0fe679a
Rebuild resource models
2014-07-29 15:59:11 -04:00
0bc703107c
Add suport for composite and sorting to JPA (not yet complete)
2014-07-29 09:10:25 -04:00
318dcfcaaf
Contained resource handling improved
2014-07-23 17:02:54 -04:00
4cd3bdf441
A few fixes and additions to the fluent client, as well as fixing a bug on extension encoding (null extensions were still being encoded)
2014-07-23 09:15:07 -04:00
622e528f43
Lots of documentation updates
2014-07-22 18:12:01 -04:00
efb14397df
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
...
Conflicts:
hapi-fhir-base/src/changes/changes.xml
2014-07-22 14:25:59 -04:00
e53aaf0950
Add content-disposition header for binary resources
2014-07-22 14:25:33 -04:00
af3c35cbc0
More API cleanup and documentation
2014-07-22 09:14:02 -04:00
fc74cda994
Clean up examples and unit tests to use new parameter types
2014-07-21 18:37:08 -04:00
063e2961ab
Fix bug 2- Process Content-Location header in client read invocations
2014-07-21 14:57:37 -04:00
64481185c7
Fixing bug 3- Instance history calls incorrectly get routed to vread
...
method
2014-07-21 14:15:22 -04:00
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
6aa3560564
Starting work on consolidating params
2014-07-19 12:10:43 -04:00
jamesagnew
b.debeaubien
lmds1
petromykhailyshyn
Joseph Athman
t106uhn
akley