Commit Graph

2800 Commits

Author SHA1 Message Date
James f1828d1ca8 Fix handling of filters on valueset expansions 2017-02-10 11:05:59 -05:00
Hugo Soares da9daf86c0 Merge remote-tracking branch 'refs/remotes/jamesagnew/master'
# Conflicts:

#	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/GenericClient.java
2017-02-09 15:19:08 +00:00
hugosoares 09f44ebc2d Merge branch 'master' into master 2017-02-09 14:23:33 +00:00
Hugo Soares 6eee5e696e Changes requested by james
https://github.com/jamesagnew/hapi-fhir/pull/542
2017-02-09 13:59:00 +00:00
James 12e047b931 Fix a couple of compile issues 2017-02-09 06:53:22 -05:00
James Agnew 0dd6364fe5 Improve paging in JPA server for _history operation 2017-02-08 21:42:17 -05:00
James ef23b45d25 Custom extension params working now 2017-02-08 19:17:12 -05:00
sekaijin faececb246 Merge pull request #1 from sekaijin/cleanup2
Cleanup2
2017-02-08 17:06:53 +01:00
sekaijin 75e99462b2 Merge branch 'master' into cleanup2 2017-02-08 16:49:34 +01:00
sekaijin 7adb35d003 resolve some warnings
unused
then clause does not complete normally
serial
missing @Override
remove unnecessary cast
2017-02-08 16:41:03 +01:00
Sebastien Riviere c3447c3b4d Remove substitution string to use relative url, Fix client parser and custom extension. 2017-02-08 11:14:19 +01:00
sekaijin 8fb20ed661 Merge remote-tracking branch 'jamesagnew/master' into cleanup2 2017-02-08 10:52:07 +01:00
sekaijin d1eb5b1c60 Merge remote-tracking branch 'jamesagnew/master' 2017-02-08 10:16:28 +01:00
James cb8492d353 Fix occasionally failing test 2017-02-07 20:10:06 -05:00
James Agnew d28122ff3e Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2017-02-07 12:24:35 -05:00
James Agnew ad781334d8 Fix conditional creates updating resource body 2017-02-07 11:36:24 -05:00
James 21ea5a070f Fix test 2017-02-07 08:46:22 -05:00
James d5fbcf8e82 Return an OperationOutcome in the response for a delete in JPA 2017-02-07 07:44:57 -05:00
James a665aed85d Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2017-02-07 07:01:59 -05:00
James b7f165019d Tweak re-indexing 2017-02-07 07:00:51 -05:00
sekaijin 0424763bd1 Merge remote-tracking branch 'jamesagnew/master' 2017-02-07 09:39:09 +01:00
sekaijin 9db28b308e the version 2.3-SNAPSHOT depend on 2.1-SNAPSHOT 2017-02-07 09:38:49 +01:00
James 116cb1c8f7 Work on repopulating 2017-02-06 21:57:23 -05:00
James Agnew c836a8905e Add test for #551 2017-02-06 11:48:19 -05:00
sekaijin c686932ee6 rmove .settings 2017-02-06 15:48:57 +01:00
sekaijin de9b59488b Merge remote-tracking branch 'jamesagnew/master' 2017-02-06 15:43:49 +01:00
sekaijin e8451c3c90 Merge branch 'cleanup' 2017-02-06 15:26:27 +01:00
Sebastien Riviere 3bf6555d61 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir into jaxrs-sever-evolution 2017-02-06 11:34:31 +01:00
James Agnew a760f1df7c Work on custom params 2017-02-05 21:27:07 -05:00
James Agnew 30df29c083 Work on custom params 2017-02-05 21:04:19 -05:00
James 73924199a9 Work on custom search params 2017-02-05 20:34:12 -05:00
James d4dda1dace headers 2017-02-04 18:21:09 -05:00
James 7149d2e053 Merge branch 'custom_jpa_search_params' 2017-02-04 16:34:05 -05:00
James dd0e47afc3 Make projects import cleanly into eclipse 2017-02-04 16:31:18 -05:00
James a60f6aa8e9 Remove more eclipse files 2017-02-04 16:16:22 -05:00
James 62ccface08 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2017-02-04 16:11:33 -05:00
James 78fd020590 Credit for #548 2017-02-04 16:10:59 -05:00
James 6875da8556 Clean up changes.xml 2017-02-04 16:09:20 -05:00
James Agnew 3f8a8cd8aa Merge pull request #548 from sekaijin/cleanup
Cleanup
2017-02-04 16:02:50 -05:00
James 54ac780cd5 Custom params works! 2017-02-04 16:02:00 -05:00
James Agnew c85c2269a1 Work on custom params 2017-02-04 14:41:11 -05:00
James 12dc4d1c11 Work on custom params 2017-02-04 07:14:21 -05:00
James Agnew aa5588826e Work on custom search params 2017-02-02 22:31:34 -05:00
James 97ff79d730 Work on custom params 2017-02-02 20:37:58 -05:00
James Agnew 3191c907a3 Work on JPA 2017-02-02 06:23:28 -05:00
James b4a362b8ee Work in progress 2017-02-01 05:55:35 -05:00
James ea5a023e17 Fix typo 2017-01-31 10:42:30 -05:00
James b0981a8dc5 Credit for #547 2017-01-31 07:22:38 -05:00
James Agnew ea1ebb245e Merge pull request #547 from daliboz/master
Fix #546 CapturingInterceptor will now buffer response
2017-01-31 07:20:01 -05:00
James 11f1f4f6ee Deprecate getAllPopulatedChildElementsOfType 2017-01-31 06:53:04 -05:00