fix(merge) Fixes after merging various changes

2018-07-12 15:22:07 +02:00
1 parent 589be952b7
commit 4279396f9f
@@ -16,3 +16,4 @@ notices-for-facebook-graph-api-2
 1.4.1-add-shell-server-package
 1.4.3-split-account-service-packages
 1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base
@@ -6,24 +6,24 @@

 npm-bcrypt@0.9.3

-meteor-base@1.2.0             # Packages every Meteor app needs to have
+meteor-base@1.4.0             # Packages every Meteor app needs to have
 mobile-experience@1.0.5       # Packages for a great mobile UX
-mongo@1.3.0                  # The database Meteor supports right now
+mongo@1.5.0                  # The database Meteor supports right now
 blaze-html-templates@1.0.4    # Compile .html files into Meteor Blaze views
 session@1.1.7                 # Client-side reactive dictionary for your app
 jquery@1.11.10                 # Helpful client-side library
-tracker@1.1.3                 # Meteor's client-side reactive programming library
-standard-minifier-css@1.3.5
-standard-minifier-js@2.2.0
-http@1.3.0
-promise@0.10.0
+tracker@1.2.0                 # Meteor's client-side reactive programming library
+standard-minifier-css@1.4.1
+standard-minifier-js@2.3.4
+http@1.4.1
+promise@0.11.1
 stylus@2.513.13
-random@1.0.10
+random@1.1.0
 reactive-var@1.0.11
 reactive-dict@1.2.0
-check@1.2.5
+check@1.3.1
 email@1.2.3
-ecmascript@0.9.0              # Enable ECMAScript2015+ syntax in app code
+ecmascript@0.11.1              # Enable ECMAScript2015+ syntax in app code

 clinical:active-entry
 clinical:theming
@@ -51,8 +51,8 @@ ohif:user
 ohif:user-management
 ohif:select-tree

-accounts-base@1.4.0
-accounts-password@1.5.0
+accounts-base@1.4.2
+accounts-password@1.5.1

 fortawesome:fontawesome
 momentjs:moment@2.15.1
@@ -62,4 +62,5 @@ aldeed:collection2
 zuuk:stale-session
 johdirr:meteor-git-rev
 cultofcoders:persistent-session@0.4.4
-shell-server@0.3.0
+shell-server@0.3.1
+underscore
@@ -1 +1 @@
-METEOR@1.6
+METEOR@1.7.0.3
@@ -1,26 +1,26 @@
-accounts-base@1.4.0
-accounts-password@1.5.0
+accounts-base@1.4.2
+accounts-password@1.5.1
 aldeed:collection2@2.10.0
 aldeed:collection2-core@1.2.0
 aldeed:schema-deny@1.1.0
 aldeed:schema-index@1.1.1
-aldeed:simple-schema@1.5.3
+aldeed:simple-schema@1.5.4
 aldeed:template-extension@4.1.0
 allow-deny@1.1.0
 amplify@1.0.0
-autoupdate@1.3.12
-babel-compiler@6.24.7
-babel-runtime@1.1.1
-base64@1.0.10
+autoupdate@1.4.1
+babel-compiler@7.1.1
+babel-runtime@1.2.2
+base64@1.0.11
 binary-heap@1.0.10
 blaze@2.3.2
 blaze-html-templates@1.1.2
 blaze-tools@1.0.10
-boilerplate-generator@1.3.0
-caching-compiler@1.1.9
-caching-html-compiler@1.1.2
-callback-hook@1.0.10
-check@1.2.5
+boilerplate-generator@1.5.0
+caching-compiler@1.1.12
+caching-html-compiler@1.1.3
+callback-hook@1.1.0
+check@1.3.1
 clinical:active-entry@1.5.16
 clinical:auto-resizing@0.2.0
 clinical:fonts@1.1.6
@@ -29,19 +29,20 @@ clinical:hipaa-logger@1.3.0
 clinical:theming@0.4.10
 cultofcoders:persistent-session@0.4.5
 ddp@1.4.0
-ddp-client@2.2.0
-ddp-common@1.3.0
+ddp-client@2.3.3
+ddp-common@1.4.0
 ddp-rate-limiter@1.0.7
