Skip to content

Commit fd5ff46

Browse files
LipataLipata
authored
Merge branch 'master' into PMiteva/disabled-textarea-6847
2 parents 14d9028 + 9faeb7e commit fd5ff46

File tree

98 files changed

+5918
-7323
lines changed

Some content is hidden

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

98 files changed

+5918
-7323
lines changed

‎.browserslistrc‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ All notable changes for each version of this project will be documented in this
3838
```
3939
- `IgxDateRangePicker` component added.
4040
- Allows the selection of a range of dates from a calendar UI or input fields. Supports `dialog` and `dropdown` modes.
41-
- Added `IgxDateStartComponent` and `IgxDateEndComponent`.
41+
- Added `IgxDateRangeStartComponent` and `IgxDateRangeEndComponent`.
4242
- The default template consists of a single *readonly* field:
4343
```html
4444
<igx-date-range-picker [(ngModel)]="range"></igx-date-range-picker>

‎angular.json‎

Lines changed: 187 additions & 181 deletions
Original file line numberDiff line numberDiff line change
@@ -1,191 +1,197 @@
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-
"@schematics/angular:component": {
13-
"styleext": "scss"
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+
"style": "scss"
14+
}
15+
},
16+
"architect": {
17+
"build": {
18+
"builder": "@angular-devkit/build-angular:browser",
19+
"options": {
20+
"aot": true,
21+
"outputPath": "dist/igniteui-dev-demos",
22+
"index": "src/index.html",
23+
"main": "src/main.ts",
24+
"polyfills": "src/polyfills.ts",
25+
"tsConfig": "src/tsconfig.app.json",
26+
"assets": [
27+
"src/favicon.ico",
28+
"src/assets",
29+
"src/web.config"
30+
],
31+
"styles": [
32+
"src/styles/igniteui-theme.scss"
33+
],
34+
"scripts": [],
35+
"es5BrowserSupport": true
36+
},
37+
"configurations": {
38+
"production": {
39+
"budgets": [
40+
{
41+
"type": "anyComponentStyle",
42+
"maximumWarning": "6kb"
43+
}
44+
],
45+
"fileReplacements": [
46+
{
47+
"replace": "src/environments/environment.ts",
48+
"with": "src/environments/environment.prod.ts"
1449
}
50+
],
51+
"optimization": true,
52+
"outputHashing": "all",
53+
"sourceMap": false,
54+
"extractCss": true,
55+
"namedChunks": false,
56+
"extractLicenses": true,
57+
"vendorChunk": false,
58+
"buildOptimizer": true
1559
},
16-
"architect": {
17-
"build": {
18-
"builder": "@angular-devkit/build-angular:browser",
19-
"options": {
20-
"aot": true,
21-
"outputPath": "dist/igniteui-dev-demos",
22-
"index": "src/index.html",
23-
"main": "src/main.ts",
24-
"polyfills": "src/polyfills.ts",
25-
"tsConfig": "src/tsconfig.app.json",
26-
"assets": [
27-
"src/favicon.ico",
28-
"src/assets",
29-
"src/web.config"
30-
],
31-
"styles": [
32-
"src/styles/igniteui-theme.scss"
33-
],
34-
"scripts": [],
35-
"es5BrowserSupport": true
36-
},
37-
"configurations": {
38-
"production": {
39-
"budgets": [
40-
{
41-
"type": "anyComponentStyle",
42-
"maximumWarning": "6kb"
43-
}
44-
],
45-
"fileReplacements": [{
46-
"replace": "src/environments/environment.ts",
47-
"with": "src/environments/environment.prod.ts"
48-
}],
49-
"optimization": true,
50-
"outputHashing": "all",
51-
"sourceMap": false,
52-
"extractCss": true,
53-
"namedChunks": false,
54-
"aot": true,
55-
"extractLicenses": true,
56-
"vendorChunk": false,
57-
"buildOptimizer": true
58-
},
59-
"hmr": {
60-
"budgets": [
61-
{
62-
"type": "anyComponentStyle",
63-
"maximumWarning": "6kb"
64-
}
65-
],
66-
"fileReplacements": [{
67-
"replace": "src/environments/environment.ts",
68-
"with": "src/environments/environment.hmr.ts"
69-
}]
70-
}
71-
}
72-
},
73-
"serve": {
74-
"builder": "@angular-devkit/build-angular:dev-server",
75-
"options": {
76-
"browserTarget": "igniteui-dev-demos:build"
77-
},
78-
"configurations": {
79-
"production": {
80-
"browserTarget": "igniteui-dev-demos:build:production"
81-
},
82-
"hmr": {
83-
"hmr": true,
84-
"hmrWarning": false,
85-
"browserTarget": "igniteui-dev-demos:build:hmr"
86-
}
87-
}
88-
},
89-
"extract-i18n": {
90-
"builder": "@angular-devkit/build-angular:extract-i18n",
91-
"options": {
92-
"browserTarget": "igniteui-dev-demos:build"
93-
}
94-
},
95-
"test": {
96-
"builder": "@angular-devkit/build-angular:karma",
97-
"options": {
98-
"main": "src/test.ts",
99-
"polyfills": "src/polyfills.ts",
100-
"tsConfig": "src/tsconfig.spec.json",
101-
"karmaConfig": "src/karma.conf.js",
102-
"styles": [
103-
"src/styles.css"
104-
],
105-
"scripts": [],
106-
"assets": [
107-
"src/favicon.ico",
108-
"src/assets"
109-
]
110-
}
111-
},
112-
"lint": {
113-
"builder": "@angular-devkit/build-angular:tslint",
114-
"options": {
115-
"tsConfig": [
116-
"src/tsconfig.app.json",
117-
"src/tsconfig.spec.json"
118-
],
119-
"exclude": [
120-
"**/node_modules/**"
121-
]
122-
}
60+
"hmr": {
61+
"budgets": [
62+
{
63+
"type": "anyComponentStyle",
64+
"maximumWarning": "6kb"
12365
}
124-
}
125-
},
126-
"igniteui-dev-demos-e2e": {
127-
"root": "e2e/",
128-
"projectType": "application",
129-
"architect": {
130-
"e2e": {
131-
"builder": "@angular-devkit/build-angular:protractor",
132-
"options": {
133-
"protractorConfig": "e2e/protractor.conf.js",
134-
"devServerTarget": "igniteui-dev-demos:serve"
135-
}
136-
},
137-
"lint": {
138-
"builder": "@angular-devkit/build-angular:tslint",
139-
"options": {
140-
"tsConfig": "e2e/tsconfig.e2e.json",
141-
"exclude": [
142-
"**/node_modules/**"
143-
]
144-
}
66+
],
67+
"fileReplacements": [
68+
{
69+
"replace": "src/environments/environment.ts",
70+
"with": "src/environments/environment.hmr.ts"
14571
}
72+
]
14673
}
74+
}
14775
},
148-
"igniteui-angular": {
149-
"root": "projects/igniteui-angular",
150-
"sourceRoot": "projects/igniteui-angular/src",
151-
"projectType": "library",
152-
"prefix": "lib",
153-
"architect": {
154-
"build": {
155-
"builder": "@angular-devkit/build-ng-packagr:build",
156-
"options": {
157-
"tsConfig": "projects/igniteui-angular/tsconfig.lib.json",
158-
"project": "projects/igniteui-angular/ng-package.json"
159-
},
160-
"configurations": {
161-
"production": {
162-
"project": "projects/igniteui-angular/ng-package.prod.json",
163-
"tsConfig": "projects/igniteui-angular/tsconfig.lib.prod.json"
164-
}
165-
}
166-
},
167-
"test": {
168-
"builder": "@angular-devkit/build-angular:karma",
169-
"options": {
170-
"main": "projects/igniteui-angular/src/test.ts",
171-
"tsConfig": "projects/igniteui-angular/tsconfig.spec.json",
172-
"karmaConfig": "projects/igniteui-angular/karma.conf.js"
173-
}
174-
},
175-
"lint": {
176-
"builder": "@angular-devkit/build-angular:tslint",
177-
"options": {
178-
"tsConfig": [
179-
"projects/igniteui-angular/tsconfig.lib.json",
180-
"projects/igniteui-angular/tsconfig.spec.json"
181-
],
182-
"exclude": [
183-
"**/node_modules/**"
184-
]
185-
}
186-
}
76+
"serve": {
77+
"builder": "@angular-devkit/build-angular:dev-server",
78+
"options": {
79+
"browserTarget": "igniteui-dev-demos:build"
80+
},
81+
"configurations": {
82+
"production": {
83+
"browserTarget": "igniteui-dev-demos:build:production"
84+
},
85+
"hmr": {
86+
"hmr": true,
87+
"hmrWarning": false,
88+
"browserTarget": "igniteui-dev-demos:build:hmr"
18789
}
90+
}
91+
},
92+
"extract-i18n": {
93+
"builder": "@angular-devkit/build-angular:extract-i18n",
94+
"options": {
95+
"browserTarget": "igniteui-dev-demos:build"
96+
}
97+
},
98+
"test": {
99+
"builder": "@angular-devkit/build-angular:karma",
100+
"options": {
101+
"main": "src/test.ts",
102+
"polyfills": "src/polyfills.ts",
103+
"tsConfig": "src/tsconfig.spec.json",
104+
"karmaConfig": "src/karma.conf.js",
105+
"styles": [
106+
"src/styles.css"
107+
],
108+
"scripts": [],
109+
"assets": [
110+
"src/favicon.ico",
111+
"src/assets"
112+
]
113+
}
114+
},
115+
"lint": {
116+
"builder": "@angular-devkit/build-angular:tslint",
117+
"options": {
118+
"tsConfig": [
119+
"src/tsconfig.app.json",
120+
"src/tsconfig.spec.json"
121+
],
122+
"exclude": [
123+
"**/node_modules/**"
124+
]
125+
}
126+
}
127+
}
128+
},
129+
"igniteui-dev-demos-e2e": {
130+
"root": "e2e/",
131+
"projectType": "application",
132+
"architect": {
133+
"e2e": {
134+
"builder": "@angular-devkit/build-angular:protractor",
135+
"options": {
136+
"protractorConfig": "e2e/protractor.conf.js",
137+
"devServerTarget": "igniteui-dev-demos:serve"
138+
}
139+
},
140+
"lint": {
141+
"builder": "@angular-devkit/build-angular:tslint",
142+
"options": {
143+
"tsConfig": "e2e/tsconfig.e2e.json",
144+
"exclude": [
145+
"**/node_modules/**"
146+
]
147+
}
188148
}
149+
}
189150
},
190-
"defaultProject": "igniteui-dev-demos"
191-
}
151+
"igniteui-angular": {
152+
"root": "projects/igniteui-angular",
153+
"sourceRoot": "projects/igniteui-angular/src",
154+
"projectType": "library",
155+
"prefix": "lib",
156+
"architect": {
157+
"build": {
158+
"builder": "@angular-devkit/build-ng-packagr:build",
159+
"options": {
160+
"tsConfig": "projects/igniteui-angular/tsconfig.lib.json",
161+
"project": "projects/igniteui-angular/ng-package.json"
162+
},
163+
"configurations": {
164+
"production": {
165+
"project": "projects/igniteui-angular/ng-package.prod.json",
166+
"tsConfig": "projects/igniteui-angular/tsconfig.lib.prod.json"
167+
}
168+
}
169+
},
170+
"test": {
171+
"builder": "@angular-devkit/build-angular:karma",
172+
"options": {
173+
"main": "projects/igniteui-angular/src/test.ts",
174+
"tsConfig": "projects/igniteui-angular/tsconfig.spec.json",
175+
"karmaConfig": "projects/igniteui-angular/karma.conf.js"
176+
}
177+
},
178+
"lint": {
179+
"builder": "@angular-devkit/build-angular:tslint",
180+
"options": {
181+
"tsConfig": [
182+
"projects/igniteui-angular/tsconfig.lib.json",
183+
"projects/igniteui-angular/tsconfig.spec.json"
184+
],
185+
"exclude": [
186+
"**/node_modules/**"
187+
]
188+
}
189+
}
190+
}
191+
}
192+
},
193+
"defaultProject": "igniteui-dev-demos",
194+
"cli": {
195+
"analytics": false
196+
}
197+
}

0 commit comments

Comments
 (0)