Commit Graph

914 Commits

Author SHA1 Message Date
b.debeaubien e190659fcf Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2015-02-26 08:42:07 -05:00
b.debeaubien 9004d38f58 Fixed MyOrganization.isEmpty so it doesn't throw a ClassCastException 2015-02-26 08:36:10 -05:00
James Agnew ecd3620e27 Add configurable default response encoding to server, and serve Binary
resources as FHIR resources instead of blobs if the user has explicitly
requested an encoding
2015-02-25 11:18:37 -05:00
James Agnew 2c4b37e5f0 Just eclipse settings 2015-02-24 16:40:38 -05:00
jamesagnew a2992dd46f Merge branch 'mochaholic-master'
t push origin master# the commit.
2015-02-24 07:50:14 -05:00
jamesagnew 3812260a55 Fix #110 - Support DSTU2 Security Labels, merging in Pull Request from Mohammad Jafari - Merge branch 'master' of https://github.com/mochaholic/hapi-fhir into mochaholic-master
Conflicts:
	hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/UpdateConditionalTest.java
2015-02-24 07:49:31 -05:00
mochaholic 8a2f9ff983 Fixed this bug: the security labels wouldn't be encoded if versionId or lastUpdated weren't present. 2015-02-23 21:10:38 -07:00
lmds1 424e6bebe4 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir.git 2015-02-23 20:02:30 -05:00
mochaholic f7a8c8d5f5 Fixed issue #115. 2015-02-23 17:39:23 -07:00
James Agnew c2a6e78e67 Add conditional deletes and updates 2015-02-23 18:27:13 -05:00
mochaholic 64715477bd Merged with the latest master snapshot. 2015-02-23 11:35:27 -07:00
James Agnew 819dc67d71 Just automated license file updates 2015-02-23 13:24:17 -05:00
mochaholic 9cd005e9e3 Merged with the latest master snapshot. 2015-02-23 09:14:29 -07:00
mochaholic a4b545ba21 Merged with the latest master snapshot. 2015-02-23 08:49:21 -07:00
James Agnew c03d629333 Fix compile failure 2015-02-23 10:01:39 -05:00
jamesagnew 315ad439e4 Work on adding conditional HTTP operations to client and JPA server 2015-02-23 09:08:59 -05:00
mochaholic c13b0363dd Merged with the latest master snapshot. 2015-02-21 23:57:47 -07:00
James Agnew f76a875bc4 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-02-20 17:34:45 -05:00
James Agnew 0f01260301 Get extensions working for HL7.org structures 2015-02-20 17:34:13 -05:00
b.debeaubien 24b9a22ad3 Simple instructions on how to deploy hapi-fhir-jpaserver-example under tomcat from intellij 2015-02-20 15:12:11 -05:00
mochaholic 31d4dcdb90 Added preliminary support for DSTU2-style security labels. 2015-02-19 18:14:02 -07:00
mochaholic a5be8a10f4 Merge remote-tracking branch 'upstream/master' 2015-02-19 11:37:01 -07:00
James Agnew cf3a78ecd2 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-02-19 10:27:52 -05:00
jamesagnew e2c49d08fe Merge in changes for JPA updates 2015-02-19 08:39:01 -05:00
jamesagnew 471c80fdd3 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-02-18 22:24:05 -05:00
jamesagnew 4f93ab9313 Work on JPA Transaction for DSTU2 2015-02-18 22:23:46 -05:00
mochaholic e6405c99fb Added (commented-out) mysql configs to hapi-fhir-server-database-config.xml and the corresponding class to facilitate mysql-based deployment. 2015-02-18 17:00:40 -07:00
James Agnew dbeb6c09c6 More work on new structures 2015-02-18 17:00:47 -05:00
James Agnew 1127b1a9d5 Revert bad commit 2015-02-18 10:45:43 -05:00
jamesagnew 7beb265142 Start working on new transaction in DSTU2 JPA server 2015-02-18 09:16:48 -05:00
James Agnew 7d62951f71 Fix the build for real! 2015-02-17 16:06:28 -05:00
jamesagnew 3631160269 Fix build 2015-02-17 13:54:26 -05:00
jamesagnew 7e1f9cfdbf More work on new bundle type 2015-02-17 08:45:40 -05:00
jamesagnew dbc2d374d4 Remove android 2015-02-16 23:22:22 -05:00
jamesagnew 85489a8282 Fix build? 2015-02-16 23:03:59 -05:00
jamesagnew 70aa4e812d Work on build 2015-02-16 23:02:50 -05:00
jamesagnew 54be2634cd Work on #105 - Should have it working 2015-02-16 22:37:47 -05:00
jamesagnew e845ab7a40 Work on Android 2015-02-16 14:17:29 -05:00
jamesagnew c40a933590 Merge branch 'decouple_dstu1_structs' 2015-02-16 12:19:27 -05:00
jamesagnew 81f7571522 Work on android 2015-02-16 12:19:08 -05:00
jamesagnew e3ca555a9c Doc updates 2015-02-16 11:51:04 -05:00
jamesagnew 795041a514 More work on struct integration 2015-02-16 11:33:46 -05:00
jamesagnew 6a036dabe5 Remove most valuesets out of core 2015-02-14 16:14:52 -05:00
jamesagnew 6012a60ccf Tests all pass on deparated structure defs! 2015-02-14 13:27:11 -05:00
James Agnew 7492b25325 More work on separating versions 2015-02-13 18:01:55 -05:00
James Agnew 86e8103657 More work on splitting out resources to different versions 2015-02-13 14:17:44 -05:00
jamesagnew 083a0baf79 Add a test for #107 2015-02-13 08:26:21 -05:00
James Agnew 35a2f852fe Start work on decoupling dstu1 structures 2015-02-12 17:32:00 -05:00
James Agnew ec5f7afa5e More site work 2015-02-11 17:00:49 -05:00
jamesagnew 045c289458 Site work 2015-02-11 09:06:56 -05:00