Commit Graph

229 Commits

Author SHA1 Message Date
James Agnew fbcd15a16d Test updates 2015-05-12 18:08:10 -04:00
James Agnew 2ce921f39b Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-05-08 18:59:00 -04:00
James Agnew 3e382ab760 More work on RI structs 2015-05-08 18:49:31 -04:00
James Agnew eeba5812cb Finalize 1.0 release 2015-05-08 17:15:50 -04:00
James Agnew e7450941bc Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-05-08 11:19:32 -04:00
jamesagnew 0f2976358f Version bump to 1.1-SNAPSHOT with more loggging 2015-05-08 08:54:40 -04:00
jamesagnew a731557516 Merge branch 'hl7org_structs' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-05-07 21:28:31 -04:00
jamesagnew 8e81b069af Merge 2015-05-07 21:24:52 -04:00
jamesagnew dfbe2415d1 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-05-07 21:24:34 -04:00
jamesagnew 924ebf062e Preparing for 1.0 release 2015-05-07 20:51:37 -04:00
James Agnew ce9a2da0e8 Fix failing unit test 2015-05-07 12:02:54 -04:00
James Agnew 9658cafdfc Credit 2015-05-07 11:31:17 -04:00
James Agnew 9d744f2a44 Fix unit tests 2015-05-07 11:22:05 -04:00
jamesagnew 5a7eb6f25e Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-05-07 09:01:46 -04:00
jamesagnew a09c4438f2 Work on conditional operations in JPA 2015-05-07 09:01:28 -04:00
James Agnew fcbe969967 Disable broken unit test in JPA server for now 2015-05-06 10:24:27 -04:00
James Agnew 3a5d2e892a About to commit to SVN as well 2015-05-05 18:16:22 -04:00
James Agnew 05cccdb6e5 More work on structs 2015-05-05 13:16:10 -04:00
James Agnew 496333b5e0 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-05-04 11:08:37 -07:00
James Agnew 7585256037 Add some logging 2015-05-04 11:08:01 -07:00
James Agnew ab7b1c3a4f Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-05-02 14:38:14 -07:00
James Agnew 7ab0ea033c Add unit test logging 2015-05-02 14:14:41 -07:00
James Agnew ae81ad29f6 Unit tests all passing 2015-05-02 14:04:43 -07:00
James Agnew aa2f2cee96 Merge branch 'hl7org_structs' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-05-01 13:52:24 -07:00
James Agnew 3fe60c3f1b Start syncing changes with SVN 2015-05-01 13:07:47 -04:00
James Agnew 5d58e17525 Just add some logging 2015-05-01 11:26:49 -04:00
James Agnew 9755ae8d35 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-05-01 10:24:15 -04:00
James Agnew 20a16d62fe More work on bugfixing #164 - Support for :missing 2015-05-01 08:20:01 -04:00
James Agnew 3fc6958ff2 Work on #164 - Add support for :missing in JPA server 2015-04-30 19:26:26 -04:00
James Agnew 5cf5bb0473 Fix #167 - Rename "myEntityManagerFactory" to just
"entityManagerFactory" as this is the default expected in some spots in
Spring
2015-04-30 09:36:14 -04:00
James Agnew 0d71be25dd Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-04-28 10:52:15 -04:00
James Agnew 3a1cc48048 Fix broken unit test and allow invalid dates in web testewr UI 2015-04-28 10:33:14 -04:00
jamesagnew 8f82dbb2f8 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-04-28 07:50:21 -04:00
jamesagnew 5b90014a34 Make structures jars optional 2015-04-28 07:49:43 -04:00
James Agnew 5e8fe01af1 Allow fluent client users to execute a transaction using a string as
input
2015-04-27 13:19:40 -04:00
jamesagnew f8dee1f47a Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-04-24 09:05:34 -04:00
jamesagnew 5bcd6a4751 Don't include an mpty text element in Bundles being returned by the server 2015-04-23 08:04:05 -04:00
jamesagnew b222b76611 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs
Conflicts:
	hapi-fhir-android/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java
	hapi-fhir-testpage-overlay/.gitignore
	src/changes/changes.xml
2015-04-21 13:30:58 -04:00
James Agnew 02070affbf Merge pull request #153 from mochaholic/master
Read server interceptors from the spring context.
2015-04-20 14:47:24 -04:00
James Agnew 3db46c2db2 More work on hl7org strfucts 2015-04-15 16:37:24 -04:00
jamesagnew 8c873ef023 Remove hard coded persistence context name 2015-04-09 21:44:18 -04:00
mochaholic 3003b5e17b Update to the latest upstream. 2015-04-09 07:25:09 -06:00
jamesagnew 1f51c69126 Fix #139 - ContactPointDt fields don't index in JPA module 2015-04-05 16:18:14 -04:00
jamesagnew 11507ef97c Fix #148 - Add _count support to everything operation 2015-04-05 14:53:15 -04:00
jamesagnew 8c37973a78 Fix #147 - no duplicates in 'everything' operation 2015-04-04 23:36:04 -04:00
James Agnew 1bdd2daa8e One last synchronization to DSTU2 2015-04-02 11:37:40 -04:00
James Agnew c484425c78 Update license file generation and gitignores 2015-03-26 11:57:07 -04:00
jamesagnew 986094617a Fix #135 - Remove Eclipse and IntelliJ artifacts from version control 2015-03-26 07:56:24 -04:00
jamesagnew 3d6c54a47e Add license and notice files 2015-03-25 22:32:32 -04:00
jamesagnew 92c0859eaa Fix broken unit test 2015-03-24 20:59:34 -04:00