Skip to content

FLUT-956813 - [Others] Resolved the conflicts in assist view and chat folder. #1205

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
VijayakumarMariappan merged 58 commits into from
May 14, 2025
Merged

FLUT-956813 - [Others] Resolved the conflicts in assist view and chat folder. #1205

VijayakumarMariappan merged 58 commits into from
May 14, 2025

Conversation

@BPraveenBalu
Copy link
Collaborator

@BPraveenBalu BPraveenBalu commented May 14, 2025

Description

Resolved the conflicts in assist view and chat folder.

DeepakRajSundar and others added 30 commits May 18, 2022 19:00
@DeepakRajSundar
Merge branch 'master' of https://github.com/syncfusion-content/Flutte…
1f42579 
…r-docs
@SyncfusionBuild
Merge pull request #1171 from Syncfusion-Content/hotfix/hotfix-v29.1.33
256ca28 
DOCINFRA-2341_merged_using_automation
@SyncfusionBuild
Merge pull request #1175 from Syncfusion-Content/hotfix/hotfix-v29.1.33
79140d5 
DOCINFRA-2341_merged_using_automation
Added the release notes MD file and corresponding node entry in the T…
81d1adc 
…OC.html file
@SyncfusionBuild
Merge pull request #1176 from Syncfusion-Content/hotfix/hotfix-v29.1.33
bb92d2e 
DOCINFRA-2341_merged_using_automation
@Mugunthan-Ramalingam
FLUT-947290-[others]: Added RTL for chat and assist view and updated …
ef3df6b 
…UG changes
@Mugunthan-Ramalingam
FLUT-947290-[others]: updated removed content
bbae814
@Mugunthan-Ramalingam
FLUT-947290-[others]: added RTL missed
50d2a1a
@DeepakRajSundar
Merge remote-tracking branch 'origin/master'
aae1d6d
@DeepakRajSundar
removed the excess entry in flutter-toc.html
c0a2bc1
@Mugunthan-Ramalingam
FLUT-947290-[others]: removed RTL content
a93fef1
@Mugunthan-Ramalingam
FLUT-947290-[others]: updated review changes
2616ba8
@Mugunthan-Ramalingam
FLUT-947290-[others]: removed unwanted changes
fd80796
@Mugunthan-Ramalingam
FLUT-947290-[others]: removed unwanted changes
c4d8bf4
@Mugunthan-Ramalingam
FLUT-947290-[others]: added RTL docs for chat and assist view
d10e499
Merge pull request #1177 from syncfusion-content/FLUT-947290-Flutter-…
4c84803 
…UG-changes

FLUT-947290 - [Others] Updated the layout issues and content corrections in the Flutter UG documentation Hotfix
@SyncfusionBuild
Merge pull request #1179 from Syncfusion-Content/hotfix/hotfix-v29.1.33
f032d2b 
DOCINFRA-2341_merged_using_automation
@Mugunthan-Ramalingam
FLUT-947290-[others]: updated UG changes
0167c1f
Update placeholder.md
a0d995a
Update flutter-toc.html
35239fa
Merge pull request #1181 from syncfusion-content/FLUT-947290-UG-chagn…
534748d 
…es-hotfix

FLUT-947290 - [others] Updated the content corrections in the Flutter UG documentation Hotfix
@SyncfusionBuild
Merge pull request #1183 from Syncfusion-Content/hotfix/hotfix-v29.1.33
446f3c0 
DOCINFRA-2341_merged_using_automation
@Mugunthan-Ramalingam
FLUT-947290-[others]: updated code snippet for rtl docs
c234de1
@Mugunthan-Ramalingam
Merge branch 'hotfix/hotfix-v29.1.33' of https://github.com/syncfusio…
a50e20d 
…n-content/flutter-docs into FLUT-947290-RTL-docs-for-chat-assistview
@Mugunthan-Ramalingam
FLUT-947290-[others]: updated missed and improper highlight property …
acb052f 
…in code snippet
@Mugunthan-Ramalingam
FLUT-949859-[others]: added how to section for chat and assistview wi…
4ea01c6 
…dget
Merge pull request #1185 from syncfusion-content/FLUT-947290-highligh…
b48cf02 
…t-property-changes-hotfix

FLUT-947290 - [Others] Updated the missed and improper highlighted property in code snippet for Chat and AssistView UG documentation
@SyncfusionBuild
Merge pull request #1188 from Syncfusion-Content/hotfix/hotfix-v29.1.33
db36dce 
DOCINFRA-2341_merged_using_automation
Added the release notes MD file and corresponding node entry in the T…
1d9cf3c 
…OC.html file
@Mugunthan-Ramalingam
FLUT-947290-[others]: updated review changes
0663ede
LavanyaA and others added 25 commits April 8, 2025 19:28
Merge branch 'hotfix/hotfix-v29.1.33' into FLUT-949859-chat-assistvie…
1509d08 
…w-flutter-flow-hotfix
Merge pull request #1187 from syncfusion-content/FLUT-949859-chat-ass…
954ced5 
…istview-flutter-flow-hotfix

FLUT-949859 - [Others] Added how to section to show how to integrate Chat and AssistView widget with FlutterFlow
@DeepakRajSundar
Merge remote-tracking branch 'remotes/origin/hotfix/hotfix-v29.1.33'
01f34d7
@Mugunthan-Ramalingam
FLUT-949859-[others]: updated issue in UG documentation
5fe673b
Merge pull request #1191 from syncfusion-content/FLUT-949859-Flutter-…
749ac90 
…assistview-UG

