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

build(release): merge dev into v3 branch #944

Merged
merged 29 commits into from
Jul 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
08663ba
fix: update dotnet stock notification sample readme and color.png
XiaofuHuang May 4, 2023
74242cf
Merge pull request #887 from OfficeDev/xiaofhua/update-dotnet-stock
XiaofuHuang May 4, 2023
f959117
perf: enable loading indicator
hund030 May 5, 2023
124fdc2
Merge pull request #888 from OfficeDev/zhihuan/loading_indicator
hund030 May 6, 2023
4cc4439
fix(sharenow): fix build warning
xzf0587 May 11, 2023
8477d52
Merge pull request #901 from OfficeDev/zhaofeng/share-now/fix-build-w…
xzf0587 May 11, 2023
5dd8e9b
fix: loading indicator conflicts with mobile development
hund030 May 15, 2023
a12ffa4
fix: fix broken links in web.config
Siglud May 15, 2023
a2c3210
Merge pull request #906 from OfficeDev/zhihuan/loading
hund030 May 15, 2023
2fe304c
Merge pull request #907 from Siglud/siglud/v5/fix-broken-link
Siglud May 16, 2023
d6be3db
Merge pull request #910 from OfficeDev/v3
kimizhu May 17, 2023
5383ea7
fix: make local debug work for todo sample (#913)
formulahendry May 19, 2023
f90232a
docs: fix outdated doc (#914)
1yefuwang1 May 24, 2023
037a60f
chore(deps): bump debug and @microsoft/sp-build-web (#852)
dependabot[bot] May 29, 2023
57d4f47
chore(deps): bump ms and @microsoft/sp-build-web in /todo-list-SPFx/s…
dependabot[bot] May 29, 2023
ffa3afd
Revert "chore(deps): bump debug and @microsoft/sp-build-web (#852)" (…
wenytang-ms May 29, 2023
39c529f
remove bot sso sample (#921)
yukun-dong Jun 2, 2023
408d325
feat: add basic blazor tab app
hund030 Jun 6, 2023
43e5293
Merge pull request #923 from OfficeDev/zhihuan/blazor
hund030 Jun 6, 2023
953c52d
fix: clear deploy ignore file
Siglud Jun 8, 2023
39681d9
Merge pull request #924 from Siglud/siglud/v5/clean-deploy-ignore
Siglud Jun 14, 2023
381f4da
Revert "remove bot sso sample (#921)" (#926)
yukun-dong Jun 14, 2023
1e16c52
docs: add note for single tenant (#927)
KennethBWSong Jun 15, 2023
406af3f
fix: update bot sso for only support personal chat (#928)
KennethBWSong Jun 20, 2023
f6d8eb8
chore: move Teams chef sample to local repo (#931)
HuihuiWu-Microsoft Jun 25, 2023
fbc9c68
build: remove useless dependencies (#933)
KennethBWSong Jun 29, 2023
2af014b
docs: use dev tunnel cli instead of ngrok
XiaofuHuang Jul 11, 2023
e3f5756
Merge pull request #938 from OfficeDev/xiaofhua/change-ngrok-to-dev-t…
XiaofuHuang Jul 11, 2023
6bc7939
fix: fix bot-sso race condition issue (#929)
yukun-dong Jul 12, 2023
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
5 changes: 1 addition & 4 deletions .config/samples-config-v3.json
Original file line number Diff line number Diff line change
Expand Up @@ -247,10 +247,7 @@
],
"time": "5min to run",
"configuration": "Manual configurations required",
"suggested": false,
"url": "https://github.com/OfficeDev/teams-chef-sample/tree/main/teams-chef-bot",
"packageLink": "https://github.com/OfficeDev/teams-chef-sample/archive/refs/heads/main.zip",
"relativePath": "teams-chef-sample-main/teams-chef-bot"
"suggested": false
}
]
}
4 changes: 3 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/hello-world-bot-with-tab @eriolchan @hund030
/hello-world-in-meeting @eriolchan @JerryYangKai
/hello-world-tab-codespaces @kimizhu @dooriya @qinezh
/hello-world-tab-with-backend @eriolchan @hund030
/hello-world-tab-with-backend @adashen @SLdragon @KennethBWSong
/hello-world-teams-tab-and-outlook-add-in @MSFT-yiz @1yefuwang1 @HuihuiWu-Microsoft
/incoming-webhook-notification @kimizhu @dooriya @swatDong @XiaofuHuang
/notification-codespaces @kimizhu @dooriya @qinezh
Expand All @@ -35,4 +35,6 @@
/todo-list-with-Azure-backend @adashen @formulahendry
/todo-list-with-Azure-backend-M365 @kimizhu @swatDong @kuojianlu
/developer-assist-dashboard @eriolchan @huimiu @hund030 @JerryYangKai
/whos-next-meeting-app @MSFT-yiz @HuihuiWu-Microsoft
/teams-chef-bot @MSFT-yiz @HuihuiWu-Microsoft
/.github/workflows/cd.yml @adashen @LongOddCode @Siglud @qinezh @wenytang-ms
2 changes: 0 additions & 2 deletions NPM-search-connector-M365/.webappignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@ tsconfig.json
teamsapp.yml
teamsapp.*.yml
/env/
/script/
/node_modules/.bin
/node_modules/ts-node
/node_modules/typescript
/appPackage/
/infra/
/teamsfx/
/images/
cli.md
15 changes: 9 additions & 6 deletions NPM-search-connector-M365/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@
```
teamsfx new template npm-search-connector-m365
```
1. For local env, install [ngrok](https://ngrok.com/download) and start your local tunnel service by running the command `ngrok http 3978`.
1. For local env, fill in the values for `BOT_DOMAIN` and `BOT_ENDPOINT` with your ngrok URL in the `env/.env.local` file.
```
BOT_DOMAIN=sample-id.ngrok.io
BOT_ENDPOINT=https://sample-id.ngrok.io
```
1. For local env, start your local tunnel service.
1. Install [dev tunnel cli](https://aka.ms/teamsfx-install-dev-tunnel).
1. Login with your M365 Account using the command `devtunnel user login`.
1. Start your local tunnel service by running the command `devtunnel host -p 3978 --protocol http --allow-anonymous`.
1. In the `env/.env.local` file, fill in the values for `BOT_DOMAIN` and `BOT_ENDPOINT` with your dev tunnel URL.
```
BOT_DOMAIN=sample-id-3978.devtunnels.ms
BOT_ENDPOINT=https://sample-id-3978.devtunnels.ms
```
1. Provision.
```
teamsfx provision --env <env>
Expand Down
1 change: 0 additions & 1 deletion NPM-search-connector-M365/web.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

<configuration>
<system.webServer>
<!-- Visit http://blogs.msdn.com/b/windowsazure/archive/2013/11/14/introduction-to-websockets-on-windows-azure-web-sites.aspx for more information on WebSocket support -->
<webSocket enabled="false" />
<handlers>
<!-- Indicates that the server.js file is a node.js site to be handled by the iisnode module -->
Expand Down
2 changes: 0 additions & 2 deletions NPM-search-message-extension-codespaces/.webappignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ tsconfig.json
teamsapp.yml
teamsapp.*.yml
/env/
/script/
/node_modules/.bin
/node_modules/ts-node
/node_modules/typescript
/appPackage/
/infra/
/teamsfx/
5 changes: 2 additions & 3 deletions NPM-search-message-extension-codespaces/web.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
This configuration file is required if iisnode is used to run node processes behind
IIS or IIS Express. For more information, visit:

https://github.com/tjanczuk/iisnode/blob/master/samples/configuration/web.config
https://github.com/tjanczuk/iisnode/blob/master/src/samples/configuration/web.config
-->

<configuration>
<system.webServer>
<!-- Visit http://blogs.msdn.com/b/windowsazure/archive/2013/11/14/introduction-to-websockets-on-windows-azure-web-sites.aspx for more information on WebSocket support -->
<webSocket enabled="false" />
<handlers>
<!-- Indicates that the server.js file is a node.js site to be handled by the iisnode module -->
Expand Down Expand Up @@ -54,7 +53,7 @@
* node_env: will be propagated to node as NODE_ENV environment variable
* debuggingEnabled - controls whether the built-in debugger is enabled

See https://github.com/tjanczuk/iisnode/blob/master/samples/configuration/web.config for a full list of options
See https://github.com/tjanczuk/iisnode/blob/master/src/samples/configuration/web.config for a full list of options
-->
<!--<iisnode watchedFiles="web.config;*.js"/>-->
</system.webServer>
Expand Down
1 change: 0 additions & 1 deletion adaptive-card-notification/.funcignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ tsconfig.json
teamsapp.yml
teamsapp.*.yml
/env/
/script/
/devTools/
Loading
Loading