Skip to content

Commit

Permalink
Updating references of master to main (#512)
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonpollett authored Jan 25, 2021
1 parent 78d19d0 commit 0eaa61d
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 18 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ name: build-docker-files
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

jobs:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Medical Imaging Server for DICOM

[![Build Status](https://microsofthealthoss.visualstudio.com/DicomServer/_apis/build/status/CI-Build-OSS?branchName=master)](https://microsofthealthoss.visualstudio.com/DicomServer/_build/latest?definitionId=34&branchName=master)
[![Build Status](https://microsofthealthoss.visualstudio.com/DicomServer/_apis/build/status/CI-Build-OSS?branchName=main)](https://microsofthealthoss.visualstudio.com/DicomServer/_build/latest?definitionId=34&branchName=main)

The Medical Imaging Server for DICOM is an open source DICOM server that is easily deployed on Azure. It allows standards-based communication with any DICOMweb™ enabled systems, and injects DICOM metadata into a FHIR server to create a holistic view of patient data. The Medical Imaging Server for DICOM integrates tightly with the [FHIR Server for Azure](https://github.com/microsoft/fhir-server) enabling healthcare professionals, ISVs, and medical device vendors to create new and innovative solutions. FHIR is becoming an important standard for clinical data and provides extensibility to support integration of other types of data directly, or through references. By using the Medical Imaging Server for DICOM, organizations can store references to imaging data in FHIR and enable queries across clinical and imaging datasets.

Expand Down
2 changes: 1 addition & 1 deletion build/.vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ variables:
trigger:
branches:
include:
- master
- main

pr: none

Expand Down
4 changes: 2 additions & 2 deletions docs/quickstarts/deploy-dicom-cast.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ If you have not yet deployed a DICOM or FHIR Server, you can use use a single AR

For a simplified quick deploy, click the link below to deploy to Azure:

<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fdicom-server%2Fmaster%2Fsamples%2Ftemplates%2Fdicomcast-quick-deploy.json" target="_blank">
<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fdicom-server%2Fmain%2Fsamples%2Ftemplates%2Fdicomcast-quick-deploy.json" target="_blank">
<img src="https://aka.ms/deploytoazurebutton"/>
</a>

> NOTE: this option is ideal to quickly set up DICOM Cast. If you want to customize configuration, you will need to do so after deployment.
If you want to customize all DICOM, FHIR and DICOM Cast settings during deployment, click the link below to deploy to Azure:

<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fdicom-server%2Fmaster%2Fsamples%2Ftemplates%2Fdicomcast-fhir-dicom-azuredeploy.json" target="_blank">
<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fdicom-server%2Fmain%2Fsamples%2Ftemplates%2Fdicomcast-fhir-dicom-azuredeploy.json" target="_blank">
<img src="https://aka.ms/deploytoazurebutton"/>
</a>

Expand Down
12 changes: 6 additions & 6 deletions docs/resources/Conformance-as-Postman.postman_collection.json
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@
}
]
},
"description": "This request enables searches for studies, series and instances by DICOM attributes.\r\n\r\n> Please see the [Conformance.md](https://github.com/microsoft/dicom-server/blob/master/docs/users/Conformance.md) file for supported DICOM attributes.\r\n\r\n_Details:_\r\n* Path: ../studies?StudyInstanceUID={{study1}}\r\n* Method: GET\r\n* Headers:\r\n * `Accept: application/dicom+json`\r\n"
"description": "This request enables searches for studies, series and instances by DICOM attributes.\r\n\r\n> Please see the [Conformance.md](https://github.com/microsoft/dicom-server/blob/main/docs/users/Conformance.md) file for supported DICOM attributes.\r\n\r\n_Details:_\r\n* Path: ../studies?StudyInstanceUID={{study1}}\r\n* Method: GET\r\n* Headers:\r\n * `Accept: application/dicom+json`\r\n"
},
"response": []
},
Expand Down Expand Up @@ -623,7 +623,7 @@
}
]
},
"description": "This request enables searches for one or more series by DICOM attributes.\r\n\r\n> Please see the [Conformance.md](https://github.com/microsoft/dicom-server/blob/master/docs/users/Conformance.md) file for supported DICOM attributes.\r\n\r\n_Details:_\r\n* Path: ../series?SeriesInstanceUID={{series}}\r\n* Method: GET\r\n* Headers:\r\n * `Accept: application/dicom+json`\r\n"
"description": "This request enables searches for one or more series by DICOM attributes.\r\n\r\n> Please see the [Conformance.md](https://github.com/microsoft/dicom-server/blob/main/docs/users/Conformance.md) file for supported DICOM attributes.\r\n\r\n_Details:_\r\n* Path: ../series?SeriesInstanceUID={{series}}\r\n* Method: GET\r\n* Headers:\r\n * `Accept: application/dicom+json`\r\n"
},
"response": []
},
Expand Down Expand Up @@ -655,7 +655,7 @@
}
]
},
"description": "This request enables searches for one or more series within a single study by DICOM attributes.\r\n\r\n> Please see the [Conformance.md](https://github.com/microsoft/dicom-server/blob/master/docs/users/Conformance.md) file for supported DICOM attributes.\r\n\r\n_Details:_\r\n* Path: ../studies/{{study}}/series?SeriesInstanceUID={{series}}\r\n* Method: GET\r\n* Headers:\r\n * `Accept: application/dicom+json`\r\n"
"description": "This request enables searches for one or more series within a single study by DICOM attributes.\r\n\r\n> Please see the [Conformance.md](https://github.com/microsoft/dicom-server/blob/main/docs/users/Conformance.md) file for supported DICOM attributes.\r\n\r\n_Details:_\r\n* Path: ../studies/{{study}}/series?SeriesInstanceUID={{series}}\r\n* Method: GET\r\n* Headers:\r\n * `Accept: application/dicom+json`\r\n"
},
"response": []
},
Expand Down Expand Up @@ -690,7 +690,7 @@
}
]
},
"description": "This request enables searches for one or more instances by DICOM attributes.\r\n\r\n> Please see the [Conformance.md](https://github.com/microsoft/dicom-server/blob/master/docs/users/Conformance.md) file for supported DICOM attributes.\r\n\r\n_Details:_\r\n* Path: ../instances?SOPInstanceUID={{instance}}\r\n* Method: GET\r\n* Headers:\r\n * `Accept: application/dicom+json`\r\n"
"description": "This request enables searches for one or more instances by DICOM attributes.\r\n\r\n> Please see the [Conformance.md](https://github.com/microsoft/dicom-server/blob/main/docs/users/Conformance.md) file for supported DICOM attributes.\r\n\r\n_Details:_\r\n* Path: ../instances?SOPInstanceUID={{instance}}\r\n* Method: GET\r\n* Headers:\r\n * `Accept: application/dicom+json`\r\n"
},
"response": []
},
Expand Down Expand Up @@ -727,7 +727,7 @@
}
]
},
"description": "This request enables searches for one or more instances within a single study by DICOM attributes.\r\n\r\n> Please see the [Conformance.md](https://github.com/microsoft/dicom-server/blob/master/docs/users/Conformance.md) file for supported DICOM attributes.\r\n\r\n_Details:_\r\n* Path: ../studies/{{study}}/instances?SOPInstanceUID={{instance}}\r\n* Method: GET\r\n* Headers:\r\n * `Accept: application/dicom+json`"
"description": "This request enables searches for one or more instances within a single study by DICOM attributes.\r\n\r\n> Please see the [Conformance.md](https://github.com/microsoft/dicom-server/blob/main/docs/users/Conformance.md) file for supported DICOM attributes.\r\n\r\n_Details:_\r\n* Path: ../studies/{{study}}/instances?SOPInstanceUID={{instance}}\r\n* Method: GET\r\n* Headers:\r\n * `Accept: application/dicom+json`"
},
"response": []
},
Expand Down Expand Up @@ -766,7 +766,7 @@
}
]
},
"description": "This request enables searches for one or more instances within a single study and single series by DICOM attributes.\r\n\r\n> Please see the [Conformance.md](https://github.com/microsoft/dicom-server/blob/master/docs/users/Conformance.md) file for supported DICOM attributes.\r\n\r\n_Details:_\r\n* Path: ../studies/{{study}}/series/{{series}}instances?SOPInstanceUID={{instance}}\r\n* Method: GET\r\n* Headers:\r\n * `Accept: application/dicom+json`"
"description": "This request enables searches for one or more instances within a single study and single series by DICOM attributes.\r\n\r\n> Please see the [Conformance.md](https://github.com/microsoft/dicom-server/blob/main/docs/users/Conformance.md) file for supported DICOM attributes.\r\n\r\n_Details:_\r\n* Path: ../studies/{{study}}/series/{{series}}instances?SOPInstanceUID={{instance}}\r\n* Method: GET\r\n* Headers:\r\n * `Accept: application/dicom+json`"
},
"response": []
},
Expand Down
4 changes: 2 additions & 2 deletions samples/templates/dicomcast-fhir-dicom-azuredeploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
"properties": {
"mode": "Incremental",
"templateLink": {
"uri":"https://raw.githubusercontent.com/microsoft/dicom-server/master/samples/templates/default-azuredeploy.json",
"uri":"https://raw.githubusercontent.com/microsoft/dicom-server/main/samples/templates/default-azuredeploy.json",
"contentVersion":"1.0.0.0"
},
"parameters":{
Expand Down Expand Up @@ -370,7 +370,7 @@
"properties": {
"mode": "Incremental",
"templateLink": {
"uri":"https://raw.githubusercontent.com/microsoft/dicom-server/master/converter/dicom-cast/samples/templates/default-azuredeploy.json",
"uri":"https://raw.githubusercontent.com/microsoft/dicom-server/main/converter/dicom-cast/samples/templates/default-azuredeploy.json",
"contentVersion":"1.0.0.0"
},
"parameters":{
Expand Down
6 changes: 3 additions & 3 deletions samples/templates/dicomcast-quick-deploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"properties": {
"mode": "Incremental",
"templateLink": {
"uri":"https://raw.githubusercontent.com/microsoft/dicom-server/master/samples/templates/default-azuredeploy.json",
"uri":"https://raw.githubusercontent.com/microsoft/dicom-server/main/samples/templates/default-azuredeploy.json",
"contentVersion":"1.0.0.0"
},
"parameters":{
Expand All @@ -71,7 +71,7 @@
"properties": {
"mode": "Incremental",
"templateLink": {
"uri":"https://raw.githubusercontent.com/microsoft/fhir-server/master/samples/templates/default-azuredeploy.json",
"uri":"https://raw.githubusercontent.com/microsoft/fhir-server/main/samples/templates/default-azuredeploy.json",
"contentVersion":"1.0.0.0"
},
"parameters":{
Expand Down Expand Up @@ -100,7 +100,7 @@
"properties": {
"mode": "Incremental",
"templateLink": {
"uri":"https://raw.githubusercontent.com/microsoft/dicom-server/master/converter/dicom-cast/samples/templates/default-azuredeploy.json",
"uri":"https://raw.githubusercontent.com/microsoft/dicom-server/main/converter/dicom-cast/samples/templates/default-azuredeploy.json",
"contentVersion":"1.0.0.0"
},
"parameters":{
Expand Down
2 changes: 1 addition & 1 deletion tools/dicom-web-electron/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ You can get sample DICOM files at [../../docs/dcms](../../docs/dcms)

## Change Feed

The change feed offers the ability to go through the history of the Medical Imaging Server for DICOM and act upon the creates and deletes in the service. Learn more about Change Feed [here](https://github.com/microsoft/dicom-server/blob/master/docs/users/ChangeFeed.md).
The change feed offers the ability to go through the history of the Medical Imaging Server for DICOM and act upon the creates and deletes in the service. Learn more about Change Feed [here](https://github.com/microsoft/dicom-server/blob/main/docs/users/ChangeFeed.md).

Navigate to Change Feed to update the Offset value, which is the number of records to skip before the values to return.

Expand Down

0 comments on commit 0eaa61d

Please sign in to comment.