Skip to content

884032: conflict issue #2966

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

Merged
merged 7 commits into from
May 8, 2024
Merged

884032: conflict issue #2966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
32c3f49
0000: resolve
lokesharjunan May 7, 2024
4600018
documentation(881081): Committed the changes in Charts.
Swetha-Kishore May 7, 2024
f9b2f07
documentation(881081): Committed the changes in charts.
Swetha-Kishore May 7, 2024
2b150f6
Merge pull request #2951 from syncfusion-content/EJ2-881081-chart-hotfix
Gowrimathi May 7, 2024
bab53f6
Merge pull request #2950 from syncfusion-content/EJ2-0000-resolve
MahalakshmiKarthikeyan May 7, 2024
540e9c8
Merge remote-tracking branch 'remotes/origin/hotfix/hotfix-v25.1.35' …
kalirajk2022 May 8, 2024
3aece7f
884032: Unwanted changes reverted.
kalirajk2022 May 8, 2024
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
3 changes: 1 addition & 2 deletions ej2-asp-core-mvc/chart/EJ2_ASP.MVC/chart-print.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ publishingplatform: ##Platform_Name##
documentation: ug
---


# Print and Export in ASP.NET Core chart component
# Print and Export in ASP.NET Core Chart component

## Print

Expand Down
1 change: 0 additions & 1 deletion ej2-asp-core-mvc/chart/EJ2_ASP.NETCORE/chart-print.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ publishingplatform: ##Platform_Name##
documentation: ug
---


# Print and Export in ASP.NET Core Chart component

## Print
Expand Down
1 change: 0 additions & 1 deletion ej2-asp-core-mvc/chart/EJ2_ASP.NETCORE/date-time-axis.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ Date time axis uses date time scale and displays the date time values as axis la

{% youtube "https://www.youtube.com/watch?v=DnMIgbn6bco" %}


{% if page.publishingplatform == "aspnet-core" %}

{% tabs %}
Expand Down
24 changes: 0 additions & 24 deletions ej2-asp-core-mvc/timeline/EJ2_ASP.MVC/items.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ The Timeline items can be added by using the `<e-timeline-item>` tag helper. Eac

## Adding content

