Skip to content

Commit

Permalink
Merge 41bbb73 into b95462b
Browse files Browse the repository at this point in the history
  • Loading branch information
cwhitten committed Mar 4, 2019
2 parents b95462b + 41bbb73 commit 246385e
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 29 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -33,6 +33,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- `component`: Added `cardActionMiddleware` to customize the behavior of card action, by [@compulim](https://github.com/compulim), in PR [#1704](https://github.com/Microsoft/BotFramework-WebChat/pull/1704)

### Changed

- Bumped `botframework-directlinejs` to 0.11.4 in PR [#1783](https://github.com/Microsoft/BotFramework-WebChat/pull/1783)
- Moved `botAvatarImage` and `userAvatarImage` to `styleOptions.botAvatarImage` and `styleOptions.userAvatarImage` respectively, in PR [#1486](https://github.com/Microsoft/BotFramework-WebChat/pull/1486)
- Fix string interpolation error in Russian localization and fallback for browsers without Intl support by [@odysseus1973](https://github.com/odysseus1973) in PR [#1509](https://github.com/Microsoft/BotFramework-WebChat/pull/1509)
- `playground`: Bumps to [`botframework-directlinejs@0.10.0`](https://github.com/Microsoft/BotFramework-DirectLineJS/), in PR [#1511](https://github.com/Microsoft/BotFramework-WebChat/pull/1511)
Expand Down
12 changes: 6 additions & 6 deletions packages/bundle/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/bundle/package.json
Expand Up @@ -34,7 +34,7 @@
"dependencies": {
"@babel/runtime": "^7.1.2",
"adaptivecards": "~1.1.2",
"botframework-directlinejs": "~0.11.2",
"botframework-directlinejs": "^0.11.4",
"botframework-webchat-component": "^0.0.0-0",
"botframework-webchat-core": "^0.0.0-0",
"core-js": "^2.5.7",
Expand Down
12 changes: 6 additions & 6 deletions packages/component/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/component/package.json
Expand Up @@ -52,7 +52,7 @@
"babel-jest": "^23.6.0",
"babel-plugin-istanbul": "^5.1.0",
"babel-plugin-version-transform": "^1.0.0",
"botframework-directlinejs": "~0.11.2",
"botframework-directlinejs": "^0.11.4",
"concurrently": "^4.0.1",
"jest": "^23.6.0",
"react": "^16.4.1",
Expand All @@ -77,7 +77,7 @@
"simple-update-in": "^1.3.0"
},
"peerDependencies": {
"botframework-directlinejs": "^0.11.1",
"botframework-directlinejs": "^0.11.4",
"react": "^16.4.1"
}
}
12 changes: 6 additions & 6 deletions packages/core/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/core/package.json
Expand Up @@ -50,7 +50,7 @@
"babel-jest": "^23.6.0",
"babel-plugin-istanbul": "^5.1.0",
"babel-plugin-version-transform": "^1.0.0",
"botframework-directlinejs": "~0.11.2",
"botframework-directlinejs": "^0.11.4",
"concurrently": "^4.0.1",
"jest": "^23.6.0",
"rimraf": "^2.6.2",
Expand Down
12 changes: 6 additions & 6 deletions packages/playground/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/playground/package.json
Expand Up @@ -10,7 +10,7 @@
],
"dependencies": {
"adaptivecards": "~1.1.2",
"botframework-directlinejs": "~0.11.2",
"botframework-directlinejs": "^0.11.4",
"botframework-webchat": "^0.0.0-0",
"botframework-webchat-component": "^0.0.0-0",
"botframework-webchat-core": "^0.0.0-0",
Expand Down

0 comments on commit 246385e

Please sign in to comment.