Ted Klein 3c26f911310 typo 11 May 2021 Ted Klein 76616c65e6d fix introduced mismatch error 11 May 2021 Ted Klein 48802127a98 more merge conflicts 11 May 2021 Ted Klein 2e8a7aa7841 step 2 implement UP-189 merge hx file 11 May 2021 UP-189 Ted Klein 4a9aa1d8ce9 step 1 implement UP-189 integrate utg.xml changes 11 May 2021 UP-189 Ted Klein f6d96f17409 M Merge branch 'master' of https://github.com/HL7/UTG into UP-189-add-code-system-and-naming-system-for-source-of-payment-typology-sop # 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/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.c... 11 May 2021 UP-189 Ted Klein 9fe12387bba step zero prep impl UP-189 11 May 2021 UP-189 Ted Klein 5cbb5a5937e step 4 resolve merge conflict issue implement UP-190 11 May 2021 UP-190 Ted Klein 8faae06a3d3 M Merge commit '522694a53caf79e1020b767ed7c88852e141101f' # Conflicts:
# 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/epsg-ca.cache
# input-cache/txcache/epsg-crs.cache
# input-cache/txcache/http___ncithesaurus-stage.nci.nih.gov.ca... 11 May 2021 Ted Klein 522694a53ca Step 2 implement UP-190 update hx entries 11 May 2021 UP-190 Ted Klein 62869d22b89 step 1 implement UP-190 11 May 2021 UP-190 Ted Klein a30ded97e1f spurious comma 05 May 2021 Ted Klein 5a175c97eb0 fix corrupt hx file 04 May 2021 Ted Klein 892d702cd59 step 5 implement UP-195 clear issues with cache and qa temp files 04 May 2021 UP-195 Ted Klein 675ee91483a step 3 implement resolve merge conflicts in master 04 May 2021 Ted Klein 96487bd91db M Merge commit '74dcf518bff9388a6e856e41a8a16d24d1779044' # Conflicts:
# 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/epsg-ca.cache
# input-cache/txcache/epsg-crs.cache
# input-cache/txcache/http___ncithesaurus-stage.nci.nih.gov.ca... 04 May 2021 Ted Klein 74dcf518bff step 1 implement 04 May 2021 Ted Klein 809d21553a6 forgot to update hx file in correct location 21 Apr 2021 Ted Klein 988abcdee0c step 2 pro forma proposal processing 21 Apr 2021 Ted Klein 4b30de0c2c3 step 1 prep pro forma 21 Apr 2021 Jessica Bota-Admin ce312839591 Updated CDT code system and naming system per HTA. Includes updates to utg.xml, v3-Publishing.xml, and external-Rendering.xml. 21 Apr 2021 Ted Klein 487d8fd7eec nex step for content check 19 Apr 2021 Ted Klein cdf1c7d154c another attempt to stage for content check 19 Apr 2021 Ted Klein 51c4bb2c676 stage for content check 19 Apr 2021 Jessica Bota-Admin 716897ff0df M Merge branch 'UP-195-add-codesystem-and-namingsystem-for-canadian-clinical-drug-dataset' of https://bitbucket.hl7.org/scm/utg/utg into UP-195-add-codesystem-and-namingsystem-for-canadian-clinical-drug-dataset 16 Apr 2021 UP-195 Jessica Bota-Admin b7467fcba2b Removed 'responsible' element from CCDD code system. It was causing a build failure as it is not a supported element. 16 Apr 2021 Ted Klein b4ace5b741d check for errors 16 Apr 2021 Ted Klein 073b29ee184 final step in UP-182 impl 15 Apr 2021 UP-182 Ted Klein 785714bed02 step 8 clear all merge conflicts 15 Apr 2021 Ted Klein c3a6a851077 step 7 impl adjust hx entries 15 Apr 2021 Ted Klein ab3222de69d no message 15 Apr 2021 Ted Klein 62f0b0db2d3 step 6 impl 15 Apr 2021 Ted Klein 3db6402d48c step 5 impl 15 Apr 2021 Jessica Bota-Admin 7b8d96faa86 Added new CS and NS for CCDD per HTA. Added special-url value to utg.xml and entry to external-rendering.xml. 15 Apr 2021 Ted Klein 555f0a909a1 step 4 merge conflict resolution 2 15 Apr 2021 Ted Klein cb3df030212 step 3 impl 15 Apr 2021 Ted Klein 056352a721a M step 2 impl merge resolution 1 Merge commit '28df1f82aa8a750cdcaecf9a79266082cc7fc5f0' into UP-182-change-metadata-for-codesystem-and-naming-system-nhsn-surveillance-system-codes-cdcnhsn # 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/epsg-ca.cache
# input-cache/txcache/epsg-crs.cache
# input-cache/txcache... 15 Apr 2021 UP-182 Ted Klein c37940eabc8 step 1 impl 15 Apr 2021 Ted Klein 28df1f82aa8 step 3 impl UP-173 rebuild merged branch to verify 12 Apr 2021 UP-173 Ted Klein a95396b2542 M Merge commit 'ab1ebdcb842505b6b4838151b59e0834b976c897' into UP-173-move-the-composite-code-from-measure-type-to-measure-scoring # Conflicts:
# 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/epsg-ca.cache
# input-cache/txcache/epsg-crs.cache
# input-cache/txcache/http___ncithesaurus-stage.nci.nih.gov.ca... 12 Apr 2021 UP-173 Ted Klein b32aaf31d8f step 1 impl UP-173 check update 12 Apr 2021 UP-173 Ted Klein ab1ebdcb842 M Merge commit '3c5baa17ddc5ceb0f05dfc7d4f32fd9d707d8419' 12 Apr 2021 Ted Klein e6a8fb1ccd3 step 5 implement UP-175 12 Apr 2021 UP-175 Ted Klein 3c5baa17ddc step 4 implement check web build 12 Apr 2021 Ted Klein a9068e56909 step 3 implement 12 Apr 2021 Ted Klein 055f623063d M Merge branch 'master' of https://github.com/HL7/UTG into UP-175-add-new-code-caregap-to-actcode-and-update-detectedissuecategory-value-set-definition # 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.cd... 12 Apr 2021 UP-175 Ted Klein 590b2b549bc step 1 prep for CR 12 Apr 2021 Ted Klein cd7e8acef4b update documentation issue on downloads page 06 Apr 2021 Ted Klein c36bbfb6e59 Prep for QA review 06 Apr 2021 Ted Klein 6cbfe3d2651 fix CS version value 05 Apr 2021