From e8c6cf31c2c0e54559466f93275d2dfb65e86cd1 Mon Sep 17 00:00:00 2001 From: weiwei Date: Thu, 9 Jun 2016 11:12:42 -0500 Subject: [PATCH] upgrade to 1.3 --- OHIFViewer/.meteor/.finished-upgraders | 1 + OHIFViewer/.meteor/packages | 3 +- OHIFViewer/.meteor/release | 2 +- OHIFViewer/.meteor/versions | 153 +++++++++++++------------ Packages/viewerbase/package.js | 2 +- config/medkenOrthanc.json | 20 ++++ 6 files changed, 104 insertions(+), 77 deletions(-) mode change 100644 => 100755 OHIFViewer/.meteor/packages mode change 100644 => 100755 OHIFViewer/.meteor/release mode change 100644 => 100755 OHIFViewer/.meteor/versions diff --git a/OHIFViewer/.meteor/.finished-upgraders b/OHIFViewer/.meteor/.finished-upgraders index 61ee31323..dacc2c0d7 100644 --- a/OHIFViewer/.meteor/.finished-upgraders +++ b/OHIFViewer/.meteor/.finished-upgraders @@ -10,3 +10,4 @@ notices-for-facebook-graph-api-2 1.2.0-meteor-platform-split 1.2.0-cordova-changes 1.2.0-breaking-changes +1.3.0-split-minifiers-package diff --git a/OHIFViewer/.meteor/packages b/OHIFViewer/.meteor/packages old mode 100644 new mode 100755 index 51c8549f2..b6bdcb275 --- a/OHIFViewer/.meteor/packages +++ b/OHIFViewer/.meteor/packages @@ -11,7 +11,6 @@ promise stylus fortawesome:fontawesome mrt:moment -standard-minifiers meteor-base mobile-experience mongo @@ -36,3 +35,5 @@ reactive-dict gilbertwat:bootstrap3-daterangepicker clinical:router fastclick +standard-minifier-css +standard-minifier-js diff --git a/OHIFViewer/.meteor/release b/OHIFViewer/.meteor/release old mode 100644 new mode 100755 index 3a05e0a2f..940e0b5d4 --- a/OHIFViewer/.meteor/release +++ b/OHIFViewer/.meteor/release @@ -1 +1 @@ -METEOR@1.2.1 +METEOR@1.3.2.4 diff --git a/OHIFViewer/.meteor/versions b/OHIFViewer/.meteor/versions old mode 100644 new mode 100755 index 96391e615..5a162a96e --- a/OHIFViewer/.meteor/versions +++ b/OHIFViewer/.meteor/versions @@ -1,93 +1,98 @@ +allow-deny@1.0.4 arsnebula:reactive-promise@0.9.1 -autoupdate@1.2.4 -babel-compiler@5.8.24_1 -babel-runtime@0.1.4 -base64@1.0.4 -binary-heap@1.0.4 -blaze@2.1.3 -blaze-html-templates@1.0.1 -blaze-tools@1.0.4 -boilerplate-generator@1.0.4 -caching-compiler@1.0.0 -caching-html-compiler@1.0.2 -callback-hook@1.0.4 -check@1.1.0 -clinical:router@2.0.17 -clinical:router-location@2.0.14 +autoupdate@1.2.9 +babel-compiler@6.6.4 +babel-runtime@0.1.8 +base64@1.0.8 +binary-heap@1.0.8 +blaze@2.1.7 +blaze-html-templates@1.0.4 +blaze-tools@1.0.8 +boilerplate-generator@1.0.8 +caching-compiler@1.0.4 +caching-html-compiler@1.0.6 +callback-hook@1.0.8 +check@1.2.1 +clinical:router@2.0.18 +clinical:router-location@2.1.0 clinical:router-middleware-stack@2.1.2 clinical:router-url@2.1.0 -coffeescript@1.0.11 +coffeescript@1.0.17 cornerstone@0.0.1 -ddp@1.2.2 -ddp-client@1.2.1 -ddp-common@1.2.2 -ddp-server@1.2.2 -deps@1.0.9 +ddp@1.2.5 +ddp-client@1.2.7 +ddp-common@1.2.5 +ddp-server@1.2.6 +deps@1.0.12 dicomweb@0.0.1 -diff-sequence@1.0.1 +diff-sequence@1.0.5 dimseservice@0.0.1 -ecmascript@0.1.6 -ecmascript-runtime@0.2.6 -ejson@1.0.7 -fastclick@1.0.7 -fortawesome:fontawesome@4.4.0 -geojson-utils@1.0.4 +ecmascript@0.4.3 +ecmascript-runtime@0.2.10 +ejson@1.0.11 +fastclick@1.0.11 +fortawesome:fontawesome@4.5.0 +geojson-utils@1.0.8 gilbertwat:bootstrap3-daterangepicker@1.3.21_1 hangingprotocols@0.0.1 -hot-code-push@1.0.0 -html-tools@1.0.5 -htmljs@1.0.5 -http@1.1.1 -id-map@1.0.4 +hot-code-push@1.0.4 +html-tools@1.0.9 +htmljs@1.0.9 +http@1.1.5 +id-map@1.0.7 iron:controller@1.0.12 iron:core@1.0.11 iron:dynamic-template@1.0.12 iron:layout@1.0.12 -jquery@1.11.4 -launch-screen@1.0.4 -livedata@1.0.15 -logging@1.0.8 -meteor@1.1.10 -meteor-base@1.0.1 -meteor-platform@1.2.3 -minifiers@1.1.7 -minimongo@1.0.10 -mobile-experience@1.0.1 -mobile-status-bar@1.0.6 +jquery@1.11.8 +launch-screen@1.0.11 +livedata@1.0.18 +logging@1.0.12 +meteor@1.1.14 +meteor-base@1.0.4 +meteor-platform@1.2.6 +minifier-css@1.1.11 +minifier-js@1.1.11 +minimongo@1.0.16 +mobile-experience@1.0.4 +mobile-status-bar@1.0.12 +modules@0.6.1 +modules-runtime@0.6.3 momentjs:moment@2.9.0 -mongo@1.1.3 -mongo-id@1.0.1 +mongo@1.1.7 +mongo-id@1.0.4 mrt:moment@2.8.1 -natestrauser:select2@4.0.1 -npm-mongo@1.4.39_1 -observe-sequence@1.0.7 -ordered-dict@1.0.4 +natestrauser:select2@4.0.2 +npm-mongo@1.4.43 +observe-sequence@1.0.11 +ordered-dict@1.0.7 orthanc-remote@0.0.1 -practicalmeteor:chai@1.9.2_3 -practicalmeteor:loglevel@1.1.0_3 -promise@0.5.1 -random@1.0.5 -reactive-dict@1.1.3 -reactive-var@1.0.6 -reload@1.1.4 -retry@1.0.4 -routepolicy@1.0.6 +practicalmeteor:chai@2.1.0_1 +practicalmeteor:loglevel@1.2.0_2 +promise@0.6.7 +random@1.0.9 +reactive-dict@1.1.7 +reactive-var@1.0.9 +reload@1.1.8 +retry@1.0.7 +routepolicy@1.0.10 rwatts:uuid@0.0.2 -session@1.1.1 +session@1.1.5 silentcicero:jszip@0.0.4 -spacebars@1.0.7 -spacebars-compiler@1.0.7 -standard-app-packages@1.0.6 -standard-minifiers@1.0.2 -stylus@2.511.1 -templating@1.1.5 -templating-tools@1.0.0 -tracker@1.0.9 -twbs:bootstrap@3.3.5 -ui@1.0.8 -underscore@1.0.4 -url@1.0.5 +spacebars@1.0.11 +spacebars-compiler@1.0.11 +standard-app-packages@1.0.9 +standard-minifier-css@1.0.6 +standard-minifier-js@1.0.6 +stylus@2.511.5 +templating@1.1.9 +templating-tools@1.0.4 +tracker@1.0.13 +twbs:bootstrap@3.3.6 +ui@1.0.11 +underscore@1.0.8 +url@1.0.9 viewerbase@0.0.1 -webapp@1.2.3 -webapp-hashing@1.0.5 +webapp@1.2.8 +webapp-hashing@1.0.9 worklist@0.0.1 diff --git a/Packages/viewerbase/package.js b/Packages/viewerbase/package.js index b850fe827..401c7ccba 100644 --- a/Packages/viewerbase/package.js +++ b/Packages/viewerbase/package.js @@ -5,7 +5,7 @@ Package.describe({ }); Package.onUse(function(api) { - api.versionsFrom('1.2.1'); + api.versionsFrom(['1.2.1', '1.3.2.4']); api.use('standard-app-packages'); api.use('ecmascript'); diff --git a/config/medkenOrthanc.json b/config/medkenOrthanc.json index 8c142d90b..dcc9b7714 100644 --- a/config/medkenOrthanc.json +++ b/config/medkenOrthanc.json @@ -16,5 +16,25 @@ } } ] + }, + "dimse" : [{ + "host" : "208.100.41.100", + "port" : 4242, + "aeTitle" : "MKORTHANC", + "default": true + },{ + "host" : "0.0.0.0", + "port" : 11112, + "aeTitle" : "OHIFDCM", + "default" : true, + "server" : true + }], + "defaultServiceType": "dimse", + "medkenpanel" : { + "prefix" : "admin" + }, + "fhir" : { + "host" : "localhost", + "port" : 3937 } } \ No newline at end of file