Skip to content

936558: Resolved the conflict for Angular docs #779

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.

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

Open
wants to merge 29 commits into
base: master
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
45cd806
Integrated latest changes at 01-30-2025 1:30:05 AM
SyncfusionBuild Jan 29, 2025
8c74a68
Integrated latest changes at 01-31-2025 1:30:11 AM
SyncfusionBuild Jan 30, 2025
48b5434
Integrated latest changes at 02-01-2025 1:30:11 AM
SyncfusionBuild Jan 31, 2025
0861be6
Integrated latest changes at 02-04-2025 1:41:02 AM
SyncfusionBuild Feb 4, 2025
cd7fa97
Integrated latest changes at 02-09-2025 1:30:58 AM
SyncfusionBuild Feb 8, 2025
6175fe7
Integrated latest changes at 02-10-2025 1:30:43 AM
SyncfusionBuild Feb 10, 2025
d431ccf
Integrated latest changes at 02-12-2025 1:35:03 AM
SyncfusionBuild Feb 12, 2025
3ac454a
Integrated latest changes at 02-14-2025 1:30:27 AM
SyncfusionBuild Feb 14, 2025
4393ecf
Integrated latest changes at 02-16-2025 1:36:05 AM
SyncfusionBuild Feb 16, 2025
86500b1
Integrated latest changes at 02-24-2025 1:30:19 AM
SyncfusionBuild Feb 23, 2025
47b229b
Integrated latest changes at 02-27-2025 1:31:28 AM
SyncfusionBuild Feb 26, 2025
3b9c79c
Integrated latest changes at 03-03-2025 1:30:27 AM
SyncfusionBuild Mar 3, 2025
c464886
Integrated latest changes at 03-07-2025 1:30:12 AM
SyncfusionBuild Mar 6, 2025
f1fd097
Integrated latest changes at 03-08-2025 1:30:11 AM
SyncfusionBuild Mar 7, 2025
0c78939
Integrated latest changes at 03-11-2025 1:30:11 AM
SyncfusionBuild Mar 10, 2025
10e4ca6
Integrated latest changes at 03-12-2025 1:30:10 AM
SyncfusionBuild Mar 11, 2025
79ccdfc
Integrated latest changes at 03-13-2025 1:33:12 AM
SyncfusionBuild Mar 12, 2025
144b8b6
Integrated latest changes at 03-14-2025 1:30:12 AM
SyncfusionBuild Mar 13, 2025
64e45be
Integrated latest changes at 03-15-2025 1:30:13 AM
SyncfusionBuild Mar 14, 2025
6f577e3
Integrated latest changes at 03-16-2025 1:30:23 AM
SyncfusionBuild Mar 15, 2025
4905ce2
Integrated latest changes at 03-18-2025 1:30:12 AM
SyncfusionBuild Mar 17, 2025
93825a8
Integrated latest changes at 03-19-2025 1:30:06 AM
SyncfusionBuild Mar 18, 2025
879d987
Integrated latest changes at 03-20-2025 1:30:11 AM
SyncfusionBuild Mar 19, 2025
933be26
Integrated latest changes at 03-21-2025 1:30:46 AM
SyncfusionBuild Mar 21, 2025
78a5198
Integrated latest changes at 03-22-2025 1:30:12 AM
SyncfusionBuild Mar 21, 2025
f2485ac
Integrated latest changes at 03-24-2025 1:30:07 AM
SyncfusionBuild Mar 23, 2025
72af2d7
Integrated latest changes at 03-24-2025 5:28:39 PM
SyncfusionBuild Mar 24, 2025
0010c2e
Integrated latest changes at 03-25-2025 1:30:08 AM
SyncfusionBuild Mar 24, 2025
f2087f4
948994: resolved the conflict
elayabharathi-sf4336 Mar 25, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
32 changes: 23 additions & 9 deletions ej2-angular-toc.html
Original file line number Diff line number Diff line change
Expand Up @@ -744,8 +744,10 @@
<li><a href="/ej2-angular/data/getting-started">Getting Started</a></li>
<li><a href="/ej2-angular/data/data-binding">Data Binding</a></li>
<li><a href="/ej2-angular/data/adaptors">Adaptors</a></li>
<li><a href="/ej2-angular/data/cache">Cache</a></li>
<li><a href="/ej2-angular/data/querying">Querying</a></li>
<li><a href="/ej2-angular/data/manipulation">CRUD Data operations</a></li>
<li><a href="/ej2-angular/data/applying-middleware-logic">Applying Middleware Logic</a></li>
<li><a href="/ej2-angular/data/how-to">How To</a></li>
</ul>
</li><li>
Expand Down Expand Up @@ -1342,10 +1344,9 @@
</ul>
</li>
<li><a href="/ej2-angular/gantt/pdf-export/pdf-export">Pdf Export</a>
<ul>
<li><a href="/ej2-angular/gantt/pdf-export/multiple-gantt-exporting">Multiple Gantt Exporting</a></li>
<li><a href="/ej2-angular/gantt/pdf-export/customize-pdf-export">Customize PDF Export</a></li>
<ul>
<li><a href="/ej2-angular/gantt/pdf-export/header-and-footer">Header and Footer</a></li>
<li><a href="/ej2-angular/gantt/pdf-export/customize-pdf-export">Customize PDF Export</a></li>
</ul>
</li>
</ul>
Expand Down Expand Up @@ -1559,25 +1560,25 @@
<li><a href="/ej2-angular/image-editor/end-user-capabilities">End User Capabilities</a></li>
<li><a href="/ej2-angular/image-editor/open-save">Open and Save</a></li>
<li><a href="/ej2-angular/image-editor/selection-cropping">Selection and Cropping</a></li>
<li><a href="/ej2-angular/image-editor/annotation">Annotation</a></li>
<li><a href="/ej2-angular/image-editor/transform">Transform</a></li>
<li><a href="/ej2-angular/image-editor/toolbar">Toolbar</a></li>
<li><a href="/ej2-angular/image-editor/annotation">Annotation</a></li>
<li><a href="/ej2-angular/image-editor/z-order">Z-order</a></li>
<li><a href="/ej2-angular/image-editor/quick-access">Quick Access Toolbar</a></li>
<li><a href="/ej2-angular/image-editor/undo-redo">Undo And Redo</a></li>
<li><a href="/ej2-angular/image-editor/filter">Filter</a></li>
<li><a href="/ej2-angular/image-editor/finetune">Finetune</a></li>
<li><a href="/ej2-angular/image-editor/filter">Filter</a></li>
<li><a href="/ej2-angular/image-editor/frame">Frame</a></li>
<li><a href="/ej2-angular/image-editor/resize">Resize</a></li>
<li><a href="/ej2-angular/image-editor/z-order">Z-order</a></li>
<li><a href="/ej2-angular/image-editor/redact">Redact</a></li>
<li><a href="/ej2-angular/image-editor/undo-redo">Undo Redo</a></li>
<li><a href="/ej2-angular/image-editor/image-restrictions">Image Restrictions</a></li>
<li><a href="/ej2-angular/image-editor/toolbar">Toolbar</a></li>
<li><a href="/ej2-angular/image-editor/localization">Localization</a></li>
<li><a href="/ej2-angular/image-editor/accessibility">Accessibility</a></li>
<li>How To
<ul>
<li><a href="/ej2-angular/image-editor/how-to/reset-image">Reset an Image</a></li>
<li><a href="/ej2-angular/image-editor/how-to/clear-image">Clear an Image</a></li>
<li><a href="/ej2-angular/image-editor/how-to/render-dialog">Render Dialog in Image Editor</a></li>
<li><a href="/ej2-angular/image-editor/how-to/reset-image">Reset an Image</a></li>
</ul>
</li>
<li><a href="https://ej2.syncfusion.com/angular/documentation/api/image-editor/">API Reference</a></li>
Expand Down Expand Up @@ -2550,6 +2551,19 @@
<li><a href="https://ej2.syncfusion.com/angular/documentation/api/sparkline/">API Reference</a></li>
</ul>
</li><li>
Speech To Text
<ul>
<li><a href="/ej2-angular/speech-to-text/getting-started">Getting Started</a></li>
<li><a href="/ej2-angular/speech-to-text/speech-recognition">Speech recognition</a></li>
<li><a href="/ej2-angular/speech-to-text/appearance">Appearance</a></li>
<li><a href="/ej2-angular/speech-to-text/globalization">Globalization</a></li>
<li><a href="/ej2-angular/speech-to-text/accessibility">Accessibility</a></li>
<li><a href="/ej2-angular/speech-to-text/security">Security concerns</a></li>
<li><a href="/ej2-angular/speech-to-text/methods">Methods</a></li>
<li><a href="/ej2-angular/speech-to-text/events">Events</a></li>
<li><a href="https://ej2.syncfusion.com/angular/documentation/api/speech-to-text/">API Reference</a></li>
</ul>
</li><li>
Speed Dial
<ul>
<li><a href="/ej2-angular/speed-dial/getting-started">Getting Started</a></li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,3 @@
top: 45%;
left: 45%;
}

