Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

feature: Merge 1.4.0 into main #6529

Merged
cwhitten merged 30 commits into from
Mar 23, 2021
Merged

feature: Merge 1.4.0 into main #6529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
e9d070b
release: 1.4.0-rc0
cwhitten Mar 13, 2021
86b92bf
fix: lg create error with multi-language (#6412)
lei9444 Mar 15, 2021
44ca903
fix: Remove Attachment Lg template when they are deleted in the Respo…
tdurnford Mar 13, 2021
3228d97
1.4.0-rc1
cwhitten Mar 15, 2021
7d4b2bd
Added gray Composer icon to 'no triggers' dialog state (#6414)
tonyanziano Mar 15, 2021
413a4ff
Get an ARM token only when publishing to Azure (#6418)
tonyanziano Mar 16, 2021
17c2f7d
fix: composer doesn't see component dialogs that are in subfolders (#…
lei9444 Mar 16, 2021
e40f9bf
fix: revert yeoman-environment to 2.10.3 from 3.1.0 (#6415)
benbrown Mar 16, 2021
8c279bc
1.4.0-rc2
cwhitten Mar 16, 2021
f80790d
fix: load feature flags if default keys have changed (#6432)
a-b-r-o-w-n Mar 16, 2021
48c822e
fix: use new create flow during add skill if enabled (#6427)
pavolum Mar 16, 2021
8f47bf1
Update bf-orchestrator to 4.12.0-beta.20210316.cdd0819 (#6435)
taicchoumsft Mar 16, 2021
cd026f8
fix: make CSS show triangles in project tree (#6428)
beyackle Mar 16, 2021
c40ecb0
feat: Implement layout to errorCallout (#6396)
cdonke Mar 16, 2021
3ae8aaa
fis: change feature flag text (#6438)
pavolum Mar 17, 2021
8a115bc
feat: update runtime package to 4.12.1 (#6441)
boydc2014 Mar 17, 2021
ffda715
fix: hidden showCode button when url is all & show code for form dial…
alanlong9278 Mar 17, 2021
830559e
Fixing projectId state by ordering state change (#6437)
pavolum Mar 17, 2021
d2cb11b
prepare changelog for 1.4.0
a-b-r-o-w-n Mar 17, 2021
82a36c4
1.4.0-rc3
boydc2014 Mar 18, 2021
7a9d518
feat: take 4.12.2 runtime package (#6469)
boydc2014 Mar 18, 2021
1bcd96b
fix: Allow multiline variations for LG text and speech modalities (#6…
hatpick Mar 15, 2021
d5a04ac
fix actions (#6476)
hatpick Mar 18, 2021
ce64aef
release: 1.4.0
cwhitten Mar 18, 2021
501336b
Update 1.4.0.md
cwhitten Mar 18, 2021
2d7d9d1
RC4
cwhitten Mar 22, 2021
0b0a126
Update bf-orchestrator to 4.12.0-beta.20210322.314475a (#6496)
taicchoumsft Mar 22, 2021
a7ceff8
Merge branch '1.4.0-rc4' of https://github.com/microsoft/BotFramework…
cwhitten Mar 22, 2021
223388e
Merge branch '1.4.0' of https://github.com/microsoft/BotFramework-Com…
cwhitten Mar 22, 2021
41582c7
Merge branch 'main' into 1.4.0
cwhitten Mar 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Composer/packages/client/config/env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ function getClientEnvironment(publicUrl) {
// images into the `src` and `import` them in code to get their paths.
PUBLIC_URL: publicUrl,
GIT_SHA: getGitSha().toString().replace('\n', ''),
SDK_PACKAGE_VERSION: '4.11.0', // TODO: change this when Composer supports custom schema/custom runtime
COMPOSER_VERSION: '1.3.1',
SDK_PACKAGE_VERSION: '4.12.2', // TODO: change this when Composer supports custom schema/custom runtime
COMPOSER_VERSION: '1.4.0',
LOCAL_PUBLISH_PATH:
process.env.LOCAL_PUBLISH_PATH || path.resolve(process.cwd(), '../../../extensions/localPublish/hostedBots'),
WEBLOGIN_CLIENTID: process.env.WEBLOGIN_CLIENTID,
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/electron-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@bfc/electron-server",
"license": "MIT",
"author": "Microsoft Corporation",
"version": "1.3.1",
"version": "1.4.0",
"description": "Electron wrapper around Composer that launches Composer as a desktop application.",
"main": "./build/main.js",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/server/src/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ export const APPINSIGHTS_INSTRUMENTATIONKEY = process.env.APPINSIGHTS_INSTRUMENT

export const piiProperties = [];

export const COMPOSER_VERSION = '1.3.1';
export const COMPOSER_VERSION = '1.4.0';
Loading