<<<<<<<< HEAD:ej2-asp-core-mvc/timeline/EJ2_ASP.MVC/items.md
You can define the item content using the [content](https://help.syncfusion.com/cr/aspnetmvc-js2/Syncfusion.EJ2.Layouts.TimelineItem.html#Syncfusion_EJ2_Layouts_TimelineItem_Content) property.
========
You can define the item content using the [content](https://help.syncfusion.com/cr/aspnetcore-js2/Syncfusion.EJ2.Layouts.TimelineItem.html#Syncfusion_EJ2_Layouts_TimelineItem_Content) property.
>>>>>>>> remotes/origin/hotfix/hotfix-v25.1.35:ej2-asp-core-mvc/timeline/EJ2_ASP.NETCORE/items.md

### String content

Expand Down Expand Up @@ -51,11 +47,7 @@ You can define string content for the Timeline items.

### Templated content

<<<<<<<< HEAD:ej2-asp-core-mvc/timeline/EJ2_ASP.MVC/items.md
You can specify the [Template Content](https://help.syncfusion.com/cr/aspnetmvc-js2/Syncfusion.EJ2.Layouts.TimelineItem.html#Syncfusion_EJ2_Layouts_TimelineItem_ContentTemplate) for the items, by using the selector for an element in HTML.
========
You can specify the [Template Content](https://help.syncfusion.com/cr/aspnetcore-js2/Syncfusion.EJ2.Layouts.TimelineItem.html#Syncfusion_EJ2_Layouts_TimelineItem_ContentTemplate) for the items, by using the selector for an element in HTML.
>>>>>>>> remotes/origin/hotfix/hotfix-v25.1.35:ej2-asp-core-mvc/timeline/EJ2_ASP.NETCORE/items.md

{% if page.publishingplatform == "aspnet-core" %}

Expand Down Expand Up @@ -84,11 +76,7 @@ You can specify the [Template Content](https://help.syncfusion.com/cr/aspnetcore

## Adding opposite content

<<<<<<<< HEAD:ej2-asp-core-mvc/timeline/EJ2_ASP.MVC/items.md
You can add additional information to each Timeline item, by using the [oppositeContent](https://help.syncfusion.com/cr/aspnetmvc-js2/Syncfusion.EJ2.Layouts.TimelineItem.html#Syncfusion_EJ2_Layouts_TimelineItem_OppositeContent) property which is positioned opposite to the item content. Similar to the `content` property you can define `string` or `function` as contents to the oppositeContent.
========
You can add additional information to each Timeline item, by using the [oppositeContent](https://help.syncfusion.com/cr/aspnetcore-js2/Syncfusion.EJ2.Layouts.TimelineItem.html#Syncfusion_EJ2_Layouts_TimelineItem_OppositeContent) property which is positioned opposite to the item content. Similar to the `content` property you can define `string` or `function` as contents to the oppositeContent.
>>>>>>>> remotes/origin/hotfix/hotfix-v25.1.35:ej2-asp-core-mvc/timeline/EJ2_ASP.NETCORE/items.md

{% if page.publishingplatform == "aspnet-core" %}

Expand Down Expand Up @@ -117,11 +105,7 @@ You can add additional information to each Timeline item, by using the [opposite

## Dot item

<<<<<<<< HEAD:ej2-asp-core-mvc/timeline/EJ2_ASP.MVC/items.md
You can define CSS class to set icons, background colors, or images to personalize the appearance of dots associated with each Timeline item by using the [dotCss](https://help.syncfusion.com/cr/aspnetmvc-js2/Syncfusion.EJ2.Layouts.TimelineItem.html#Syncfusion_EJ2_Layouts_TimelineItem_DotCss) property.
========
You can define CSS class to set icons, background colors, or images to personalize the appearance of dots associated with each Timeline item by using the [dotCss](https://help.syncfusion.com/cr/aspnetcore-js2/Syncfusion.EJ2.Layouts.TimelineItem.html#Syncfusion_EJ2_Layouts_TimelineItem_DotCss) property.
>>>>>>>> remotes/origin/hotfix/hotfix-v25.1.35:ej2-asp-core-mvc/timeline/EJ2_ASP.NETCORE/items.md

### Adding icons

Expand Down Expand Up @@ -162,11 +146,7 @@ You can display text for the Timeline items using the `dotCss` property, by addi

## Disabling items

<<<<<<<< HEAD:ej2-asp-core-mvc/timeline/EJ2_ASP.MVC/items.md
You can use the [disabled](https://help.syncfusion.com/cr/aspnetmvc-js2/Syncfusion.EJ2.Layouts.TimelineItem.html#Syncfusion_EJ2_Layouts_TimelineItem_Disabled) property to disable an item when set to `true`. By default, the value is `false`.
========
You can use the [disabled](https://help.syncfusion.com/cr/aspnetcore-js2/Syncfusion.EJ2.Layouts.TimelineItem.html#Syncfusion_EJ2_Layouts_TimelineItem_Disabled) property to disable an item when set to `true`. By default, the value is `false`.
>>>>>>>> remotes/origin/hotfix/hotfix-v25.1.35:ej2-asp-core-mvc/timeline/EJ2_ASP.NETCORE/items.md

{% if page.publishingplatform == "aspnet-core" %}

Expand Down Expand Up @@ -195,8 +175,4 @@ You can use the [disabled](https://help.syncfusion.com/cr/aspnetcore-js2/Syncfus

## CSS class

<<<<<<<< HEAD:ej2-asp-core-mvc/timeline/EJ2_ASP.MVC/items.md
The [cssClass](https://help.syncfusion.com/cr/aspnetmvc-js2/Syncfusion.EJ2.Layouts.TimelineItem.html#Syncfusion_EJ2_Layouts_TimelineItem_CssClass) property allows you to define a custom class to modify the appearance of the Timeline item.
========
The [cssClass](https://help.syncfusion.com/cr/aspnetcore-js2/Syncfusion.EJ2.Layouts.TimelineItem.html#Syncfusion_EJ2_Layouts_TimelineItem_CssClass) property allows you to define a custom class to modify the appearance of the Timeline item.
>>>>>>>> remotes/origin/hotfix/hotfix-v25.1.35:ej2-asp-core-mvc/timeline/EJ2_ASP.NETCORE/items.md