Skip to content

Commit 532bbc7

Browse files
authored
Merge branch '25_2' into issue-1702_25_2
2 parents 7ba296e + a3a77e8 commit 532bbc7

File tree

992 files changed

+11245
-8602
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

992 files changed

+11245
-8602
lines changed

apps/demos/Demos/CardView/DataValidation/Angular/app/app.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ const employees: Employee[] = [{
503503
"status": "Salaried",
504504
"notes": "Amelia (like Taylor) is a member of our hard-working network admin team. She loves to help so don’t hesistate to ask her for assistance.\r\n\r\nIn her spare time, Amelia coaches young tennis players at the park.",
505505
"pictureName": "Amelia Harper.jpg",
506-
"picture": "../../../../images/employees/new/new/Amelia Harper.jpg",
506+
"picture": "../../../../images/employees/new/Amelia Harper.jpg",
507507
},
508508
{
509509
"id": 23,

apps/demos/Demos/CardView/DataValidation/React/data.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ export const employees: Employee[] = [{
501501
"status": "Salaried",
502502
"notes": "Amelia (like Taylor) is a member of our hard-working network admin team. She loves to help so don’t hesistate to ask her for assistance.\r\n\r\nIn her spare time, Amelia coaches young tennis players at the park.",
503503
"pictureName": "Amelia Harper.jpg",
504-
"picture": "../../../../images/employees/new/new/Amelia Harper.jpg",
504+
"picture": "../../../../images/employees/new/Amelia Harper.jpg",
505505
},
506506
{
507507
"id": 23,

apps/demos/Demos/CardView/DataValidation/ReactJs/data.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ export const employees = [
497497
notes:
498498
'Amelia (like Taylor) is a member of our hard-working network admin team. She loves to help so don’t hesistate to ask her for assistance.\r\n\r\nIn her spare time, Amelia coaches young tennis players at the park.',
499499
pictureName: 'Amelia Harper.jpg',
500-
picture: '../../../../images/employees/new/new/Amelia Harper.jpg',
500+
picture: '../../../../images/employees/new/Amelia Harper.jpg',
501501
},
502502
{
503503
id: 23,

apps/demos/Demos/CardView/DataValidation/Vue/data.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ export const employees: Employee[] = [{
501501
"status": "Salaried",
502502
"notes": "Amelia (like Taylor) is a member of our hard-working network admin team. She loves to help so don’t hesistate to ask her for assistance.\r\n\r\nIn her spare time, Amelia coaches young tennis players at the park.",
503503
"pictureName": "Amelia Harper.jpg",
504-
"picture": "../../../../images/employees/new/new/Amelia Harper.jpg",
504+
"picture": "../../../../images/employees/new/Amelia Harper.jpg",
505505
},
506506
{
507507
"id": 23,

apps/demos/Demos/CardView/DataValidation/jQuery/data.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ const employees = [{
476476
"status": "Salaried",
477477
"notes": "Amelia (like Taylor) is a member of our hard-working network admin team. She loves to help so don’t hesistate to ask her for assistance.\r\n\r\nIn her spare time, Amelia coaches young tennis players at the park.",
478478
"pictureName": "Amelia Harper.jpg",
479-
"picture": "../../../../images/employees/new/new/Amelia Harper.jpg",
479+
"picture": "../../../../images/employees/new/Amelia Harper.jpg",
480480
},
481481
{
482482
"id": 23,

apps/demos/Demos/CardView/PopupEditing/Angular/app/app.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ const employees: Employee[] = [{
503503
"status": "Salaried",
504504
"notes": "Amelia (like Taylor) is a member of our hard-working network admin team. She loves to help so don’t hesistate to ask her for assistance.\r\n\r\nIn her spare time, Amelia coaches young tennis players at the park.",
505505
"pictureName": "Amelia Harper.jpg",
506-
"picture": "../../../../images/employees/new/new/Amelia Harper.jpg",
506+
"picture": "../../../../images/employees/new/Amelia Harper.jpg",
507507
},
508508
{
509509
"id": 23,

apps/demos/Demos/CardView/PopupEditing/React/data.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ export const employees: Employee[] = [{
501501
"status": "Salaried",
502502
"notes": "Amelia (like Taylor) is a member of our hard-working network admin team. She loves to help so don’t hesistate to ask her for assistance.\r\n\r\nIn her spare time, Amelia coaches young tennis players at the park.",
503503
"pictureName": "Amelia Harper.jpg",
504-
"picture": "../../../../images/employees/new/new/Amelia Harper.jpg",
504+
"picture": "../../../../images/employees/new/Amelia Harper.jpg",
505505
},
506506
{
507507
"id": 23,

apps/demos/Demos/CardView/PopupEditing/ReactJs/data.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ export const employees = [
497497
notes:
498498
'Amelia (like Taylor) is a member of our hard-working network admin team. She loves to help so don’t hesistate to ask her for assistance.\r\n\r\nIn her spare time, Amelia coaches young tennis players at the park.',
499499
pictureName: 'Amelia Harper.jpg',
500-
picture: '../../../../images/employees/new/new/Amelia Harper.jpg',
500+
picture: '../../../../images/employees/new/Amelia Harper.jpg',
501501
},
502502
{
503503
id: 23,

apps/demos/Demos/CardView/PopupEditing/Vue/data.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ export const employees: Employee[] = [{
501501
"status": "Salaried",
502502
"notes": "Amelia (like Taylor) is a member of our hard-working network admin team. She loves to help so don’t hesistate to ask her for assistance.\r\n\r\nIn her spare time, Amelia coaches young tennis players at the park.",
503503
"pictureName": "Amelia Harper.jpg",
504-
"picture": "../../../../images/employees/new/new/Amelia Harper.jpg",
504+
"picture": "../../../../images/employees/new/Amelia Harper.jpg",
505505
},
506506
{
507507
"id": 23,

apps/demos/Demos/CardView/PopupEditing/jQuery/data.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ const employees = [{
476476
"status": "Salaried",
477477
"notes": "Amelia (like Taylor) is a member of our hard-working network admin team. She loves to help so don’t hesistate to ask her for assistance.\r\n\r\nIn her spare time, Amelia coaches young tennis players at the park.",
478478
"pictureName": "Amelia Harper.jpg",
479-
"picture": "../../../../images/employees/new/new/Amelia Harper.jpg",
479+
"picture": "../../../../images/employees/new/Amelia Harper.jpg",
480480
},
481481
{
482482
"id": 23,

0 commit comments

Comments
 (0)