Skip to content

Commit d89f459

Browse files
LipataLipata
committed
Merge branch 'master' into combo-master
# Conflicts: # projects/igniteui-angular/src/lib/core/styles/themes/presets/igniteui-angular.scss # projects/igniteui-angular/src/lib/drop-down/drop-down.component.ts # src/app/app.module.ts # src/app/drop-down/drop-down.sample.html # src/app/routing.ts
2 parents e5a7ccc + 0b70db1 commit d89f459

Some content is hidden

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

50 files changed

+4818
-780
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
All notable changes for each version of this project will be documented in this file.
44
## 6.1.0
5+
- `igxOverlay` service added. **igxOverlayService** allows you to show any component above all elements in page. For more detailed information see the [official documentation](https://www.infragistics.com/products/ignite-ui-angular/angular/components/overlay.html)
56
- Added `column moving` feature to `igxGrid`, enabled on a per-column level. **Column moving** allows you to reorder the `igxGrid` columns via standard drag/drop mouse or touch gestures.
67
For more detailed information see the [official documentation](https://www.infragistics.com/products/ignite-ui-angular/angular/components/grid_column_moving.html).
78
- `igxGrid` filtering operands

‎angular.json‎

Lines changed: 156 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -1,162 +1,164 @@
11
{
2-
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3-
"version": 1,
4-
"newProjectRoot": "projects",
5-
"projects": {
6-
"igniteui-dev-demos": {
7-
"root": "",
8-
"sourceRoot": "src",
9-
"projectType": "application",
10-
"prefix": "app",
11-
"schematics": {},
12-
"architect": {
13-
"build": {
14-
"builder": "@angular-devkit/build-angular:browser",
15-
"options": {
16-
"outputPath": "dist/igniteui-dev-demos",
17-
"index": "src/index.html",
18-
"main": "src/main.ts",
19-
"polyfills": "src/polyfills.ts",
20-
"tsConfig": "src/tsconfig.app.json",
21-
"assets": [
22-
"src/favicon.ico",
23-
"src/assets"
24-
],
25-
"styles": [
26-
"src/styles.css"
27-
],
28-
"scripts": []
29-
},
30-
"configurations": {
31-
"production": {
32-
"fileReplacements": [
33-
{
34-
"replace": "src/environments/environment.ts",
35-
"with": "src/environments/environment.prod.ts"
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"igniteui-dev-demos": {
7+
"root": "",
8+
"sourceRoot": "src",
9+
"projectType": "application",
10+
"prefix": "app",
11+
"schematics": {
12+
"@schematics/angular:component": {
13+
"styleext": "scss"
14+
}
15+
},
16+
"architect": {
17+
"build": {
18+
"builder": "@angular-devkit/build-angular:browser",
19+
"options": {
20+
"outputPath": "dist/igniteui-dev-demos",
21+
"index": "src/index.html",
22+
"main": "src/main.ts",
23+
"polyfills": "src/polyfills.ts",
24+
"tsConfig": "src/tsconfig.app.json",
25+
"assets": [
26+
"src/favicon.ico",
27+
"src/assets"
28+
],
29+
"styles": [
30+
"src/styles/igniteui-theme.scss"
31+
],
32+
"scripts": []
33+
},
34+
"configurations": {
35+
"production": {
36+
"fileReplacements": [{
37+
"replace": "src/environments/environment.ts",
38+
"with": "src/environments/environment.prod.ts"
39+
}],
40+
"optimization": true,
41+
"outputHashing": "all",
42+
"sourceMap": false,
43+
"extractCss": true,
44+
"namedChunks": false,
45+
"aot": true,
46+
"extractLicenses": true,
47+
"vendorChunk": false,
48+
"buildOptimizer": true
49+
}
50+
}
51+
},
52+
"serve": {
53+
"builder": "@angular-devkit/build-angular:dev-server",
54+
"options": {
55+
"browserTarget": "igniteui-dev-demos:build"
56+
},
57+
"configurations": {
58+
"production": {
59+
"browserTarget": "igniteui-dev-demos:build:production"
60+
}
61+
}
62+
},
63+
"extract-i18n": {
64+
"builder": "@angular-devkit/build-angular:extract-i18n",
65+
"options": {
66+
"browserTarget": "igniteui-dev-demos:build"
67+
}
68+
},
69+
"test": {
70+
"builder": "@angular-devkit/build-angular:karma",
71+
"options": {
72+
"main": "src/test.ts",
73+
"polyfills": "src/polyfills.ts",
74+
"tsConfig": "src/tsconfig.spec.json",
75+
"karmaConfig": "src/karma.conf.js",
76+
"styles": [
77+
"src/styles.css"
78+
],
79+
"scripts": [],
80+
"assets": [
81+
"src/favicon.ico",
82+
"src/assets"
83+
]
84+
}
85+
},
86+
"lint": {
87+
"builder": "@angular-devkit/build-angular:tslint",
88+
"options": {
89+
"tsConfig": [
90+
"src/tsconfig.app.json",
91+
"src/tsconfig.spec.json"
92+
],
93+
"exclude": [
94+
"**/node_modules/**"
95+
]
96+
}
3697
}
37-
],
38-
"optimization": true,
39-
"outputHashing": "all",
40-
"sourceMap": false,
41-
"extractCss": true,
42-
"namedChunks": false,
43-
"aot": true,
44-
"extractLicenses": true,
45-
"vendorChunk": false,
46-
"buildOptimizer": true
4798
}
48-
}
4999
},
50-
"serve": {
51-
"builder": "@angular-devkit/build-angular:dev-server",
52-
"options": {
53-
"browserTarget": "igniteui-dev-demos:build"
54-
},
55-
"configurations": {
56-
"production": {
57-
"browserTarget": "igniteui-dev-demos:build:production"
100+
"igniteui-dev-demos-e2e": {
101+
"root": "e2e/",
102+
"projectType": "application",
103+
"architect": {
104+
"e2e": {
105+
"builder": "@angular-devkit/build-angular:protractor",
106+
"options": {
107+
"protractorConfig": "e2e/protractor.conf.js",
108+
"devServerTarget": "igniteui-dev-demos:serve"
109+
}
110+
},
111+
"lint": {
112+
"builder": "@angular-devkit/build-angular:tslint",
113+
"options": {
114+
"tsConfig": "e2e/tsconfig.e2e.json",
115+
"exclude": [
116+
"**/node_modules/**"
117+
]
118+
}
119+
}
58120
}
59-
}
60-
},
61-
"extract-i18n": {
62-
"builder": "@angular-devkit/build-angular:extract-i18n",
63-
"options": {
64-
"browserTarget": "igniteui-dev-demos:build"
65-
}
66-
},
67-
"test": {
68-
"builder": "@angular-devkit/build-angular:karma",
69-
"options": {
70-
"main": "src/test.ts",
71-
"polyfills": "src/polyfills.ts",
72-
"tsConfig": "src/tsconfig.spec.json",
73-
"karmaConfig": "src/karma.conf.js",
74-
"styles": [
75-
"src/styles.css"
76-
],
77-
"scripts": [],
78-
"assets": [
79-
"src/favicon.ico",
80-
"src/assets"
81-
]
82-
}
83-
},
84-
"lint": {
85-
"builder": "@angular-devkit/build-angular:tslint",
86-
"options": {
87-
"tsConfig": [
88-
"src/tsconfig.app.json",
89-
"src/tsconfig.spec.json"
90-
],
91-
"exclude": [
92-
"**/node_modules/**"
93-
]
94-
}
95-
}
96-
}
97-
},
98-
"igniteui-dev-demos-e2e": {
99-
"root": "e2e/",
100-
"projectType": "application",
101-
"architect": {
102-
"e2e": {
103-
"builder": "@angular-devkit/build-angular:protractor",
104-
"options": {
105-
"protractorConfig": "e2e/protractor.conf.js",
106-
"devServerTarget": "igniteui-dev-demos:serve"
107-
}
108121
},
109-
"lint": {
110-
"builder": "@angular-devkit/build-angular:tslint",
111-
"options": {
112-
"tsConfig": "e2e/tsconfig.e2e.json",
113-
"exclude": [
114-
"**/node_modules/**"
115-
]
116-
}
117-
}
118-
}
119-
},
120-
"igniteui-angular": {
121-
"root": "projects/igniteui-angular",
122-
"sourceRoot": "projects/igniteui-angular/src",
123-
"projectType": "library",
124-
"prefix": "lib",
125-
"architect": {
126-
"build": {
127-
"builder": "@angular-devkit/build-ng-packagr:build",
128-
"options": {
129-
"tsConfig": "projects/igniteui-angular/tsconfig.lib.json",
130-
"project": "projects/igniteui-angular/ng-package.json"
131-
},
132-
"configurations": {
133-
"production": {
134-
"project": "projects/igniteui-angular/ng-package.prod.json"
122+
"igniteui-angular": {
123+
"root": "projects/igniteui-angular",
124+
"sourceRoot": "projects/igniteui-angular/src",
125+
"projectType": "library",
126+
"prefix": "lib",
127+
"architect": {
128+
"build": {
129+
"builder": "@angular-devkit/build-ng-packagr:build",
130+
"options": {
131+
"tsConfig": "projects/igniteui-angular/tsconfig.lib.json",
132+
"project": "projects/igniteui-angular/ng-package.json"
133+
},
134+
"configurations": {
135+
"production": {
136+
"project": "projects/igniteui-angular/ng-package.prod.json"
137+
}
138+
}
139+
},
140+
"test": {
141+
"builder": "@angular-devkit/build-angular:karma",
142+
"options": {
143+
"main": "projects/igniteui-angular/src/test.ts",
144+
"tsConfig": "projects/igniteui-angular/tsconfig.spec.json",
145+
"karmaConfig": "projects/igniteui-angular/karma.conf.js"
146+
}
147+
},
148+
"lint": {
149+
"builder": "@angular-devkit/build-angular:tslint",
150+
"options": {
151+
"tsConfig": [
152+
"projects/igniteui-angular/tsconfig.lib.json",
153+
"projects/igniteui-angular/tsconfig.spec.json"
154+
],
155+
"exclude": [
156+
"**/node_modules/**"
157+
]
158+
}
159+
}
135160
}
136-
}
137-
},
138-
"test": {
139-
"builder": "@angular-devkit/build-angular:karma",
140-
"options": {
141-
"main": "projects/igniteui-angular/src/test.ts",
142-
"tsConfig": "projects/igniteui-angular/tsconfig.spec.json",
143-
"karmaConfig": "projects/igniteui-angular/karma.conf.js"
144-
}
145-
},
146-
"lint": {
147-
"builder": "@angular-devkit/build-angular:tslint",
148-
"options": {
149-
"tsConfig": [
150-
"projects/igniteui-angular/tsconfig.lib.json",
151-
"projects/igniteui-angular/tsconfig.spec.json"
152-
],
153-
"exclude": [
154-
"**/node_modules/**"
155-
]
156-
}
157161
}
158-
}
159-
}
160-
},
161-
"defaultProject": "igniteui-dev-demos"
162-
}
162+
},
163+
"defaultProject": "igniteui-dev-demos"
164+
}

0 commit comments

Comments
 (0)