-ddp-server@2.1.0
+ddp-server@2.2.0
 deps@1.0.12
-diff-sequence@1.0.7
-dynamic-import@0.2.0
-ecmascript@0.9.0
-ecmascript-runtime@0.5.0
-ecmascript-runtime-client@0.5.0
-ecmascript-runtime-server@0.5.0
+diff-sequence@1.1.0
+dynamic-import@0.4.1
+ecmascript@0.11.1
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.7.1
+ecmascript-runtime-server@0.7.0
 ejson@1.1.0
 email@1.2.3
+es5-shim@4.8.0
 fastclick@1.0.13
 fortawesome:fontawesome@4.7.0
 geojson-utils@1.0.10
@@ -49,8 +50,8 @@ grove:less@0.2.0
 hot-code-push@1.0.4
 html-tools@1.0.11
 htmljs@1.0.11
-http@1.3.0
-id-map@1.0.9
+http@1.4.1
+id-map@1.1.0
 iron:controller@1.0.12
 iron:core@1.0.11
 iron:dynamic-template@1.0.12
@@ -60,30 +61,31 @@ iron:middleware-stack@1.1.0
 iron:router@1.0.13
 iron:url@1.0.11
 johdirr:meteor-git-rev@0.0.4
-jquery@1.11.10
+jquery@1.11.11
 launch-screen@1.1.1
 livedata@1.0.18
 localstorage@1.2.0
-logging@1.1.19
+logging@1.1.20
 mdg:validation-error@0.5.1
-meteor@1.8.0
-meteor-base@1.2.0
+meteor@1.9.2
+meteor-base@1.4.0
 meteor-platform@1.2.6
-minifier-css@1.2.16
-minifier-js@2.2.1
-minimongo@1.4.0
+minifier-css@1.3.1
+minifier-js@2.3.5
+minimongo@1.4.4
 mobile-experience@1.0.5
 mobile-status-bar@1.0.14
-modules@0.11.0
-modules-runtime@0.9.0
-momentjs:moment@2.19.1
-mongo@1.3.0
+modern-browsers@0.1.2
+modules@0.12.2
+modules-runtime@0.10.2
+momentjs:moment@2.22.2
+mongo@1.5.1
 mongo-dev-server@1.1.0
-mongo-id@1.0.6
+mongo-id@1.0.7
 mrt:moment@2.8.1
 natestrauser:select2@4.0.3
 npm-bcrypt@0.9.3
-npm-mongo@2.2.33
+npm-mongo@3.0.7
 observe-sequence@1.0.16
 ohif:commands@0.0.1
 ohif:core@0.0.1
@@ -109,37 +111,38 @@ ohif:user@0.0.1
 ohif:user-management@0.0.1
 ohif:viewerbase@0.0.1
 ohif:wadoproxy@0.0.1
-ordered-dict@1.0.9
-promise@0.10.0
+ordered-dict@1.1.0
+promise@0.11.1
 raix:eventemitter@0.1.3
-random@1.0.10
-rate-limit@1.0.8
+random@1.1.0
+rate-limit@1.0.9
 reactive-dict@1.2.0
 reactive-var@1.0.11
-reload@1.1.11
-retry@1.0.9
-routepolicy@1.0.12
+reload@1.2.0
+retry@1.1.0
+routepolicy@1.0.13
 service-configuration@1.0.11
 session@1.1.7
 sha@1.0.9
-shell-server@0.3.0
+shell-server@0.3.1
 silentcicero:jszip@0.0.4
+socket-stream-client@0.2.2
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.0.10
 standard-app-packages@1.0.9
-standard-minifier-css@1.3.5
-standard-minifier-js@2.2.1
-stylus@2.513.13
+standard-minifier-css@1.4.1
+standard-minifier-js@2.3.4
+stylus@2.513.14
 templating@1.3.2
 templating-compiler@1.3.3
 templating-runtime@1.3.2
 templating-tools@1.1.2
-tracker@1.1.3
+tracker@1.2.0
 ui@1.0.13
 underscore@1.0.10
-url@1.1.0
+url@1.2.0
 validatejs@0.0.1
-webapp@1.4.0
+webapp@1.6.2
 webapp-hashing@1.0.9
 zuuk:stale-session@1.0.8