#wrapper {
height: 350px;
width: 650px;
}

.e-aiassistview.custom-container {
border-color: #e0e0e0;
background-color: #f4f4f4;
box-shadow: 3px 3px 10px 0px rgba(0, 0, 0, 0.2);
}
.e-aiassistview.custom-container .e-view-header .e-toolbar,
.e-aiassistview.custom-container .e-view-header .e-toolbar-items {
background: #d5d5d5;
}
.e-aiassistview.custom-container .e-view-content .e-input-group {
border: 3px solid #e0e0e0;
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@syncfusion/ej2-angular-interactive-chat": "*",
"@syncfusion/ej2-angular-inputs": "*",
"@syncfusion/ej2-angular-navigations": "*",
"@syncfusion/ej2-interactive-chat": "*",
"@angular/animations": "17.1.2",
"@angular/common": "17.1.2",
"@angular/compiler": "17.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,22 @@
@import '../node_modules/@syncfusion/ej2-interactive-chat/styles/material.css';
@import '../node_modules/@syncfusion/ej2-inputs/styles/material.css';
@import '../node_modules/@syncfusion/ej2-navigations/styles/material.css';
@import '../node_modules/@syncfusion/ej2-notifications/styles/material.css';
@import '../node_modules/@syncfusion/ej2-notifications/styles/material.css';

#wrapper {
height: 350px;
width: 650px;
}

