Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Adds license fields, fixes incorrect link, hides some left-nav elements #1691

Merged
merged 3 commits into from
Dec 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Composer/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@bfc/root",
"license": "MIT",
"private": true,
"resolutions": {
"@types/react": "16.9.0"
Expand Down
1 change: 1 addition & 0 deletions Composer/packages/client/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@bfc/client",
"license": "MIT",
"version": "0.1.0",
"private": true,
"engines": {
Expand Down
42 changes: 21 additions & 21 deletions Composer/packages/client/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ const topLinks = (botLoaded: boolean) => {
exact: false,
disabled: !botLoaded,
},
{
to: '/test-conversation',
iconName: 'WaitListConfirm',
labelName: formatMessage('Test Conversation'),
exact: false,
disabled: true, // will delete
},
// {
// to: '/test-conversation',
// iconName: 'WaitListConfirm',
// labelName: formatMessage('Test Conversation'),
// exact: false,
// disabled: true, // will delete
// },
{
to: 'language-generation/',
iconName: 'Robot',
Expand All @@ -64,13 +64,13 @@ const topLinks = (botLoaded: boolean) => {
exact: false,
disabled: !botLoaded,
},
{
to: '/evaluate-performance',
iconName: 'Chart',
labelName: formatMessage('Evaluate performance'),
exact: false,
disabled: true,
},
// {
// to: '/evaluate-performance',
// iconName: 'Chart',
// labelName: formatMessage('Evaluate performance'),
// exact: false,
// disabled: true,
// },
{
to: '/notifications',
iconName: 'Warning',
Expand All @@ -95,13 +95,13 @@ const topLinks = (botLoaded: boolean) => {
};

const bottomLinks = [
{
to: '/help',
iconName: 'unknown',
labelName: formatMessage('Info'),
exact: true,
disabled: true,
},
// {
// to: '/help',
// iconName: 'unknown',
// labelName: formatMessage('Info'),
// exact: true,
// disabled: true,
// },
{
to: '/about',
iconName: 'info',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,14 @@ export const DialogSettings = () => {
<p>
{hostControlLabels.botSettingDescription}
&nbsp;
<Link href="//aka.ms/absh/docs/settings" target="_blank">
<Link
href={
absHosted
? 'https://aka.ms/absh/docs/settings'
: 'https://github.com/microsoft/BotFramework-Composer/blob/stable/docs/deploy-bot.md'
}
target="_blank"
>
{hostControlLabels.learnMore}
</Link>
</p>
Expand Down
1 change: 1 addition & 0 deletions Composer/packages/extensions/obiformeditor/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@bfc/obiformeditor",
"license": "MIT",
"version": "1.0.0",
"description": "obieditortest React component",
"engines": {
Expand Down
1 change: 1 addition & 0 deletions Composer/packages/extensions/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@bfc/extensions",
"license": "MIT",
"version": "1.0.0",
"description": "",
"main": "index.js",
Expand Down
1 change: 1 addition & 0 deletions Composer/packages/lib/code-editor/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@bfc/code-editor",
"license": "MIT",
"version": "0.0.0",
"description": "Code editor component that is shared in composer packages",
"main": "lib/index.js",
Expand Down
1 change: 1 addition & 0 deletions Composer/packages/lib/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@bfc/libs",
"license": "MIT",
"version": "1.0.0",
"description": "",
"main": "index.js",
Expand Down
1 change: 1 addition & 0 deletions Composer/packages/server/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@bfc/server",
"license": "MIT",
"version": "1.0.0",
"description": "",
"main": "index.js",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@bfc/lg-languageserver",
"license": "MIT",
"version": "0.1.0",
"main": "lib/index.js",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions Composer/packages/tools/language-servers/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@bfc/language-servers",
"license": "MIT",
"version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
"build": "yarn build:lg",
"build:lg": "cd language-generation && yarn build"
},
"author": "",
"license": "ISC"
"author": ""
}
5 changes: 3 additions & 2 deletions Composer/packages/tools/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "@bfc/tools",
"license": "MIT",
"private": true,
"version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
"build:language-servers": "cd language-servers && yarn build",
"build:all": "concurrently --kill-others-on-fail \"yarn:build:language-servers\""
},
"author": "",
"license": "ISC"
"author": ""
}
5 changes: 4 additions & 1 deletion Composer/scripts/update.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
const chalk = require('react-dev-utils/chalk');
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License

const { execSync } = require('child_process');
const chalk = require('react-dev-utils/chalk');

const RELEASE_BRANCH = 'stable';
let currentBranch;
Expand Down
11 changes: 11 additions & 0 deletions Composer/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15933,6 +15933,17 @@ ts-loader@^6.2.1:
micromatch "^4.0.0"
semver "^6.0.0"

ts-node@^8.3.0:
version "8.5.4"
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.5.4.tgz#a152add11fa19c221d0b48962c210cf467262ab2"
integrity sha512-izbVCRV68EasEPQ8MSIGBNK9dc/4sYJJKYA+IarMQct1RtEot6Xp0bXuClsbUSnKpg50ho+aOAx8en5c+y4OFw==
dependencies:
arg "^4.1.0"
diff "^4.0.1"
make-error "^1.1.1"
source-map-support "^0.5.6"
yn "^3.0.0"

ts-node@^8.4.1:
version "8.4.1"
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.4.1.tgz#270b0dba16e8723c9fa4f9b4775d3810fd994b4f"
Expand Down