FLUT-949859 - [Others] Updated the issue in Flutter UG documentation
@SyncfusionBuild
Merge pull request #1192 from Syncfusion-Content/hotfix/hotfix-v29.1.33
524bb4f 
DOCINFRA-2341_merged_using_automation
Added the release notes MD file and corresponding node entry in the T…
dae7bba 
…OC.html file
@DeepakRajSundar
Merge remote-tracking branch 'remotes/origin/hotfix/hotfix-v29.1.33'
b42b48b
@DeepakRajSundar
Removed the unwanted extra node from flutter-toc.html
ab155ab
@DeepakRajSundar
Merge remote-tracking branch 'remotes/origin/hotfix/hotfix-v29.1.33'
dc00e72
Added the release notes MD file and corresponding node entry in the T…
7c88121 
…OC.html file
@SyncfusionBuild
Merge pull request #1194 from Syncfusion-Content/hotfix/hotfix-v29.1.33
6af2389 
DOCINFRA-2341_merged_using_automation
@KalaiyarasuR
v29.1.33 UG images updated
f965d4f
Merge pull request #1195 from syncfusion-content/HF_29
c04d8a4 
v29.1.33 UG images updated
@Hariram-SF4428
FLUT-953870-[feature]: Removed mac os app center link
5708aa0
@SyncfusionBuild
Merge pull request #1198 from Syncfusion-Content/hotfix/hotfix-v29.1.33
9b5d03f 
DOCINFRA-2341_merged_using_automation
Added the release notes MD file and corresponding node entry in the T…
24a8b80 
…OC.html file
@SyncfusionBuild
Merge pull request #1200 from Syncfusion-Content/hotfix/hotfix-v29.1.33
f5242e1 
DOCINFRA-2341_merged_using_automation
Merge pull request #1197 from syncfusion-content/FLUT-953870-Remove-a…
dd45de9 
…pp-center-link-ug-hotfix

FLUT-949988 - [Feature] Removed macOS app center link hotfix
@SyncfusionBuild
Merge pull request #1201 from Syncfusion-Content/hotfix/hotfix-v29.1.33
7986092 
DOCINFRA-2341_merged_using_automation
@DeepakRajSundar
IN-200360 Added the release notes MD file for v29.1.40 and correspond…
202cf77 
…ing node entry in the TOC.html file
@DeepakRajSundar
Merge remote-tracking branch 'remotes/origin/hotfix/hotfix-v29.1.33'
3f6bb83
@DeepakRajSundar
Added the release notes MD file and corresponding node entry in the T…
a955fce 
…OC.html file
@SyncfusionBuild
Merge pull request #1202 from Syncfusion-Content/hotfix/hotfix-v29.1.33
021e8f3 
DOCINFRA-2341_merged_using_automation
@BPraveenBalu
FLUT-956813-[others][flutter]: Resolved the conflicts.
243b0c8
@Syncfusion-CI
Copy link

Syncfusion-CI commented May 14, 2025

Build Status: INPROGRESS 🔃
Build Location: FLUT-956813-Resolve-conflicts

@Syncfusion-CI
Copy link

Syncfusion-CI commented May 14, 2025

CI Status: SUCCESS ✅
Source Compilation: SUCCESS ✅
Build Location: FLUT-956813-Resolve-conflicts
Technical Error(s): 0
Spelling Error(s): 0
Image Alt Text Error(s): 0 (Critical: 0, High: 0, Medium: 0, Low: 0, Info: 0)
Image Size Error(s): 0 (Critical: 0, High: 0, Medium: 0, Low: 0, Info: 0)
Image Name Error(s): 0 (Critical: 0, High: 0, Medium: 0, Low: 0, Info: 0)
FT Layout Syntax Error(s): 0 (Critical: 0, High: 0, Medium: 0, Low: 0, Info: 0)
Front matter Error(s): 0 (Critical: 0, High: 0, Medium: 0, Low: 0, Info: 0)
File Path Error(s): 0 (Critical: 0, High: 0, Medium: 0, Low: 0, Info: 0)
CodeSnippet File Path Missing Error(s): 0
Toc Anchor Tags Validation Error(s): 0 (Critical: 0, High: 0, Medium: 0, Low: 0, Info: 0)
MD Tag Validation Error(s): 0 (Critical: 0, High: 0, Medium: 0, Low: 0, Info: 0)

VijayakumarMariappan
VijayakumarMariappan approved these changes May 14, 2025
View reviewed changes
Copy link
Collaborator

@VijayakumarMariappan VijayakumarMariappan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine

@VijayakumarMariappan VijayakumarMariappan merged commit aef0fac into development May 14, 2025
1 check passed
@VijayakumarMariappan VijayakumarMariappan deleted the FLUT-956813-Resolve-conflicts branch May 14, 2025 04:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@VijayakumarMariappan VijayakumarMariappan VijayakumarMariappan approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@BPraveenBalu @Syncfusion-CI @VijayakumarMariappan @DeepakRajSundar @SyncfusionBuild @Mugunthan-Ramalingam @KalaiyarasuR @Hariram-SF4428