Ted Klein | eb39945fd12 | final changes to implement UP-239 | | UP-239 |
Ted Klein | a28c5f537c6 | final impl merge | | |
Ted Klein | 71e83a9012cM | Merge commit '1848a154b2da4a5144853372eed1a311fd5a754d' into UP-239-unify-and-update-cvx-per-hta# 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-239 |
Ted Klein | 1848a154b2d | clear cache | | |
Ted Klein | 72578590aa6 | step 3 impl update version and UTG audit records | | |
Ted Klein | 51bd9b3b1f3 | step 2 impl merge git trunk into branch | | |
Ted Klein | 9563a05bc18M | Merge commit '6e9f407af414835d9d6f20d42e5926611492c911' into UP-218-update-mesh-per-hta# 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-218 |
Ted Klein | f07f27dde3c | step 1 impl prep | | |
Ted Klein | 6e9f407af41 | Update some UI wording as per TSMG direction | | |
Ted Klein | 7476808157d | something screwy with the sequence of builds | | |
Ted Klein | e763284ca41 | forgot to bump the version | | |
Ted Klein | f650544bcdb | tickle it to force rebuild | | |
Ted Klein | eff47f1083f | step 2 impl label and merge issues | | |
Ted Klein | 24d8af8b0d0M | Merge commit '8417e8e699ee417f7bb69f901b76b9eef0e8cb48' into UP-238-update-preferred-uri-for-hcdin# 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-238 |
Ted Klein | cf59e9d11c3 | step 1 prep for impl; update label and version prior to SoT merge | | |
Ted Klein | beb8f8fc4d9 | prep for QA | | |
Ted Klein | 049b0a18821 | band aid to get going on the damn thing | | |
Jessica Bota-Admin | c89f16d850b | Added pointer from retired code system to active code system for CVX. | | |
Ted Klein | 8417e8e699e | final impl step | | |
Ted Klein | 957aa7ccbfe | fix hx entries broken by the uri change | | |
Ted Klein | 00b4ebd7b92 | send for QA, old hx files not yet fixed with new URI value | | |
Ted Klein | 45d837c3b0a | prep for QA review | | |
Ted Klein | d36d223ee68 | oops forgot to update the version | | |
Ted Klein | 832f337f3e9 | final merge step | | |
Jessica Bota-Admin | d1979f6b6dd | Updating changes to unify the CVX code system resources and naming system for UP-239. | | UP-239 |
Ted Klein | 00887ff6023 | cache conflicts | | |
Ted Klein | fa12a0e294c | final real conflicts | | |
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 |
Jessica Bota-Admin | 803562e84ac | Updated HcDIN preferred URI per UP-238. | | UP-238 |
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 | | |