Skip to content

Commit 0174bda

Browse files
billtibillti
committed
Merge branch 'master' into loadJsFromModules
2 parents 885b0e9 + be2ca35 commit 0174bda

612 files changed

Lines changed: 23019 additions & 6643 deletions

File tree

Some content is hidden

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

‎.vscode/tasks.json‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// ${cwd}: the current working directory of the spawned process
88
{
99
"version": "0.1.0",
10-
"command": "jake",
10+
"command": "gulp",
1111
"isShellCommand": true,
1212
"showOutput": "silent",
1313
"tasks": [
@@ -18,25 +18,6 @@
1818
"problemMatcher": [
1919
"$tsc"
2020
]
21-
},
22-
{
23-
"taskName": "lint-server",
24-
"args": [],
25-
"problemMatcher": {
26-
"owner": "typescript",
27-
"fileLocation": ["relative", "${workspaceRoot}"],
28-
"pattern": {
29-
"regexp": "^(warning|error)\\s+([^(]+)\\s+\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\):\\s+(.*)$",
30-
"severity": 1,
31-
"file": 2,
32-
"location": 3,
33-
"message": 4
34-
},
35-
"watchedTaskBeginsRegExp": "^\\*\\*\\*Lint failure\\*\\*\\*$",
36-
"watchedTaskEndsRegExp": "^\\*\\*\\* Total \\d+ failures\\.$"
37-
},
38-
"showOutput": "always",
39-
"isWatching": true
4021
}
4122
]
4223
}

‎CONTRIBUTING.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ In general, things we find useful when reviewing suggestions are:
4040

4141
# Instructions for Contributing Code
4242

43+
## Code of Conduct
44+
45+
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
46+
4347
## Contributing bug fixes
4448

4549
TypeScript is currently accepting contributions in the form of bug fixes. A bug must have an issue tracking it in the issue tracker that has been approved ("Milestone == Community") by the TypeScript team. Your pull request should include a link to the bug that you are fixing. If you've submitted a PR for a bug, please post a comment in the bug to avoid duplication of effort.

0 commit comments

Comments
 (0)