.e-aiassistview.custom-container {
border-color: #e0e0e0;
background-color: #f4f4f4;
box-shadow: 3px 3px 10px 0px rgba(0, 0, 0, 0.2);
}
.e-aiassistview.custom-container .e-view-header .e-toolbar,
.e-aiassistview.custom-container .e-view-header .e-toolbar-items {
background: #d5d5d5;
}
.e-aiassistview.custom-container .e-view-content .e-input-group {
border: 3px solid #e0e0e0;
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,3 @@
top: 45%;
left: 45%;
}

#wrapper {
width: 650px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@syncfusion/ej2-angular-interactive-chat": "*",
"@syncfusion/ej2-angular-inputs": "*",
"@syncfusion/ej2-angular-navigations": "*",
"@syncfusion/ej2-interactive-chat": "*",
"@angular/animations": "17.1.2",
"@angular/common": "17.1.2",
"@angular/compiler": "17.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@
@import '../node_modules/@syncfusion/ej2-interactive-chat/styles/material.css';
@import '../node_modules/@syncfusion/ej2-inputs/styles/material.css';
@import '../node_modules/@syncfusion/ej2-navigations/styles/material.css';
@import '../node_modules/@syncfusion/ej2-notifications/styles/material.css';
@import '../node_modules/@syncfusion/ej2-notifications/styles/material.css';

