Skip to content

fix: downmerge from main to dev #371

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 142 commits into from
Apr 4, 2025
Merged

fix: downmerge from main to dev #371

merged 142 commits into from
Apr 4, 2025

Conversation

Roopan-Microsoft
Copy link
Contributor

Purpose

  • ...

Does this introduce a breaking change?

  • Yes
  • No

Golden Path Validation

  • I have tested the primary workflows (the "golden path") to ensure they function correctly without errors.

Deployment Validation

  • I have validated the deployment process successfully and all services are running as expected with this change.

What to Check

Verify that the following are valid

  • I have built and tested the code locally and in a deployed app
  • For frontend changes, I have pulled the latest code from main, built the frontend, and committed all static files.
  • This is a change for all users of this app. No code or asset is specific to my use case or my organization.

Other Information

blessing-sanusi and others added 30 commits March 12, 2025 09:53
@blessing-sanusi
testing
0aa2810
@toherman-msft
Update README.md
a6a44e3
@toherman-msft
Update TRANSPARENCY_FAQ.md
ff49b17
@toherman-msft
Merge pull request #291 from microsoft/toherman-msft-patch-1
4e81ea2 
docs-readme-update
@blessing-sanusi
Update README.md
ba811d6
@blessing-sanusi
Merge pull request #292 from microsoft/blessing-sanusi-patch-1
c6a6d4b 
Update README.md
@blessing-sanusi
changes from dev to main
c7beb2c
@blessing-sanusi
Merge branch 'main' of https://github.com/microsoft/document-generati…
de370d2 
…on-solution-accelerator
@blessing-sanusi
changes from dev to main
8208841
@Vinay-Microsoft
Merge pull request #293 from microsoft/data-changes
93558c0 
fix: Merging dev into main branch
@Harsh-Microsoft
Update deployment action to use new bicep and updated baseurl and ima…
435d733 
…geTag in bicep
@Harsh-Microsoft
Update Node.js version matrix in workflow
824a087
@Roopan-Microsoft
Update node.js.yml
18a9343
@Roopan-Microsoft
Update node.js.yml
04c5b60
@Harsh-Microsoft
Add jest-environment-jsdom dependency to package.json
40958ef
@Harsh-Microsoft
Merge branch 'update-tags' of https://github.com/microsoft/Generic-Bu…
ffb2c59 
…ild-your-own-copilot-Solution-Accelerator into update-tags
@Harsh-Microsoft
Revert "Merge branch 'update-tags' of https://github.com/microsoft/Ge…
625606e 
…neric-Build-your-own-copilot-Solution-Accelerator into update-tags"

This reverts commit ffb2c59, reversing
changes made to 40958ef.
@Harsh-Microsoft
Revert "Add jest-environment-jsdom dependency to package.json"
f32c48b 
This reverts commit 40958ef.
@Roopan-Microsoft
Merge pull request #294 from microsoft/update-tags
9f3452a 
fix: updated baseurl and imageTag in bicep
solved pylint issue
627a82e
edit 1
152c927
implement Chat panel
618455b
@Roopan-Microsoft
Merge pull request #296 from microsoft/psl-15563-chatPanel
83f7b62 
fix: implementation of chat page
edit 2
e1c4338
@Roopan-Microsoft
Merge pull request #297 from microsoft/psl-pylintREsolved
54ecfcb 
style: Solved PyLint issues
@Roopan-Microsoft
Create quota_check_params.sh
5f91f47
@Roopan-Microsoft
Delete docs/infra/scripts/quota_check_params.sh
768fc99
@Roopan-Microsoft
Create quota_check_params.sh
c1dbc10
@Roopan-Microsoft
Update quota_check_params.sh
ebbc586
@Roopan-Microsoft
Create quota_check_all_regions.sh
879cab3
Roopan-Microsoft and others added 19 commits April 1, 2025 13:23
@Roopan-Microsoft
Update quota_check.md
3517ff3
@Roopan-Microsoft
Merge pull request #333 from microsoft/psl-quota-script-update
7f17e06 
docs: Clarify instructions for selecting terminal shell in VS code
@Priyanka-Microsoft
updated the subscription code in the script
4a72695
@Roopan-Microsoft
Merge pull request #334 from microsoft/psl-update-subscription-in-script
9f54771 
fix: updated the subscription code in the script
@Harsh-Microsoft
Add CONTRIBUTING.md
c17d211
@Roopan-Microsoft
Merge pull request #335 from microsoft/add-contributing-file
63997b2 
docs: Add CONTRIBUTING.md
@Priyanka-Microsoft
corrected the table
743e037
@Priyanka-Microsoft
updated dev container
8aa2ca3
@Priyanka-Microsoft
updated table
90a16df
@Roopan-Microsoft
Merge pull request #336 from microsoft/fix/corrected-the-table
b790dc5 
fix: update table column percentage
@Roopan-Microsoft
Merge pull request #329 from microsoft/psl-bug-16193
1f9b5cc 
fix: psl bug 16193
@Priyanka-Microsoft
handled exceptions for login
1620926
@Roopan-Microsoft
Merge pull request #366 from microsoft/fix/handled-exceptions-in-the-…
5f7962b 
…scripts

fix: improvement to error handling in the script
@Harsh-Microsoft
refactor: update naming conventions for resources in Bicep files and …
a94dd9c 
…add post-provision hooks in azure.yaml
@Harsh-Microsoft
build main.json
d45d72c
@Harsh-Microsoft
bicep version upgrade
2f6f62b
@Roopan-Microsoft
Merge pull request #368 from microsoft/gh-issue-fix-2apr
f759ce1 
refactor: update naming conventions for resources in Bicep files
@Priyanka-Microsoft
add permission for quota_check_params.sh in dev container
ba4649d
@Roopan-Microsoft
Merge pull request #369 from microsoft/fix/devcontainer-chmod-quota-s…
c7def41 
…cript

feat: add permission for quota_check_params.sh in dev container
@Roopan-Microsoft Roopan-Microsoft merged commit 7172287 into dev Apr 4, 2025
16 checks passed
@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 5, 2025

🎉 This PR is included in version 1.1.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Avijit-Microsoft Avijit-Microsoft Avijit-Microsoft approved these changes

@toherman-msft toherman-msft Awaiting requested review from toherman-msft toherman-msft is a code owner

@hunterjam hunterjam Awaiting requested review from hunterjam hunterjam is a code owner

@Prajwal-Microsoft Prajwal-Microsoft Awaiting requested review from Prajwal-Microsoft Prajwal-Microsoft is a code owner

@Vinay-Microsoft Vinay-Microsoft Awaiting requested review from Vinay-Microsoft Vinay-Microsoft is a code owner

@malrose07 malrose07 Awaiting requested review from malrose07 malrose07 is a code owner

@blessing-sanusi blessing-sanusi Awaiting requested review from blessing-sanusi blessing-sanusi is a code owner

Assignees
No one assigned
Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.