Merge branch 'master' of https://github.com/OHIF/Viewers into feature/i18n-basics

# Conflicts:
#	extensions/ohif-vtk-extension/package.json
#	extensions/ohif-vtk-extension/rollup.config.js
#	extensions/ohif-vtk-extension/yarn.lock
#	package.json
#	src/App.js
#	src/components/Header/Header.js
#	yarn.lock
This commit is contained in:
romulo bordezani committed 2019-06-10 14:54:18 -03:00
1 parent 0753e9ec3c
commit d5909f8d74
9 files changed
+39 -10

No files matched your search

+14 -5
View File
@@ -1042,8 +1042,16 @@
classnames "^2.2.6"
react-vtkjs-viewport "^0.0.7"
"@ohif/i18n@0.0.1-rc-001":
version "0.0.1-rc-001"
resolved "https://registry.yarnpkg.com/@ohif/i18n/-/i18n-0.0.1-rc-001.tgz#47286daa1411efb5f0219f0310484c8919bfe607"
integrity sha512-CJ9wqd15DpJ6adVMyXkyqQqcRZgSnMWJ7L3WyUpMqf66CvAFKzCUuckyiFeCupIq8ZGv7w4jaADSYKrLcpviUw==
dependencies:
"@babel/runtime" "^7.2.0"
classnames "^2.2.6"
"@ohif/i18n@file:.yalc/@ohif/i18n":
version "0.0.2-4597feaf"
version "0.0.2-a44efe70"
dependencies:
"@babel/runtime" "^7.2.0"
classnames "^2.2.6"
@@ -11788,13 +11796,13 @@ react-transition-group@^2.0.0, react-transition-group@^2.2.0:
prop-types "^15.6.2"
react-lifecycles-compat "^3.0.4"
react-viewerbase@0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/react-viewerbase/-/react-viewerbase-0.7.0.tgz#b0f48a0f003b849c280b8ca67927d4780c68b0dc"
integrity sha512-1VQXREKSsqxtOSSHRou0gjBODrSOjE8SBJ6/dHG0gPgdmeotOg68xPMKYf9K7fYyGZ6CDA7oVCAmdTE4SVYP5Q==
"react-viewerbase@file:.yalc/react-viewerbase":
version "0.2.17-bffd4836"
dependencies:
"@babel/runtime" "7.2.0"
"@ohif/i18n" "0.0.1-rc-001"
classnames "2.2.6"
i18next "^17.0.3"
lodash.isequal "4.5.0"
moment "2.24.0"
prop-types "15.6.2"
@@ -11802,6 +11810,7 @@ react-viewerbase@0.7.0:
react-dates "18.4.1"
react-dnd "7.0.2"
react-dnd-html5-backend "7.0.2"
react-i18next "^10.11.0"
react-with-direction "1.3.0"
react-vtkjs-viewport@^0.0.7: