 Ted Klein | 38c0479f168 | merge conflicts | | |
Ted Klein | e056d74041c | merge conflict | | |
Ted Klein | bf33b14868b | work thru merge conflicts | | |
Ted Klein | 828929cd08fM | Merge commit '87fafe6b21215af8d14c52e7993d5cba573f9bf4' into UP-146-create-new-codesystem-and-namingsystem-for-apr-drg# Conflicts:
# input-cache/txcache/EPSG-GeodeticParameterDataset.cache
# input-cache/txcache/MSH.cache
# input-cache/txcache/SCDHEC-GISSpatialAccuracyTiers.cache
# input-cache/txcache/appointment-cancellation-reason.cache
# input-cache/txcache/epsg-ca.cache
# input-cache/txcache/epsg-crs.cache
# input-cache/txcache/http___ncithesaurus-stage.nci.nih.gov.cache
# input-cache/txcache/https___www.cm... | | UP-146 |
Ted Klein | 87fafe6b212 | fix typo | | |
Ted Klein | 7366da4ab52 | Fix copy paste errors in text on some pages. | | |
Ted Klein | 474e347a3cc | step 2 impl | | |
Ted Klein | 1dfe73dee4cM | Merge branch 'master' of https://bitbucket.hl7.org/scm/utg/utg into UP-214-adding-codes-the-cms-present-on-admission-poa-indicator-code-system-stub# Conflicts:
# input-cache/txcache/EPSG-GeodeticParameterDataset.cache
# input-cache/txcache/MSH.cache
# input-cache/txcache/SCDHEC-GISSpatialAccuracyTiers.cache
# input-cache/txcache/appointment-cancellation-reason.cache
# input-cache/txcache/cvx.cache
# input-cache/txcache/epsg-ca.cache
# input-cache/txcache/epsg-crs.cache
# input-cache/txcache/http___ncithesaurus-stage.nci.nih.gov.cache
# in... | | UP-214 |
Ted Klein | 0e8a0da275a | prep for impl step 1 | | |
Ted Klein | ba18631adc6 | clear cache | | |
Ted Klein | e71cda2a7ff | Merge branch 'master' of https://github.com/HL7/UTG into UP-214-adding-codes-the-cms-present-on-admission-poa-indicator-code-system-stub# Conflicts:
# input-cache/txcache/EPSG-GeodeticParameterDataset.cache
# input-cache/txcache/MSH.cache
# input-cache/txcache/SCDHEC-GISSpatialAccuracyTiers.cache
# input-cache/txcache/appointment-cancellation-reason.cache
# input-cache/txcache/cvx.cache
# input-cache/txcache/epsg-ca.cache
# input-cache/txcache/epsg-crs.cache
# input-cache/txcache/http___ncithesaurus-stage.nci.nih.gov.cache
# in... | | UP-214 |
Ted Klein | cf103dc3de1 | fix manifest issue | | |
Ted Klein | e9b982d210c | oops forgot to save the changes to the hx file | | |
Ted Klein | 2556797e096 | finalize version and hx entries | | |
Ted Klein | d6229acc79f | fix duplicate entries created as merge artifact | | |
Ted Klein | 88d8e8058beM | Merge commit '64830ef07b02e1ac907ba8aaff260c50f9e8eb02'# Conflicts:
# input-cache/txcache/EPSG-GeodeticParameterDataset.cache
# input-cache/txcache/SCDHEC-GISSpatialAccuracyTiers.cache
# input-cache/txcache/all-systems.cache
# input-cache/txcache/appointment-cancellation-reason.cache
# input-cache/txcache/cvx.cache
# input-cache/txcache/epsg-ca.cache
# input-cache/txcache/epsg-crs.cache
# input-cache/txcache/http___ncithesaurus-stage.nci.nih.gov.ca... | | |
Ted Klein | 64830ef07b0 | fix label | | |
Ted Klein | 15eb718e16a | prep for final merge | | |
Ted Klein | 3ff48bf7912 | fix cache | | |
Ted Klein | f122fca9e11 | clean duplicate entries | | |
Ted Klein | 4e6ef849282 | try to address the strange errors | | |
Ted Klein | 25b2d1cdf96 | fix typo in manifest | | |
Ted Klein | a8c05daae12 | the rest of the tech ids | | |
Ted Klein | ad506e6b15a | more of the other tech id manifest entries | | |
Ted Klein | d4d662db8ef | Merge commit '086612837910646d5e01b06f3d305473b88b6bd7' into UP-198-integrate-external-code-system-information-into-tho# Conflicts:
# input-cache/schemas/R5/fhir-single.xsd
# input-cache/txcache/EPSG-GeodeticParameterDataset.cache
# input-cache/txcache/MSH.cache
# input-cache/txcache/SCDHEC-GISSpatialAccuracyTiers.cache
# input-cache/txcache/all-systems.cache
# input-cache/txcache/appointment-cancellation-reason.cache
# input-cache/txcache/cvx.cache
# input-cache/txcache/epsg-ca.cache
# input-cache/txcache/epsg... | | UP-198 |
Ted Klein | 8db9a2ac8f2 | get info in place | | |
Ted Klein | 8a654288c64 | try to resolve merge conflicts | | |
Ted Klein | 5a7699a3230 | Merge commit '086612837910646d5e01b06f3d305473b88b6bd7' into UP-198-integrate-external-code-system-information-into-tho# Conflicts:
# input-cache/schemas/R5/fhir-single.xsd
# input-cache/txcache/EPSG-GeodeticParameterDataset.cache
# input-cache/txcache/MSH.cache
# input-cache/txcache/SCDHEC-GISSpatialAccuracyTiers.cache
# input-cache/txcache/all-systems.cache
# input-cache/txcache/appointment-cancellation-reason.cache
# input-cache/txcache/cvx.cache
# input-cache/txcache/epsg-ca.cache
# input-cache/txcache/epsg... | | UP-198 |
Ted Klein | 08661283791 | Step 3 correct hx bundle | | |
Ted Klein | 7344eebfd41 | Step 2 prep UP-226 for implementation | | UP-226 |
Ted Klein | e579c6ede2eM | Merge commit 'e7a8451d8d062b0c45e2102a8da415aa3f0aeb32' into UP-226-add-text-messaging-to-participationmode# Conflicts:
# input-cache/txcache/EPSG-GeodeticParameterDataset.cache
# input-cache/txcache/MSH.cache
# input-cache/txcache/SCDHEC-GISSpatialAccuracyTiers.cache
# input-cache/txcache/appointment-cancellation-reason.cache
# input-cache/txcache/cvx.cache
# input-cache/txcache/epsg-ca.cache
# input-cache/txcache/epsg-crs.cache
# input-cache/txcache/http___ncithesaurus-stage.nci.nih.gov.cache
# in... | | UP-226 |
Ted Klein | 7b84b7de39a | step 1 impl prep uP-226 | | |
Ted Klein | e7a8451d8d0M | Merge commit 'faf34aa2f69c70a89ef5e6ae499aded6d94af9a0'# Conflicts:
# input-cache/schemas/R5/fhir-single.xsd
# input-cache/txcache/MSH.cache
# input-cache/txcache/all-systems.cache
# input-cache/txcache/appointment-cancellation-reason.cache
# input-cache/txcache/cvx.cache
# input-cache/txcache/http___nucc.org_provider-taxonomy.cache
# input-cache/txcache/http___unstats.un.org_unsd_methods_m49_m49.htm.cache
# input-cache/txcache/iso3166-2.cache
# in... | | |
Ted Klein | 5c07340efad | Merge commit 'faf34aa2f69c70a89ef5e6ae499aded6d94af9a0'# Conflicts:
# input-cache/schemas/R5/fhir-single.xsd
# input-cache/txcache/MSH.cache
# input-cache/txcache/all-systems.cache
# input-cache/txcache/appointment-cancellation-reason.cache
# input-cache/txcache/cvx.cache
# input-cache/txcache/http___nucc.org_provider-taxonomy.cache
# input-cache/txcache/http___unstats.un.org_unsd_methods_m49_m49.htm.cache
# input-cache/txcache/iso3166-2.cache
# in... | | |
Ted Klein | faf34aa2f69 | final corrections | | |
Ted Klein | 1945fe00305 | correct special URL parameter | | |
Ted Klein | d4f4afd1c7cM | Merge branch 'master' of https://github.com/HL7/UTG | | |
Ted Klein | d69948b5878 | final prep step for impl | | |
Ted Klein | cac6fa20a9b | update of template control | | |
Ted Klein | 8b37128c648 | tickle it once again | | |
 Grahame Grieve | b167c79c3daM | Merge branch 'master' of https://github.com/HL7/UTG | | |