#wrapper {
width: 650px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,3 @@
top: 45%;
left: 45%;
}

#wrapper {
height: 350px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@syncfusion/ej2-angular-interactive-chat": "*",
"@syncfusion/ej2-angular-inputs": "*",
"@syncfusion/ej2-angular-navigations": "*",
"@syncfusion/ej2-interactive-chat": "*",
"@angular/animations": "17.1.2",
"@angular/common": "17.1.2",
"@angular/compiler": "17.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@
@import '../node_modules/@syncfusion/ej2-interactive-chat/styles/material.css';
@import '../node_modules/@syncfusion/ej2-inputs/styles/material.css';
@import '../node_modules/@syncfusion/ej2-navigations/styles/material.css';
@import '../node_modules/@syncfusion/ej2-notifications/styles/material.css';
@import '../node_modules/@syncfusion/ej2-notifications/styles/material.css';

#wrapper {
height: 350px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,3 @@
top: 45%;
left: 45%;
}

#wrapper {
height: 350px;
width: 650px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@syncfusion/ej2-angular-interactive-chat": "*",
"@syncfusion/ej2-angular-inputs": "*",
"@syncfusion/ej2-angular-navigations": "*",
"@syncfusion/ej2-interactive-chat": "*",
"@angular/animations": "17.1.2",
"@angular/common": "17.1.2",
"@angular/compiler": "17.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { AIAssistViewModule } from '@syncfusion/ej2-angular-interactive-chat';

import { Component, HostListener, ViewChild } from '@angular/core';
import { AIAssistViewComponent, PromptRequestEventArgs } from '@syncfusion/ej2-angular-interactive-chat';
import { AIAssistViewComponent } from '@syncfusion/ej2-angular-interactive-chat';
import { PromptRequestEventArgs } from '@syncfusion/ej2-interactive-chat';


@Component({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,9 @@
@import '../node_modules/@syncfusion/ej2-interactive-chat/styles/material.css';
@import '../node_modules/@syncfusion/ej2-inputs/styles/material.css';
@import '../node_modules/@syncfusion/ej2-navigations/styles/material.css';
@import '../node_modules/@syncfusion/ej2-notifications/styles/material.css';
@import '../node_modules/@syncfusion/ej2-notifications/styles/material.css';

#wrapper {
height: 350px;
width: 650px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,3 @@
top: 45%;
left: 45%;
}

#wrapper {
height: 350px;
width: 650px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@syncfusion/ej2-angular-interactive-chat": "*",
"@syncfusion/ej2-angular-inputs": "*",
"@syncfusion/ej2-angular-navigations": "*",
"@syncfusion/ej2-interactive-chat": "*",
"@angular/animations": "17.1.2",
"@angular/common": "17.1.2",
"@angular/compiler": "17.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,9 @@
@import '../node_modules/@syncfusion/ej2-interactive-chat/styles/material.css';
@import '../node_modules/@syncfusion/ej2-inputs/styles/material.css';
@import '../node_modules/@syncfusion/ej2-navigations/styles/material.css';
@import '../node_modules/@syncfusion/ej2-notifications/styles/material.css';
@import '../node_modules/@syncfusion/ej2-notifications/styles/material.css';

#wrapper {
height: 350px;
width: 650px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,3 @@
top: 45%;
left: 45%;
}

#wrapper {
height: 350px;
width: 650px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@syncfusion/ej2-angular-interactive-chat": "*",
"@syncfusion/ej2-angular-inputs": "*",
"@syncfusion/ej2-angular-navigations": "*",
"@syncfusion/ej2-interactive-chat": "*",
"@angular/animations": "17.1.2",
"@angular/common": "17.1.2",
"@angular/compiler": "17.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { AIAssistViewModule } from '@syncfusion/ej2-angular-interactive-chat';

