Merge branch 'master' into chore/core-cleanup

2019-08-22 09:32:07 -04:00
commit 84cd2237c5
@@ -69,7 +69,7 @@ services:
    #   - orthanc
    environment:
      - NODE_ENV=production
-      - REACT_APP_CONFIG=config/local_dcm4chee
+      - APP_CONFIG=config/local_dcm4chee
    restart: always
    networks:
      - dcm4che_default
@@ -28,7 +28,7 @@ FROM node:11.2.0-slim as builder
 RUN mkdir /usr/src/app
 WORKDIR /usr/src/app

-ENV REACT_APP_CONFIG=config/docker_openresty-orthanc-keycloak.js
+ENV APP_CONFIG=config/docker_openresty-orthanc-keycloak.js
 ENV PATH /usr/src/app/node_modules/.bin:$PATH

 COPY package.json /usr/src/app/package.json
@@ -28,7 +28,7 @@ FROM node:11.2.0-slim as builder
 RUN mkdir /usr/src/app
 WORKDIR /usr/src/app

-ENV REACT_APP_CONFIG=config/docker_openresty-orthanc.js
+ENV APP_CONFIG=config/docker_openresty-orthanc.js
 ENV PATH /usr/src/app/node_modules/.bin:$PATH

 COPY package.json /usr/src/app/package.json
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [0.50.5](https://github.com/OHIF/Viewers/compare/@ohif/viewer@0.50.4...@ohif/viewer@0.50.5) (2019-08-21)
+
+
+### Bug Fixes
+
+* **StandaloneRouting:** Promise rejection - added `return` ([#791](https://github.com/OHIF/Viewers/issues/791)) ([d09fb4e](https://github.com/OHIF/Viewers/commit/d09fb4e))
+
+
+
+
+
+## [0.50.4](https://github.com/OHIF/Viewers/compare/@ohif/viewer@0.50.3...@ohif/viewer@0.50.4) (2019-08-20)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
 ## [0.50.3](https://github.com/OHIF/Viewers/compare/@ohif/viewer@0.50.2...@ohif/viewer@0.50.3) (2019-08-15)

 **Note:** Version bump only for package @ohif/viewer
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/viewer",
-  "version": "0.50.3",
+  "version": "0.50.5",
  "description": "OHIF Viewer",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -26,7 +26,7 @@ class StandaloneRouting extends Component {
      const url = query.url;

      if (!url) {
-        reject(new Error("No URL was specified. Use ?url=$yourURL"));
+        return reject(new Error("No URL was specified. Use ?url=$yourURL"));
      }

      // Define a request to the server to retrieve the study data