Skip to content

Commit cc5f569

Browse files
authored
Merge branch 'master' into nrobakova/refactor-keyboardNav-tests
2 parents 6e1e875 + 17e39a0 commit cc5f569

File tree

4 files changed

+29
-16
lines changed

4 files changed

+29
-16
lines changed

ROADMAP.md

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,39 @@
11
# Roadmap - Ignite UI for Angular
22

33
# Current Milestone
4-
## Milestone 10 (Due by December, 2019)
4+
5+
## Milestone 11 (Due by April, 2020)
56

67
1. Dock Manger [#5980](https://github.com/IgniteUI/igniteui-angular/issues/5980)
7-
2. Theming service for Ignite UI for Angular [#5999](https://github.com/IgniteUI/igniteui-angular/issues/5999)
8+
2. Range Date Picker [#5732](https://github.com/IgniteUI/igniteui-angular/issues/5732)
9+
3. RTL Support across Ignite UI for Angular components [#5958](https://github.com/IgniteUI/igniteui-angular/issues/5958)
10+
4. Column freezing/Pinning on the right (igx-grid) [#5879](https://github.com/IgniteUI/igniteui-angular/issues/5879)
11+
5. Column Selection for IgxGrid [#6638](https://github.com/IgniteUI/igniteui-angular/issues/6638)
12+
6. Splitter IgxGrid [#6639](https://github.com/IgniteUI/igniteui-angular/issues/6639)
13+
7. Row Pinning IgxGrid [#6640](https://github.com/IgniteUI/igniteui-angular/issues/6640)
14+
8. Data Analysis Directive [#1752](https://github.com/IgniteUI/igniteui-angular-samples/issues/1752)
15+
16+
17+
## Going down the road
18+
19+
1. Tile Manager
20+
2. Visual Cell merging
21+
22+
# Previous Milestones
23+
24+
## Milestone 10 (Released February 10th, 2020)
25+
26+
1. Dock Manger [#5980](https://github.com/IgniteUI/igniteui-angular/issues/5980)
27+
2. **[DONE]** Theming service for Ignite UI for Angular [#5999](https://github.com/IgniteUI/igniteui-angular/issues/5999)
828
3. Range Date Picker [#5732](https://github.com/IgniteUI/igniteui-angular/issues/5732)
929
4. **[DONE]** igxGrid overlay components exposed for instantiation in arbitrary container [#5878](https://github.com/IgniteUI/igniteui-angular/issues/5878)
1030
5. RTL Support across Ignite UI for Angular components [#5958](https://github.com/IgniteUI/igniteui-angular/issues/5958)
1131
6. **[DONE]** Carousel slide animations/transitions [#4268](https://github.com/IgniteUI/igniteui-angular/issues/4268)
1232
7. **[DONE]** Access all data when calculating summary per column [#5754](https://github.com/IgniteUI/igniteui-angular/issues/5754)
13-
8. Angular 9 support [#5998](https://github.com/IgniteUI/igniteui-angular/issues/5998)
33+
8. **[DONE]** Angular 9 support [#5998](https://github.com/IgniteUI/igniteui-angular/issues/5998)
1434
9. **[DONE]** Allow master-detail style visualization with igxHierarchicalGrid [#5880](https://github.com/IgniteUI/igniteui-angular/issues/5880)
1535
10. **[DONE]** Collapsible column groups (column expansion state templates) [#3343](https://github.com/IgniteUI/igniteui-angular/issues/3343)
1636

17-
## Going down the road
18-
19-
1. Row-pinning
20-
2. Visual Cell merging
21-
3. Splitter
22-
4. PDF Integration
23-
24-
# Previous Milestones
25-
2637
## Milestone 9 (Released September 26th, 2019)
2738

2839
1. **[DONE]** IgxGrid Advanced Filtering [#5496](https://github.com/IgniteUI/igniteui-angular/issues/5496)

projects/igniteui-angular/migrations/common/UpdateChanges.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,9 @@ export class UpdateChanges {
186186
const pos = positions[i];
187187
fileContent = fileContent.slice(0, pos.start) + change.replaceWith + fileContent.slice(pos.end);
188188
}
189-
this.host.overwrite(entryPath, fileContent);
189+
if (positions.length) {
190+
this.host.overwrite(entryPath, fileContent);
191+
}
190192
}
191193
}
192194
}
@@ -266,7 +268,7 @@ export class UpdateChanges {
266268
continue;
267269
}
268270
for (const match of matches) {
269-
if (match.indexOf(change.name)) {
271+
if (match.indexOf(change.name) !== -1) {
270272
const name = change.name.replace('$', '\\$');
271273
const reg = new RegExp(String.raw`^\s*${name}:`);
272274
const opening = `${change.owner}(`;

projects/igniteui-angular/migrations/common/util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export function getProjects(config: WorkspaceSchema): WorkspaceProject<ProjectTy
4242
for (const projName of Object.keys(config.projects)) {
4343
const proj = config.projects[projName];
4444
if ((proj.projectType && proj.projectType !== ProjectType.Application) ||
45-
(proj.architect && proj.architect.e2e)) {
45+
(proj.architect && proj.architect.e2e && !proj.architect.build)) {
4646
continue;
4747
}
4848
projects.push(proj as WorkspaceProject<ProjectType.Application>);

projects/igniteui-angular/migrations/migration-collection.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
},
6464
"migration-13": {
6565
"version": "9.0.0",
66-
"description": "Updates Ignite UI for Angular from v8.2.x to v9.2.0",
66+
"description": "Updates Ignite UI for Angular from v8.2.x to v9.0.0",
6767
"factory": "./update-9_0_0"
6868
}
6969
}

0 commit comments

Comments
 (0)