Skip to content

Commit 747d1a3

Browse files
authored
Merge pull request #72 from coreui/v2.0.0
V2.0.0
2 parents 6737e3e + 5a05964 commit 747d1a3

File tree

607 files changed

+4926
-15401
lines changed

Some content is hidden

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

607 files changed

+4926
-15401
lines changed

Angular5_CLI_Full_Project/.angular-cli.json renamed to .angular-cli.json

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
33
"project": {
4-
"version": "1.0.10",
5-
"name": "@coreui/angular"
4+
"name": "ng"
65
},
76
"apps": [
87
{
98
"root": "src",
109
"outDir": "dist",
11-
"assets": ["assets"],
10+
"assets": [
11+
"assets",
12+
"favicon.ico"
13+
],
1214
"index": "index.html",
1315
"main": "main.ts",
1416
"polyfills": "polyfills.ts",
@@ -23,7 +25,6 @@
2325
"scss/style.scss"
2426
],
2527
"scripts": [
26-
"../node_modules/chart.js/dist/Chart.bundle.min.js",
2728
"../node_modules/chart.js/dist/Chart.min.js"
2829
],
2930
"environmentSource": "environments/environment.ts",
@@ -40,13 +41,16 @@
4041
},
4142
"lint": [
4243
{
43-
"project": "src/tsconfig.app.json"
44+
"project": "src/tsconfig.app.json",
45+
"exclude": "**/node_modules/**"
4446
},
4547
{
46-
"project": "src/tsconfig.spec.json"
48+
"project": "src/tsconfig.spec.json",
49+
"exclude": "**/node_modules/**"
4750
},
4851
{
49-
"project": "e2e/tsconfig.e2e.json"
52+
"project": "e2e/tsconfig.e2e.json",
53+
"exclude": "**/node_modules/**"
5054
}
5155
],
5256
"test": {
@@ -56,6 +60,6 @@
5660
},
5761
"defaults": {
5862
"styleExt": "scss",
59-
"prefixInterfaces": false
63+
"component": {}
6064
}
6165
}

Angular5_CLI_Starter/.editorconfig renamed to .editorconfig

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,12 @@ root = true
33

44
[*]
55
charset = utf-8
6-
indent_style = space
7-
indent_size = 2
86
end_of_line = lf
9-
insert_final_newline = true
10-
trim_trailing_whitespace = true
11-
12-
[*.ts]
13-
charset = utf-8
14-
indent_style = space
157
indent_size = 2
16-
end_of_line = lf
8+
indent_style = space
179
insert_final_newline = true
1810
trim_trailing_whitespace = true
1911

2012
[*.md]
21-
max_line_length = 0
13+
max_line_length = off
2214
trim_trailing_whitespace = false

Angular5_CLI_Starter/.gitignore renamed to .gitignore

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,43 @@
22

33
# compiled output
44
/dist
5+
/dist-server
56
/tmp
7+
/out-tsc
68

79
# dependencies
8-
node_modules
9-
bower_components
10+
/node_modules
1011

1112
# IDEs and editors
12-
.idea
13+
/.idea
1314
.project
1415
.classpath
16+
.c9/
1517
*.launch
1618
.settings/
19+
*.sublime-workspace
20+
21+
# IDE - VSCode
22+
.vscode/*
23+
!.vscode/settings.json
24+
!.vscode/tasks.json
25+
!.vscode/launch.json
26+
!.vscode/extensions.json
1727

1828
# misc
1929
/.sass-cache
2030
/connect.lock
21-
/coverage/*
31+
/coverage
2232
/libpeerconnection.log
2333
npm-debug.log
34+
yarn-error.log
2435
testem.log
2536
/typings
2637

2738
# e2e
2839
/e2e/*.js
2940
/e2e/*.map
3041

31-
#System Files
42+
# System Files
3243
.DS_Store
3344
Thumbs.db

Angular5_CLI_Full_Project/.editorconfig

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

Angular5_CLI_Full_Project/.gitignore

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

Angular5_CLI_Full_Project/CHANGELOG.md

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

Angular5_CLI_Full_Project/README.md

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

Angular5_CLI_Full_Project/karma.conf.js

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

Angular5_CLI_Full_Project/package.json

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

Angular5_CLI_Full_Project/protractor.conf.js

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

0 commit comments

Comments
 (0)