import { Component, HostListener, ViewChild } from '@angular/core';
import { AIAssistViewComponent, PromptRequestEventArgs } from '@syncfusion/ej2-angular-interactive-chat';
import { AIAssistViewComponent } from '@syncfusion/ej2-angular-interactive-chat';
import { PromptRequestEventArgs } from '@syncfusion/ej2-interactive-chat';


@Component({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,9 @@
@import '../node_modules/@syncfusion/ej2-interactive-chat/styles/material.css';
@import '../node_modules/@syncfusion/ej2-inputs/styles/material.css';
@import '../node_modules/@syncfusion/ej2-navigations/styles/material.css';
@import '../node_modules/@syncfusion/ej2-notifications/styles/material.css';
@import '../node_modules/@syncfusion/ej2-notifications/styles/material.css';

#wrapper {
height: 350px;
width: 650px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,3 @@
top: 45%;
left: 45%;
}

#wrapper {
height: 350px;
width: 650px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@syncfusion/ej2-angular-interactive-chat": "*",
"@syncfusion/ej2-angular-inputs": "*",
"@syncfusion/ej2-angular-navigations": "*",
"@syncfusion/ej2-interactive-chat": "*",
"@angular/animations": "17.1.2",
"@angular/common": "17.1.2",
"@angular/compiler": "17.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { AIAssistViewModule } from '@syncfusion/ej2-angular-interactive-chat';

import { Component, HostListener, ViewChild } from '@angular/core';
import { AIAssistViewComponent, PromptRequestEventArgs } from '@syncfusion/ej2-angular-interactive-chat';
import { AIAssistViewComponent } from '@syncfusion/ej2-angular-interactive-chat';
import { PromptRequestEventArgs } from '@syncfusion/ej2-interactive-chat';


@Component({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,9 @@
@import '../node_modules/@syncfusion/ej2-interactive-chat/styles/material.css';
@import '../node_modules/@syncfusion/ej2-inputs/styles/material.css';
@import '../node_modules/@syncfusion/ej2-navigations/styles/material.css';
@import '../node_modules/@syncfusion/ej2-notifications/styles/material.css';
@import '../node_modules/@syncfusion/ej2-notifications/styles/material.css';

#wrapper {
height: 350px;
width: 650px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,3 @@
top: 45%;
left: 45%;
}

#wrapper {
height: 350px;
width: 650px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@syncfusion/ej2-angular-interactive-chat": "*",
"@syncfusion/ej2-angular-inputs": "*",
"@syncfusion/ej2-angular-navigations": "*",
"@syncfusion/ej2-interactive-chat": "*",
"@angular/animations": "17.1.2",
"@angular/common": "17.1.2",
"@angular/compiler": "17.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,9 @@
@import '../node_modules/@syncfusion/ej2-interactive-chat/styles/material.css';
@import '../node_modules/@syncfusion/ej2-inputs/styles/material.css';
@import '../node_modules/@syncfusion/ej2-navigations/styles/material.css';
@import '../node_modules/@syncfusion/ej2-notifications/styles/material.css';
@import '../node_modules/@syncfusion/ej2-notifications/styles/material.css';

#wrapper {
height: 350px;
width: 650px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,3 @@
top: 45%;
left: 45%;
}

#wrapper {
height: 350px;
width: 650px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@syncfusion/ej2-angular-interactive-chat": "*",
"@syncfusion/ej2-angular-inputs": "*",
"@syncfusion/ej2-angular-navigations": "*",
"@syncfusion/ej2-interactive-chat": "*",
"@angular/animations": "17.1.2",
"@angular/common": "17.1.2",
"@angular/compiler": "17.1.2",
Expand Down
Loading