Skip to content

884032: conflicts issue resolved #2957

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 203 commits into from
May 8, 2024
Merged

884032: conflicts issue resolved #2957

merged 203 commits into from
May 8, 2024

Conversation

kalirajk2022
Copy link
Contributor

conflicts issue resolved.

sridhar-alagirisamy and others added 30 commits March 19, 2024 17:21
@sridhar-alagirisamy
876470: Culture based list and decimal separator support UG added
b37db98 
(cherry picked from commit b438d89)
@sridhar-alagirisamy
876470: Removed empty spaces
1b16549 
(cherry picked from commit ab94f54)
@Soundeswari-Selvam
875329: Resolved preview issues in circular chart 3d in ASP.NET Core …
82d9ffc 
…and ASP.NET MVC UG.
@Soundeswari-Selvam
Merge branch 'hotfix/hotfix-v25.1.35' into EJ2-875329-circular
f9ea1a1
@Gowrimathi
Merge pull request #2793 from syncfusion-content/EJ2-875329-circular
db7a97b 
875329: Resolved preview issues in circular chart 3d in ASP.NET Core and ASP.NET MVC UG.
875459: Keytip UG documentation added.
b1fa84b
Merge branch 'hotfix/hotfix-v25.1.35' into EJ2-875459-RBkeytip
949242c
875459: Heading updated.
1dd0651
Merge branch 'EJ2-875459-RBkeytip' of https://github.com/syncfusion-c…
8356566 
…ontent/ej2-asp-core-mvc-docs into EJ2-875459-RBkeytip
@mohanrajsf3477
871738: UG documentation changed moved to hotfix for TextArea component
c1cf757
@IndrajithSrinivasan
Merge pull request #2765 from syncfusion-content/EJ2-875461-contextual
8c18bad 
docs(875461): Contextual tab UG documentation added.
@sridhar-alagirisamy
876470: Sample corrections done
ec6cda2
@SF3741
875008: featureUG
2942dd9
@indumathi-murali
869993: committed new content for the volume 1 release.
7f9ca7a
@indumathi-murali
869993: committed sample changes.
cb1b196
@PrinceOliver
Merge pull request #2795 from syncfusion-content/871738-Asp-UG1
ce5b996 
871738: UG documentation changed moved to hotfix for TextArea component
@PriyankaKarthikeyan14
Documentation(EJ2-872912): Include github sample in documentation
3232bd7
@indumathi-murali
869993: committed gauge animation topics.
5b6aaa0
@indumathi-murali
869993: committed gauge animation topics.
8be81eb
@indumathi-murali
869993: committed gauge animation topics.
c6de11a
@indumathi-murali
869993: committed marker pointer samples.
928ce19
@indumathi-murali
869993: committed maps samples.
b1219a2
@indumathi-murali
869993: committed missed contents.
ed0cbf1
@indumathi-murali
869993: committed missed contents.
41a0883
@indumathi-murali
869993: committed missed images.
6dc9b0c
@indumathi-murali
869993: committed missed images.
9c07660
@indumathi-murali
869993: committed missed contents.
c4b9b34
@indumathi-murali
869993: committed missed contents.
00f93e3
@indumathi-murali
869993: committed missed contents.
df7528a
@indumathi-murali
869993: committed missed contents.
096e0e7
BharathGurumurthy and others added 24 commits April 17, 2024 09:31
@BharathGurumurthy
380577: Added documentation for toggle track pane
638a163
@BharathGurumurthy
380577: Removed unnecessary code
cf1b2c0
@IndrajithSrinivasan
Merge pull request #2837 from syncfusion-content/EJ2-877772-timelineUG
282ac74 
UG(877772): Modify item tag helper tag
@BharathGurumurthy
877298: Added preview sample and modified api table
36ae6dc
882752: Removed the collaborative editing topic from our UG documenta…
548e1a4 
…tion.
@gobalakrishnans
Merge pull request #2901 from syncfusion-content/EJ2-882752-core-mvc-hot
1901068 
882752: Need to remove the collaborative editing topic from our UG documentation.
@DeepakRajSundar
Added the release notes MD file and corresponding node entry in the T…
8ce8c58 
…OC.html file
@DeepakRajSundar
IN-182354 Added the release notes MD file for 25.1.41 and correspondi…
115c870 
…ng node entry in the TOC.html file
@DeepakRajSundar
IN-182354 Added the release notes MD file for 25.1.41 and correspondi…
f9b6032 
…ng node entry in the TOC.html file
@DeepakRajSundar
dummy commit
7f2186a
@kesavan-duraisamy
Merge pull request #2899 from syncfusion-content/877298-api-table
ac69f4f 
877298: Added documentation for preview sample of document editor container
@kesavan-duraisamy
Merge pull request #2895 from syncfusion-content/380577-hide-track-pane
f74960f 
380577: Added documentation for toggle track pane
@Aishwarya-Ganesan
Merge pull request #2860 from syncfusion-content/SEO-181942-UG-Duplic…
c4d1b6a 
…ate-title

SEO-181942-UG-Duplicate-title
880498: commit
ae6e705
880498: commit
b0ad95a
@DeepakRajSundar
IN-182354 Added the release notes MD file for 25.1.42 and correspondi…
4001b81 
…ng node entry in the TOC.html file
@johnsonmonohar
Merge pull request #2916 from syncfusion-content/880498-annotation
bd3fb66 
880498: How to add and edit annotation programmatically
884073: commit
ab873e0
@johnsonmonohar
Merge pull request #2930 from syncfusion-content/884073-PNG
8a9050c 
884073: Note section in standalone PDF Viewer is updated
Merge branch 'hotfix/hotfix-v25.1.35' of https://github.com/syncfusio…
424ed45 
…n-content/ej2-asp-core-mvc-docs into 875662-hotfix
@johnsonmonohar
Merge pull request #2805 from syncfusion-content/875662-hotfix
a355577 
875662: Custom context menu, organise pdf, Open and close the bookmark pane and render event features documentation.
@kesavan-duraisamy
Resolved the format error.
3d6cfcb
@kesavan-duraisamy
Merge pull request #2935 from syncfusion-content/docedit
62ad11b 
Resolved the format error.
@kalirajk2022
884032: Conflict issue resolved.
e4a2670
@kalirajk2022 kalirajk2022 self-assigned this May 7, 2024
@SyncfusionBuild
Copy link
Collaborator

Build Status: INPROGRESS 🔃
Build Location: 884032-Conflicts

@SyncfusionBuild
Copy link
Collaborator

CI Status: SUCCESS ✅
Source Compilation: SUCCESS ✅
Build Location: 884032-Conflicts
Technical Error(s): 0
Spelling Error(s): 0
Image Alt Text Error(s): 0
Image Size Error(s): 0
Image Name Error(s): 0
FT Layout Syntax Error(s): 0
Front matter Error(s): 0
File Path Error(s): 0
CodeSnippet File Path Missing Error(s): 0
Toc Anchor Tags Validation Error(s): 0

@rajendranr-5483 rajendranr-5483 merged commit 5b605fb into development May 8, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rajendranr-5483 rajendranr-5483 rajendranr-5483 approved these changes

Assignees

@kalirajk2022 kalirajk2022

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.