Skip to content

930943: Cleared the conflicts #3771

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 199 commits into from
Jan 8, 2025
Merged

930943: Cleared the conflicts #3771

merged 199 commits into from
Jan 8, 2025

Conversation

Backiaraj
Copy link
Contributor

No description provided.

KesavanMadhanagopal and others added 30 commits October 17, 2024 22:27
@KesavanMadhanagopal
910172: getPageInfo changes
4e63c17
@SF4524LogeshKumar
904595: Load From AAD Core and MVC UG
f0b6151
@SF4524LogeshKumar
904595: updated platform name
5268cc6
@SF4524LogeshKumar
Merge branch 'development' into EJ2-904595-LoadFromAAD
a7bf19a
@SF4524LogeshKumar
381112: how to get base 64
109af99
@SF4524LogeshKumar
381112: sample link update
7a6ffd3
@SF4524LogeshKumar
Merge branch 'development' into EJ2-381112-getBase64
cd5f3e5
@SF4524LogeshKumar
859110: How to Show custom stamp items in custom stamp
2b4816e
@SF4524LogeshKumar
859110: Resolve CI
075f1bf
@SF4524LogeshKumar
859110: updated Requested Changes
ecbcead
@SF4524LogeshKumar
Merge branch 'development' into EJ2-904595-LoadFromAAD
46ad9b7
@SF4524LogeshKumar
Merge branch 'development' into EJ2-859110-customStampItem
3d0f28e
@SF4524LogeshKumar
Merge branch 'development' into EJ2-381112-getBase64
3fcee3e
@SF4524LogeshKumar
Merge branch 'development' into EJ2-859110-customStampItem
403dff3
@SF4524LogeshKumar
Merge branch 'development' into EJ2-904595-LoadFromAAD
efa6cc5
@jayachandran-jayasankar
927003: Added Code sample for custom data validation feature for spre…
eb3a31e 
…adsheet.
@jayachandran-jayasankar
927003: Added Code sample for custom data validation feature for spre…
55be158 
…adsheet.
@babu-periyasamy
927123: Added the samples for calculation mode feature for ASP .NET C…
4445a17 
…ore and MVC platform.
@SF4524LogeshKumar
834567: UG documentation on how to retrieve annotation coordinates
a8b969f
@rparthi-pdf
Merge branch 'development' into EJ2-904595-LoadFromAAD
9873cc8
@SF4524LogeshKumar
Merge branch 'development' into EJ2-910172-getPageInfo
e114245
@SF4524LogeshKumar
910172: Updated get UG documentation on How to get Page details
31a0086
@SabarieswaranSF4791
Added Trademark Symbol
c928e73
@Swetha-Kishore
925357: Committed the content for the Volume 4 new features.
4ec2dad
@Swetha-Kishore
925357: Committed the changes.
7e326cc
@vishnu-prakash-sf4271
Update getting-started-mvc.md
7b92875
@Swetha-Kishore
925357: Committed the changes.
8b434de
@Swetha-Kishore
925357: Committed the changes.
80eeab3
@Swetha-Kishore
925357: Committed the changes.
6b19f96
@gobalakrishnans
Merge pull request #3631 from syncfusion-content/EJ2-927013-getting-s…
4b62a1d 
…tarted1

927013: Ensure spreadsheet samples are created properly by following the UG Getting Started section.
gobalakrishnans and others added 24 commits December 30, 2024 15:38
@gobalakrishnans
Merge pull request #3743 from syncfusion-content/EJ2-930213-ci-dev
fff2f98 
930213: Checked and resolved the CI failure in ASP .NET MVC folder name.
@Gayathri4135
Documentation(930501-Dev): Revamp for Globalization Option in ASP.NET…
2c444dc 
… CORE and MVC
@Gayathri4135
Modified the file
4b3953d
930405: Checked and corrected the Spreadsheet code snippets for ASP .…
4302abb 
…NET Core documentation.
@Gayathri4135
modified the md file
2f120c9
Merge branch 'development' of https://github.com/syncfusion-content/e…
0476e53 
…j2-asp-core-mvc-docs into EJ2-930405-dev
930405: Checked and corrected the Spreadsheet code snippets for ASP .…
93efbcc 
…NET Core documentation.
930405: Checked and corrected the Spreadsheet code snippets for ASP .…
a23b71c 
…NET Core documentation.
930405: Corrected the ASP .NET Core folder name.
9eb6038
@gobalakrishnans
Merge pull request #3756 from syncfusion-content/EJ2-930405-core-dev
64aff00 
930405: Corrected the ASP .NET Core folder name.
@gobalakrishnans
Merge branch 'development' into EJ2-930405-dev
f185104
@Gayathri4135
Modified the exporting-grid-in-server.md file
6bb97fd
@Gayathri4135
Merge branch 'EJ2-pdfexportoptions-928389-dev' of https://github.com/…
446c71f 
…syncfusion-content/ej2-asp-core-mvc-docs into EJ2-pdfexportoptions-928389-dev
@Gayathri4135
Modified the sample
da0aab7
@Gayathri4135
Merge branch 'development' into EJ2-pdfexportoptions-928389-dev
f64e800
@gobalakrishnans
Merge pull request #3739 from syncfusion-content/EJ2-930405-dev
2c4e89e 
930405: Checked and corrected the Spreadsheet code snippets for ASP .NET MVC documentation.
@VigneshNatarajan27
Merge pull request #3752 from syncfusion-content/Ej2-globilzation-930501
f67f0e2 
Documentation(930501-Dev): Revamp for Globalization Option in ASP.NET MVC and Core
@Gayathri4135
Modified the md file
f6f188d
@Gayathri4135
Merge branch 'EJ2-pdfexportoptions-928389-dev' of https://github.com/…
74e5016 
…syncfusion-content/ej2-asp-core-mvc-docs into EJ2-pdfexportoptions-928389-dev
@Gayathri4135
corrected the review changes
6bb17f1
@VigneshNatarajan27
Merge pull request #3701 from syncfusion-content/EJ2-pdfexportoptions…
6bc3c9c 
…-928389-dev

Documentation(928389-dev): Revamp for Pdf-Export Option in ASP.NET CO…
@babu-periyasamy
932704: Corrected the code snippets in Spreadsheet MVC documentation.
596e853
@gobalakrishnans
Merge pull request #3767 from syncfusion-content/EJ2-932704-mvc-code
47d69dc 
932704: Corrected the code snippets in Spreadsheet MVC documentation.
@Backiaraj
930943: Cleared the conflicts
c3ac418
@SyncfusionBuild
Copy link
Collaborator

Build Status: INPROGRESS 🔃
Build Location: 930943-Merge

@SyncfusionBuild
Copy link
Collaborator

CI Status: SUCCESS ✅
Source Compilation: SUCCESS ✅
Build Location: 930943-Merge
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
MD Tag Validation Error(s): 0

@Backiaraj Backiaraj changed the title 930943 merge 930943: Cleared the conflicts Jan 8, 2025
@rajendranr-5483 rajendranr-5483 merged commit 6b20f84 into hotfix/hotfix-v28.1.33 Jan 8, 2025
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
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.