Skip to content

fix: merging dev changes to main branch #1935

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

Closed
wants to merge 131 commits into from
Closed

fix: merging dev changes to main branch #1935

Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
2dbb0b1
ci: Updated workflow to handle main, dev and demo branch | Dependabot…
Roopan-Microsoft Nov 25, 2024
97ced9f
fix: SFI Fixes & scope reverted to subscription (#1513)
Roopan-Microsoft Nov 25, 2024
903c259
ci: workflow updated for build docker (#1514)
Roopan-Microsoft Nov 25, 2024
4cf2972
ci: build docker updated for dev (#1522)
Roopan-Microsoft Nov 25, 2024
9158819
ci: workflow branch code updated (#1525)
Roopan-Microsoft Nov 25, 2024
4545a48
updated comment
AjitPadhi-Microsoft Nov 25, 2024
84a33b5
updated workflow
AjitPadhi-Microsoft Nov 25, 2024
f8c1c8f
updated workflow
AjitPadhi-Microsoft Nov 25, 2024
e31a661
updated workflow
AjitPadhi-Microsoft Nov 26, 2024
847ce7e
updated bicep for registry
AjitPadhi-Microsoft Nov 26, 2024
8f8cc98
fixed bicep
AjitPadhi-Microsoft Nov 26, 2024
15b948c
fix: bicep updated (#1527)
AjitPadhi-Microsoft Nov 26, 2024
1645e43
Merge branch 'main' into dev
Roopan-Microsoft Nov 27, 2024
8df387a
Merge branch 'dev' of https://github.com/Azure-Samples/chat-with-your…
Roopan-Microsoft Nov 27, 2024
e4dd5f2
fix: Container issue fix for multiple branch (#1539)
AjitPadhi-Microsoft Nov 27, 2024
88d06dc
fix: Updated workflow (#1540)
AjitPadhi-Microsoft Nov 27, 2024
e5cf4dd
ci: Psl container fix for checkout code from head branch (#1541)
Roopan-Microsoft Nov 27, 2024
02d0056
fix: multiple container tag issue fix (#1552)
AjitPadhi-Microsoft Dec 9, 2024
90e1040
fix: Workflow issue fix on docker image (#1554)
AjitPadhi-Microsoft Dec 9, 2024
8a5a1cb
fix: Downmerge dev (#1566)
Pavan-Microsoft Dec 18, 2024
131c323
fix: CWYD Citation Links to Documents Break After Specific Timeframe …
Harmanpreet-Microsoft Dec 18, 2024
93b84ed
fix: Commit changes bug (#1568)
UtkarshMishra-Microsoft Dec 18, 2024
0875b92
fix: Post-Deployment Script for Managing Bicep Outputs in .env File …
Pavan-Microsoft Dec 19, 2024
76190b3
fix: import error in env_helper.py (#1571)
Pavan-Microsoft Dec 19, 2024
c65bf01
fix: add conversation flow in environment variable for adminweb app (…
Priyanka-Microsoft Dec 19, 2024
1f326d9
fix: Update Hosting Model Configuration in ARM/Bicep Template (#1570)
Prasanjeet-Microsoft Dec 19, 2024
fc688c2
fix: Update main.json for changes conversation flow changes in bicep …
Priyanka-Microsoft Dec 19, 2024
56adb59
Merge branch 'main' into dev
Roopan-Microsoft Dec 24, 2024
afaabdc
build: Dependabotchanges merge to Dev branch (#1602)
Roopan-Microsoft Dec 30, 2024
03f52b3
feat: Configurable System Prompts for Flexibility and Maintenance - C…
Pavan-Microsoft Dec 31, 2024
e92eba1
fix: Add Missing Logs (#1609)
Pavan-Microsoft Jan 2, 2025
b0860ee
commented the prompt flow in azure yaml file
Roopan-Microsoft Jan 3, 2025
983b1f7
Merge branches 'dev' and 'dev' of https://github.com/Azure-Samples/ch…
Roopan-Microsoft Jan 3, 2025
dae4043
Add execute permissions parse_env.sh in postprovision hook
Pavan-Microsoft Jan 3, 2025
08ad207
fix: Build issue with docker
Prajwal-Microsoft Jan 4, 2025
c49ddfd
Update build-docker.yml
Prajwal-Microsoft Jan 5, 2025
5994f99
fix: Docker file failure issue
Prajwal-Microsoft Jan 5, 2025
dc7b87c
fix: Response getting ']' brackets, it's inconsistent (#1611)
AjitPadhi-Microsoft Jan 6, 2025
2d1af79
fix: Fix Duplication of Flattened JSON Keys in .env File During Multi…
Pavan-Microsoft Jan 7, 2025
c553312
fix: Role Duplication Error in azd up Command for PostgreSQL (#1621)
Pavan-Microsoft Jan 10, 2025
8213f0a
Merge branch 'main' into dev
Roopan-Microsoft Jan 10, 2025
1f22786
feat: Remove AI search service for PostgreSQL configuration to optimi…
Prasanjeet-Microsoft Jan 13, 2025
7c2391c
feat: Implement Consistent Versioning and Tagging for Accelerator Ima…
Pavan-Microsoft Jan 15, 2025
8393614
Merge branch 'main' into dev
Roopan-Microsoft Jan 20, 2025
3789d45
fix: Warning message displayed twice in chat history update (#1630)
Pavan-Microsoft Jan 24, 2025
699dff8
test: unit test cases changes (#1353)
Kiran-Siluveru-Microsoft Jan 28, 2025
461779f
Update default.json
Roopan-Microsoft Feb 6, 2025
e0be943
Update default_contract_assistant_prompt.txt
Roopan-Microsoft Feb 6, 2025
f28ddc6
Update open_ai_functions.py
Roopan-Microsoft Feb 6, 2025
63ec389
Update build-docker.yml
Roopan-Microsoft Feb 6, 2025
e1d37f1
Update create_app.py
Roopan-Microsoft Feb 6, 2025
ec42447
Update test_conversation.py
Roopan-Microsoft Feb 6, 2025
86dd916
Update test_iv_question_answer_tool.py
Roopan-Microsoft Feb 6, 2025
b1f2615
Update test_response_with_search_documents_tool.py
Roopan-Microsoft Feb 6, 2025
3431205
Update test_conversation_flow.py
Roopan-Microsoft Feb 6, 2025
7025c6e
ci: update docker registry logic for main, dev, and demo branches (#1…
Priyanka-Microsoft Feb 7, 2025
8fca481
fix: Updates to change the Azure OpenAI model from `gpt-35-turbo` to …
Roopan-Microsoft Feb 13, 2025
18e1dca
docs: updated numerical queries section in best practices readme (#1670)
Harsh-Microsoft Feb 17, 2025
c13b4e3
Merge branch 'main' into dev
Roopan-Microsoft Feb 17, 2025
1ed3f43
fix: Admin configuration issue fix (#1676)
AjitPadhi-Microsoft Feb 18, 2025
f083af8
Merge branch 'main' into dev
Roopan-Microsoft Feb 19, 2025
32ebef3
build: Merge Dependabot Changes into Dev Branch (#1679)
Prasanjeet-Microsoft Feb 28, 2025
2803e48
Merge branch 'main' into dev
Roopan-Microsoft Mar 3, 2025
b5f35ac
Package lock updated
Roopan-Microsoft Mar 3, 2025
0b01abb
Merge remote-tracking branch 'origin/main' into dev
Prajwal-Microsoft Mar 4, 2025
21b57da
docs: Added migration readme file (#1668)
Priyanka-Microsoft Mar 4, 2025
6f30b3f
refactor: enforcing authentication based on environment variable "ENF…
Harsh-Microsoft Mar 24, 2025
9de26fd
build: Merge Dependabot Changes into Dev Branch (#1749)
Prasanjeet-Microsoft Apr 11, 2025
f7a2ce9
chore: Update Azure OpenAI Vision Model configuration to turbo-2024-0…
Harmanpreet-Microsoft Apr 15, 2025
dc763c2
feat: json document processor (#1661)
cristofima Apr 16, 2025
9664143
fix: Resolve chunking issue during deployment when enabling advanced …
Priyanka-Microsoft Apr 21, 2025
e8382d3
Merge branch 'main' into dev
Roopan-Microsoft May 5, 2025
4f09b12
fix: bug(#1653) added tooltip for chat history items. (#1785)
Bangarraju-Microsoft May 6, 2025
c7f3e8d
build: Add .dockerignore to optimize Docker build context (#1790)
Prasanjeet-Microsoft May 6, 2025
cea820d
fix: Updated reset configuration to use dialog instead of popover whi…
Vamshi-Microsoft May 9, 2025
5d79d5d
refactor: centralize Azure resource naming with abbreviations.json an…
Harmanpreet-Microsoft May 12, 2025
a9d8511
fix: Changed the button label from "Reset Now" to "Reset" (#1796)
Vamshi-Microsoft May 13, 2025
88caa69
Merge branch 'main' into dev
Roopan-Microsoft May 22, 2025
5383461
main json updated
Roopan-Microsoft May 22, 2025
86ebab4
fix: hardcoded abbreviations in bicep (#1805)
Harsh-Microsoft May 22, 2025
03606b7
fix: Enhance Bicep Outputs for Environment Variable Configuration in …
Prasanjeet-Microsoft May 29, 2025
7ae4b79
fix: Add Cosmos DB Account Key Output for Environment Configuration (…
Prasanjeet-Microsoft May 29, 2025
69669bb
fix: error in 'Process and Ingest Web Pages' under 'Add URLs to the K…
Priyanka-Microsoft Jun 2, 2025
464139c
test: Migrate test automation scripts, llm evaluator and pipeline for…
Harsh-Microsoft Jun 3, 2025
27211e9
ci: configuration to include optional arguments for running tests dur…
Harsh-Microsoft Jun 3, 2025
4fec5b7
Merge branch 'main' into dev
Prasanjeet-Microsoft Jun 3, 2025
b3fcae0
test: add citation link interaction support to e2e tests (#1821)
Harmanpreet-Microsoft Jun 4, 2025
f075a9b
chore: update default OpenAI model to gpt-4.1 across codebase and inf…
Harmanpreet-Microsoft Jun 10, 2025
edb03ab
feat: Down merge from dev & resolved conflicts (#1826)
Prajwal-Microsoft Jun 11, 2025
7f4a427
feat: EXP Changes to reuse existing resource group and Log analytics …
Prajwal-Microsoft Jun 11, 2025
74e1d6c
feat: rebuilt main.json
Prajwal-Microsoft Jun 12, 2025
eccd758
Merge branch 'main' into dev
Roopan-Microsoft Jun 16, 2025
fedee97
test: Implement Log execution time per prompt in Report for CWYD (#1832)
Rohini-Microsoft Jun 19, 2025
c5be551
Merge branch 'main' into dev
Roopan-Microsoft Jun 19, 2025
fc4e2a2
feat: Add Broken Link Checker workflow for Markdown files (#1834)
Vamshi-Microsoft Jun 20, 2025
685e56f
fix: add missing 'text' and 'layoutText' fields for Azure Search inte…
Prasanjeet-Microsoft Jun 26, 2025
a9bd530
Merge branch 'main' into dev
Roopan-Microsoft Jun 30, 2025
7435501
main json updated
Roopan-Microsoft Jun 30, 2025
21d3aef
fix: Only support RBAC with authenticate using managed identity (#1857)
AjitPadhi-Microsoft Jul 14, 2025
fc269f5
ci: refactor deployment workflow to include dynamic URL outputs, e2e …
Harmanpreet-Microsoft Jul 14, 2025
400d1f8
fix: Oneclick deployment issue fix (#1859)
AjitPadhi-Microsoft Jul 14, 2025
049836a
fix: Remove Exposed Speech Service API Key from Network Calls (#1869)
Prasanjeet-Microsoft Jul 28, 2025
0bd33ec
fix: onclick deployment issue fix (#1870)
AjitPadhi-Microsoft Jul 29, 2025
59efafe
chore: update Python and JavaScript dependencies for compatibility a…
Harmanpreet-Microsoft Aug 14, 2025
b536feb
Merge branch 'main' into dev
Roopan-Microsoft Aug 18, 2025
c9d4a23
Updated main json file
Roopan-Microsoft Aug 18, 2025
c69198f
refactor: make principal type optional in role assignments and clean …
Harmanpreet-Microsoft Aug 20, 2025
a4e4d4a
Update deploy_create_table_script.bicep
Roopan-Microsoft Aug 21, 2025
2e2be2c
Merge branch 'main' into dev
Roopan-Microsoft Aug 25, 2025
27f34d8
fix: Cosmos&Postgres]- Error during Team integration (#1893)
Rohini-Microsoft Sep 5, 2025
dad4e6e
fix: Fix for Group Dependabot PRs Pipeline failure (#1900)
NirajC-Microsoft Sep 17, 2025
9d86faa
feat: On click of button teatarea should be clear (#1904)
Rohini-Microsoft Sep 22, 2025
aa7a26f
feat: WAF implementation for CWYD (#1916)
Prajwal-Microsoft Sep 23, 2025
52ea704
fix: fix unit testcases (#1918)
Pavan-Microsoft Sep 24, 2025
4925b3b
ci: update image tags to use 'latest_waf' for Docker builds and deplo…
Harsh-Microsoft Sep 24, 2025
2b28e45
fix: Pipeline issue for deploy & build (#1919)
Prajwal-Microsoft Sep 24, 2025
de608a2
fix: Updated accelerator name
Prajwal-Microsoft Sep 24, 2025
da653ef
fix: Updated the default token limit
Prajwal-Microsoft Sep 24, 2025
c069f0c
fix: Simplify allowed values for hosting plan SKU in Bicep and JSON t…
Kingshuk-Microsoft Sep 25, 2025
cba7632
fix: Teams citation issue and add user to postgresdb (#1921)
Pavan-Microsoft Sep 26, 2025
9d4fa10
fix: Standardize principal variables, improve resource group handling…
Pavan-Microsoft Sep 29, 2025
587d5ca
chore: update release workflow trigger to depend on Validate Deployme…
Pavan-Microsoft Sep 29, 2025
f4dbbcb
Merge branch 'main' into dev
Roopan-Microsoft Sep 29, 2025
04cd9c4
resolved conflicts and main.json regenerated
Roopan-Microsoft Sep 29, 2025
baf6c6d
removed duplicated lines
Roopan-Microsoft Sep 29, 2025
28e0a1e
fix: fix byod flow and update integrated vectorization to work with b…
Harsh-Microsoft Sep 30, 2025
4a2a12e
docs: Azure Region Restrictions, Model Capacity Enhancements, and Doc…
Pavan-Microsoft Sep 30, 2025
cd02b5b
fix: Add 'CreatedBy' tag when creating resource group (#1922)
NirajC-Microsoft Sep 30, 2025
1c967f7
docs: Updated README, azure.yml for minimum azd version 1.18.0 (#1930)
Vamshi-Microsoft Oct 1, 2025
d7e02e1
Increase GPT_MIN_CAPACITY from 30 to 150
Roopan-Microsoft Oct 3, 2025
6c36355
Merge branch 'main' into dev
Roopan-Microsoft Oct 6, 2025
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

These merge commits were added into this branch cleanly.

There are no new changes to show.