Commit Graph

347 Commits

Author SHA1 Message Date
James add96f2124 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-07-04 17:19:51 -04:00
James 0d13dc886b Allow server to specify its own base 2014-07-04 17:19:33 -04:00
t106uhn 8c1c156e04 testing commit 2014-07-04 16:24:48 -04:00
James 02357bce4d Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-07-04 16:18:10 -04:00
James ec2326b1f2 Narrative fixes 2014-07-04 16:17:53 -04:00
t106uhn e0d0574cce commit 2014-07-04 15:59:12 -04:00
t106uhn 8703e81821 commit 2014-07-04 15:49:54 -04:00
t106uhn ca9264061b Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir.git 2014-07-04 14:32:09 -04:00
jamesagnew 93a7c3e5b5 Deprocate confusing get/setId methods 2014-07-04 09:27:36 -04:00
t106uhn e98205a8f2 added new exception 2014-07-03 18:51:18 -04:00
jamesagnew de51a40904 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-07-03 18:35:54 -04:00
jamesagnew ee53c40ff8 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml
	hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/templates/tmpl-home-welcome.html
2014-07-03 18:35:37 -04:00
James 80c13494a8 Fix JSON parser NPE 2014-07-03 18:35:23 -04:00
jamesagnew 65dc4cbf2e Welcome mesage change 2014-07-03 18:03:06 -04:00
James ca0929df07 Work on narrative generator 2014-07-03 18:02:14 -04:00
James c811c164b5 Fix unit test 2014-07-03 10:34:55 -04:00
jamesagnew ab9e681ed2 Start adding transaction to tester 2014-07-03 08:51:42 -04:00
jamesagnew cf4b612ae6 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-07-02 18:10:57 -04:00
jamesagnew ad344f700d Config changes 2014-07-02 18:10:50 -04:00
James ca83de38b8 Fix tester breakage 2014-07-02 18:10:20 -04:00
James 0ece666c88 FIx a bunch more unit tests 2014-07-02 18:01:29 -04:00
t106uhn 3e8ea1d4ed Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir.git 2014-07-02 16:20:20 -04:00
James 1c05bcb29c Fix a number of unit tests 2014-07-02 15:24:29 -04:00
jamesagnew 14befcd091 Lots of tester enhancements 2014-07-02 08:57:07 -04:00
jamesagnew f87c50b4b4 Lots of tester work 2014-06-27 18:28:27 -04:00
jamesagnew 50d68d6090 Fix a few parsing issues and add multi server support to tester 2014-06-27 09:05:51 -04:00
jamesagnew 4cd7ff16fb More tester enhancements 2014-06-26 18:06:23 -04:00
t106uhn e576d5ba8f Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir.git 2014-06-26 14:06:26 -04:00
jamesagnew 97e17f9149 Fix code highlighting 2014-06-26 09:06:10 -04:00
jamesagnew 3bc1d35698 Add method which was removed but make it deprocated 2014-06-25 17:22:47 -04:00
jamesagnew acbffecd15 Still trying to get this working with Jenkins 2014-06-25 17:01:32 -04:00
jamesagnew cf63f6bacf FIx unit tests 2014-06-25 13:54:44 -04:00
jamesagnew 1916656e6e Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
Conflicts:
	hapi-fhir-base/src/main/resources/ca/uhn/fhir/rest/server/tester/RestfulTester.html
2014-06-25 09:56:12 -04:00
jamesagnew 411644c4ff More tester work 2014-06-25 09:49:13 -04:00
jamesagnew 68ea31495c More enhancements for the tester, and merge read/vread methods 2014-06-25 09:07:14 -04:00
jamesagnew e093b23892 Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode 2014-06-24 08:47:36 -04:00
jamesagnew a51edb83aa More paging work on tester 2014-06-24 08:46:54 -04:00
jamesagnew 875acee2ac Fix failing unit tests 2014-06-23 10:31:02 -04:00
jamesagnew ba09da38b6 Start adding paging support 2014-06-23 09:04:48 -04:00
jamesagnew 4d90955e75 Make resource detection kind of case insensitive (to deal with some healthintersections responses) 2014-06-20 16:54:09 -04:00
jamesagnew f4b8f18a8a Make highlighting optional 2014-06-17 09:18:37 -04:00
jamesagnew 5152f0ba9b Lots more work getting the JPA tester working 2014-06-17 07:48:50 -04:00
jamesagnew e0ae780ff2 Fix issue with JPA search params 2014-06-16 18:07:55 -04:00
jamesagnew bba62b2972 Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode 2014-06-12 22:21:45 -04:00
jamesagnew 00f7a76ee9 Lots more work on the tester servlet 2014-06-12 22:20:23 -04:00
jamesagnew 1c6bcfee4c FIx problem with non-code having token search params 2014-06-12 17:38:28 -04:00
jamesagnew ab3d656249 Fix some encoding issue for token params 2014-06-12 17:13:49 -04:00
jamesagnew 58bb97e6d0 Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode 2014-06-12 13:04:30 -04:00
jamesagnew d241df9868 Fix broken test cases 2014-06-12 13:00:31 -04:00
jamesagnew 96986f8829 Lots of cleanup and try to speed up transacitons in JPA 2014-06-12 11:42:28 -04:00