Grahame Grieve | 614a2e00e23 | fix UTG build | | |
Ted Klein | d3f85dc754d | retrigger build to see if template error (which does not occur in local build) was a transient failure | | |
Ted Klein | 0b4b290224d | Merge commit '082065d3f692f1a85d366d0719eeaaf9b0a8e7a3' into UP-219-clone-create-present-on-admission-indicators-value-set# Conflicts:
# input-cache/schemas/R5/fhir-single.xsd
# input-cache/txcache/EPSG-GeodeticParameterDataset.cache
# input-cache/txcache/MSH.cache
# input-cache/txcache/SCDHEC-GISSpatialAccuracyTiers.cache
# input-cache/txcache/all-systems.cache
# input-cache/txcache/appointment-cancellation-reason.cache
# input-cache/txcache/cvx.cache
# input-cache/txcache/epsg-ca.cache
# input-cache/txcache/epsg... | | UP-219 |
Ted Klein | 3959cdad51d | Step 1A for impl | | |
Ted Klein | 5eff536b373 | Step 1 prep for implementtion | | |
Ted Klein | 082065d3f69 | step 3 correct hx entries | | |
Ted Klein | a3c02c2ae6b | step 2 label and version update | | |
Ted Klein | fc3cfb9e77a | step 1 prep for impl merge | | |
Ted Klein | ba53b5ee142M | Merge commit 'bdde0b5fc0b857e02a62134d3d16bebe3a0be605' into UP-208-update-status-on-opinions-to-active# Conflicts:
# input-cache/txcache/EPSG-GeodeticParameterDataset.cache
# input-cache/txcache/MSH.cache
# input-cache/txcache/SCDHEC-GISSpatialAccuracyTiers.cache
# input-cache/txcache/appointment-cancellation-reason.cache
# input-cache/txcache/cvx.cache
# input-cache/txcache/epsg-ca.cache
# input-cache/txcache/epsg-crs.cache
# input-cache/txcache/http___ncithesaurus-stage.nci.nih.gov.cache
# in... | | UP-208 |
