diff --git a/platform/docs/docs/README.md b/platform/docs/docs/README.md
index aa29e7dcd..47043a157 100644
--- a/platform/docs/docs/README.md
+++ b/platform/docs/docs/README.md
@@ -87,8 +87,8 @@ Below, you can find the gap analysis between the `OHIF-v2` and `OHIF-v3`:
| OpenID Connect standard authentication flow for connecting to identity providers |
- 🔜 |
- In Progress |
+ ✅ |
+ |
| Internationalization |
@@ -100,6 +100,16 @@ Below, you can find the gap analysis between the `OHIF-v2` and `OHIF-v3`:
✅ |
|
+
+ | White-labelling: Easily replace the OHIF Logo with your logo |
+ ✅ |
+ |
+
+
+ | DICOM Whole-slide imaging viewport |
+ 🔜 |
+ In Progress |
+
| IHE Invoke Image Display - Standard-compliant launching of the viewer (e.g. from PACS or RIS) |
🔜 |
@@ -110,11 +120,6 @@ Below, you can find the gap analysis between the `OHIF-v2` and `OHIF-v3`:
🔜 |
Not Started |
-
- | DICOM Whole-slide imaging viewport |
- 🔜 |
- In Progress |
-
| Displaying non-renderable DICOM as HTML |
🔜 |
@@ -130,11 +135,6 @@ Below, you can find the gap analysis between the `OHIF-v2` and `OHIF-v3`:
🔜 |
Not Started |
-
- | White-labelling: Easily replace the OHIF Logo with your logo |
- ✅ |
- |
-
| DICOM upload to PACS |
🔜 |
@@ -148,7 +148,7 @@ Below, you can find the gap analysis between the `OHIF-v2` and `OHIF-v3`:
| VTK Extension + MIP / MPR layout |
❌ |
- Other plans |
+ Other plans that involves amazing news soon! |
| UMD Build (Embedded Viewer). |
diff --git a/platform/docs/docs/architecture.md b/platform/docs/docs/architecture.md
index 8415c4a96..d3480f9dc 100644
--- a/platform/docs/docs/architecture.md
+++ b/platform/docs/docs/architecture.md
@@ -200,7 +200,7 @@ your functionality in one of the modules of your new extension, and let the mod
[viewer-npm]: https://www.npmjs.com/package/@ohif/viewer
[pwa]: https://developers.google.com/web/progressive-web-apps/
[configuration]: ./configuring/index.md
-[extensions]: ../extensions/index.md
+[extensions]: ./extensions/index.md
[core-github]: https://github.com/OHIF/viewers/platform/core
[ui-github]: https://github.com/OHIF/Viewers/tree/master/platform/ui
diff --git a/platform/docs/docs/assets/img/SR-exported.png b/platform/docs/docs/assets/img/SR-exported.png
new file mode 100644
index 000000000..fc477adf6
Binary files /dev/null and b/platform/docs/docs/assets/img/SR-exported.png differ
diff --git a/platform/docs/docs/assets/img/locked-sr.png b/platform/docs/docs/assets/img/locked-sr.png
new file mode 100644
index 000000000..3c6ba7d53
Binary files /dev/null and b/platform/docs/docs/assets/img/locked-sr.png differ
diff --git a/platform/docs/docs/assets/img/restore-exported-sr.png b/platform/docs/docs/assets/img/restore-exported-sr.png
new file mode 100644
index 000000000..7aeca2692
Binary files /dev/null and b/platform/docs/docs/assets/img/restore-exported-sr.png differ
diff --git a/platform/docs/docs/assets/img/tracked-not-tracked.png b/platform/docs/docs/assets/img/tracked-not-tracked.png
new file mode 100644
index 000000000..d61b36d7e
Binary files /dev/null and b/platform/docs/docs/assets/img/tracked-not-tracked.png differ
diff --git a/platform/docs/docs/assets/img/tracking-workflow1.png b/platform/docs/docs/assets/img/tracking-workflow1.png
new file mode 100644
index 000000000..d5b5959fa
Binary files /dev/null and b/platform/docs/docs/assets/img/tracking-workflow1.png differ
diff --git a/platform/docs/docs/assets/img/tracking-workflow2.png b/platform/docs/docs/assets/img/tracking-workflow2.png
new file mode 100644
index 000000000..988e56d4b
Binary files /dev/null and b/platform/docs/docs/assets/img/tracking-workflow2.png differ
diff --git a/platform/docs/docs/assets/img/tracking-workflow3.png b/platform/docs/docs/assets/img/tracking-workflow3.png
new file mode 100644
index 000000000..c62fde75c
Binary files /dev/null and b/platform/docs/docs/assets/img/tracking-workflow3.png differ
diff --git a/platform/docs/docs/deployment/index.md b/platform/docs/docs/deployment/index.md
index 1245e4464..997a4f51f 100644
--- a/platform/docs/docs/deployment/index.md
+++ b/platform/docs/docs/deployment/index.md
@@ -57,7 +57,7 @@ deployment experience.
"Building", or creating, the files you will need is the same regardless of the
web host you choose. You can find detailed instructions on how to configure and
build the OHIF Viewer in our
-["Build for Production" guide](./recipes/build-for-production.md).
+["Build for Production" guide](./build-for-production.md).
##### Part 2 - Host Your App
@@ -67,18 +67,18 @@ via one of these guides:
_Drag-n-drop_
-- [Netlify: Drop](/deployment/recipes/static-assets.md#netlify-drop)
+- [Netlify: Drop](./static-assets.md#netlify-drop)
_Easy_
-- [Surge.sh](/deployment/recipes/static-assets.md#surgesh)
-- [GitHub Pages](/deployment/recipes/static-assets.md#github-pages)
+- [Surge.sh](./static-assets.md#surgesh)
+- [GitHub Pages](./static-assets.md#github-pages)
_Advanced_
-- [AWS S3 + Cloudfront](/deployment/recipes/static-assets.md#aws-s3--cloudfront)
-- [GCP + Cloudflare](/deployment/recipes/static-assets.md#gcp--cloudflare)
-- [Azure](/deployment/recipes/static-assets.md#azure)
+- [AWS S3 + Cloudfront](./static-assets.md#aws-s3--cloudfront)
+- [GCP + Cloudflare](./static-assets.md#gcp--cloudflare)
+- [Azure](./static-assets.md#azure)
## Data
@@ -120,7 +120,7 @@ There are two important steps to making sure this setup works:
Most image archives do not provide either of these features "out of the box".
It's common to use IIS, Nginx, or Apache to route incoming requests and append
appropriate headers. You can find an example of this setup in our
-[Nginx + Image Archive Deployment Recipe](./recipes/nginx--image-archive.md).
+[Nginx + Image Archive Deployment Recipe](./nginx--image-archive.md).
#### What if my archive doesn't support DicomWeb?
@@ -264,7 +264,7 @@ window.config = {
```
You can find an example of this setup in our
-[User Account Control Deployment Recipe](./recipes/user-account-control.md).
+[User Account Control Deployment Recipe](./user-account-control.md).
#### Choosing a Flow for the Viewer
@@ -283,10 +283,10 @@ many possible configurations, so please don't feel limited to these setups.
Please feel free to suggest or contribute your own recipes.
-- [Build for Production](./recipes/build-for-production.md)
-- [Static](./recipes/static-assets.md)
-- [Nginx + Image Archive](./recipes/nginx--image-archive.md)
-- [User Account Control](./recipes/user-account-control.md)
+- [Build for Production](./build-for-production.md)
+- [Static](./static-assets.md)
+- [Nginx + Image Archive](./nginx--image-archive.md)
+- [User Account Control](./user-account-control.md)
diff --git a/platform/docs/versioned_docs/version-2.0/development/contributing.md b/platform/docs/versioned_docs/version-2.0/development/contributing.md
index cc64fd317..53f687e20 100644
--- a/platform/docs/versioned_docs/version-2.0/development/contributing.md
+++ b/platform/docs/versioned_docs/version-2.0/development/contributing.md
@@ -12,7 +12,7 @@ should be implemented, please don't hesitate to create a new issue. At a
minimum, you may want to read the following documentation:
- [Getting Started](./getting-started.md)
-- [Architecture](../architecture/index.md)
+- [Architecture](../Architecture.md)
Pull requests that are:
diff --git a/platform/docs/versioned_docs/version-2.0/services/index.md b/platform/docs/versioned_docs/version-2.0/services/index.md
index c26a8165c..52960a8ea 100644
--- a/platform/docs/versioned_docs/version-2.0/services/index.md
+++ b/platform/docs/versioned_docs/version-2.0/services/index.md
@@ -29,7 +29,7 @@ them different below:
Services are a work in progress. As we are still in the progress of creating a
non-ui maintained service, this usage may change.
-[You can read more about default services: here](./default/index.md)
+[You can read more about default services: here](./default.md)
### UI Services
diff --git a/yarn.lock b/yarn.lock
index d43bc9c91..87faf5e47 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1210,27 +1210,13 @@
core-js-pure "^3.14.0"
regenerator-runtime "^0.13.4"
-"@babel/runtime@7.1.2":
- version "7.1.2"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.1.2.tgz#81c89935f4647706fc54541145e6b4ecfef4b8e3"
- integrity sha512-Y3SCjmhSupzFB6wcv1KmmFucH6gDVnI30WjOcicV10ju0cZjak3Jcs67YLIXBrmZYw1xCrVeJPbycFwrqNyxpg==
- dependencies:
- regenerator-runtime "^0.12.0"
-
-"@babel/runtime@7.7.6", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4":
+"@babel/runtime@7.1.2", "@babel/runtime@7.7.6", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2", "@babel/runtime@^7.9.6":
version "7.7.6"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.6.tgz#d18c511121aff1b4f2cd1d452f1bac9601dd830f"
integrity sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw==
dependencies:
regenerator-runtime "^0.13.2"
-"@babel/runtime@^7.10.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2", "@babel/runtime@^7.9.6":
- version "7.14.6"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.6.tgz#535203bc0892efc7dec60bdc27b2ecf6e409062d"
- integrity sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==
- dependencies:
- regenerator-runtime "^0.13.4"
-
"@babel/standalone@^7.12.6", "@babel/standalone@^7.4.5":
version "7.14.6"
resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.14.6.tgz#9070bd3cc2bb997d42e14bdf3b0d24a11b00242b"
@@ -19901,11 +19887,6 @@ regenerator-runtime@^0.11.0:
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
-regenerator-runtime@^0.12.0:
- version "0.12.1"
- resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
- integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
-
regenerator-runtime@^0.13.1, regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4:
version "0.13.7"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"