Skip to content

documentation(920508):Resolved conflict issue #567

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
759a2a6
Integrated latest changes at 09-20-2024 7:30:07 PM
SyncfusionBuild Sep 20, 2024
4ab4fd8
Integrated latest changes at 09-21-2024 7:31:33 PM
SyncfusionBuild Sep 21, 2024
1fa37db
Integrated latest changes at 09-24-2024 7:35:27 PM
SyncfusionBuild Sep 24, 2024
343f2fa
Integrated latest changes at 09-25-2024 7:30:37 PM
SyncfusionBuild Sep 25, 2024
ba40ca7
Integrated latest changes at 09-26-2024 7:30:24 PM
SyncfusionBuild Sep 26, 2024
91264d2
Integrated latest changes at 09-27-2024 7:30:09 PM
SyncfusionBuild Sep 27, 2024
83f9391
Integrated latest changes at 09-28-2024 7:30:06 PM
SyncfusionBuild Sep 28, 2024
e9d0c3e
Integrated latest changes at 09-30-2024 7:31:02 PM
SyncfusionBuild Sep 30, 2024
335b6cd
Integrated latest changes at 10-01-2024 7:33:29 PM
SyncfusionBuild Oct 1, 2024
14c87ce
Integrated latest changes at 10-02-2024 7:37:55 PM
SyncfusionBuild Oct 2, 2024
9c4787e
Integrated latest changes at 10-05-2024 7:30:12 PM
SyncfusionBuild Oct 5, 2024
939e346
Integrated latest changes at 10-07-2024 10:29:32 PM
SyncfusionBuild Oct 7, 2024
1c64d80
Integrated latest changes at 10-09-2024 7:30:24 PM
SyncfusionBuild Oct 9, 2024
baebed8
Integrated latest changes at 10-10-2024 7:33:38 PM
SyncfusionBuild Oct 10, 2024
deda3da
Integrated latest changes at 10-11-2024 11:01:19 AM
SyncfusionBuild Oct 11, 2024
c4962fa
Integrated latest changes at 10-12-2024 7:30:06 PM
SyncfusionBuild Oct 12, 2024
5fdd7e9
Integrated latest changes at 10-14-2024 7:30:12 PM
SyncfusionBuild Oct 14, 2024
764e922
Integrated latest changes at 10-15-2024 7:34:24 PM
SyncfusionBuild Oct 15, 2024
b82b403
Integrated latest changes at 10-16-2024 7:30:36 PM
SyncfusionBuild Oct 16, 2024
67a78ea
Integrated latest changes at 10-17-2024 7:30:12 PM
SyncfusionBuild Oct 17, 2024
fe3b71d
Integrated latest changes at 10-18-2024 7:30:18 PM
SyncfusionBuild Oct 18, 2024
55735b1
Integrated latest changes at 10-19-2024 7:31:32 PM
SyncfusionBuild Oct 19, 2024
bd9203f
Integrated latest changes at 10-21-2024 7:30:12 PM
SyncfusionBuild Oct 21, 2024
2bedd3d
Integrated latest changes at 10-23-2024 7:30:08 PM
SyncfusionBuild Oct 23, 2024
6227564
Integrated latest changes at 10-24-2024 7:30:41 PM
SyncfusionBuild Oct 24, 2024
b95e4e9
Integrated latest changes at 10-25-2024 7:32:13 PM
SyncfusionBuild Oct 25, 2024
a526604
Integrated latest changes at 10-26-2024 7:30:06 PM
SyncfusionBuild Oct 26, 2024
5167dea
Integrated latest changes at 10-27-2024 7:30:12 PM
SyncfusionBuild Oct 27, 2024
11acd78
Integrated latest changes at 10-28-2024 7:31:01 PM
SyncfusionBuild Oct 28, 2024
c5d0a18
Integrated latest changes at 10-29-2024 7:31:16 PM
SyncfusionBuild Oct 29, 2024
8bc1f62
Integrated latest changes at 10-30-2024 7:31:00 PM
SyncfusionBuild Oct 30, 2024
0c38fd8
Integrated latest changes at 10-31-2024 7:31:16 PM
SyncfusionBuild Oct 31, 2024
c3c2684
Integrated latest changes at 11-01-2024 7:33:56 PM
SyncfusionBuild Nov 1, 2024
e4d89e1
Integrated latest changes at 11-04-2024 7:30:16 PM
SyncfusionBuild Nov 4, 2024
7c67a78
Integrated latest changes at 11-06-2024 7:30:27 PM
SyncfusionBuild Nov 6, 2024
9979a17
Integrated latest changes at 11-08-2024 12:14:30 PM
SyncfusionBuild Nov 8, 2024
44800d9
Integrated latest changes at 11-09-2024 7:31:26 PM
SyncfusionBuild Nov 9, 2024
fb1942e
Integrated latest changes at 11-11-2024 7:30:14 PM
SyncfusionBuild Nov 11, 2024
198a896
Integrated latest changes at 11-12-2024 7:30:31 PM
SyncfusionBuild Nov 12, 2024
c352690
Integrated latest changes at 11-13-2024 6:10:52 PM
SyncfusionBuild Nov 13, 2024
db6b20e
Integrated latest changes at 11-13-2024 9:41:03 PM
SyncfusionBuild Nov 13, 2024
eb0403d
documentation(920508):Resolved conflict issue
JamunaSundaramSF3699 Nov 14, 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
9 changes: 9 additions & 0 deletions ej2-react/code-snippet/grid/excel-export-merge/index.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.e-grid .custom {
background-color: #f48fb1 !important;/* csslint allow: important */
color: white;
}

.e-grid .custom {
background-color: #fce4ec;
color: white;
}
2 changes: 1 addition & 1 deletion ej2-react/grid/filtering/filter-menu.md
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ function App() {
}
;
export default App;

{% endraw %}
{% endhighlight %}
{% highlight js tabtitle="datasource.jsx" %}
{% include code-snippet/grid/filter-method/app/datasource.jsx %}
Expand Down