From 391d888c0b2a86dd670ea6c289227f2640035049 Mon Sep 17 00:00:00 2001 From: Gary Pretty Date: Mon, 15 Jun 2020 12:54:34 +0100 Subject: [PATCH 1/3] Create CODE_OF_CONDUCT Linking to the Microsoft Open Source Code of COnduct --- CODE_OF_CONDUCT | 1 + 1 file changed, 1 insertion(+) create mode 100644 CODE_OF_CONDUCT diff --git a/CODE_OF_CONDUCT b/CODE_OF_CONDUCT new file mode 100644 index 000000000..36937256b --- /dev/null +++ b/CODE_OF_CONDUCT @@ -0,0 +1 @@ +This repository has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). From 00c571216d061a075ce941905825516c4bb20fd0 Mon Sep 17 00:00:00 2001 From: Gary Pretty Date: Mon, 15 Jun 2020 14:05:40 +0100 Subject: [PATCH 2/3] Added community docs --- .github/PULL_REQUEST_TEMPLATE.md | 14 +++++++++++++ CODE_OF_CONDUCT => CODE_OF_CONDUCT.md | 0 Contributing.md | 29 +++++++++++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md rename CODE_OF_CONDUCT => CODE_OF_CONDUCT.md (100%) create mode 100644 Contributing.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..e8870cd7e --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,14 @@ +Fixes # + +## Description + + +## Specific Changes + + + - + - + - + +## Testing + \ No newline at end of file diff --git a/CODE_OF_CONDUCT b/CODE_OF_CONDUCT.md similarity index 100% rename from CODE_OF_CONDUCT rename to CODE_OF_CONDUCT.md diff --git a/Contributing.md b/Contributing.md new file mode 100644 index 000000000..ba0854da7 --- /dev/null +++ b/Contributing.md @@ -0,0 +1,29 @@ +# Instructions for Contributing Code + +## Code of Conduct + +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. + +## Contributing bug fixes and features + +The Bot Framework team is currently accepting contributions in the form of bug fixes and new +features. Any submission must have an issue tracking it in the issue tracker that has + been approved by the Bot Framework 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. + +## Legal + +If your contribution is more than 15 lines of code, you will need to complete a Contributor +License Agreement (CLA). Briefly, this agreement testifies that you are granting us permission + to use the submitted change according to the terms of the project's license, and that the work + being submitted is under appropriate copyright. + +Please submit a Contributor License Agreement (CLA) before submitting a pull request. +You may visit https://cla.azure.com to sign digitally. Alternatively, download the +agreement ([Microsoft Contribution License Agreement.docx](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=822190) or + [Microsoft Contribution License Agreement.pdf](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=921298)), sign, scan, + and email it back to . Be sure to include your github user name along with the agreement. Once we have received the + signed CLA, we'll review the request. \ No newline at end of file From e99286e9d56170cc066be3d8c59bac7535c9d4f6 Mon Sep 17 00:00:00 2001 From: Gary Pretty Date: Mon, 15 Jun 2020 14:22:45 +0100 Subject: [PATCH 3/3] Amends for code of conduct --- CODE_OF_CONDUCT.md | 6 +++++- Contributing.md | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 36937256b..d3ff17639 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1 +1,5 @@ -This repository has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). +## Code of Conduct + +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. \ No newline at end of file diff --git a/Contributing.md b/Contributing.md index ba0854da7..41a2e6153 100644 --- a/Contributing.md +++ b/Contributing.md @@ -1,11 +1,5 @@ # Instructions for Contributing Code -## Code of Conduct - -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. - ## Contributing bug fixes and features The Bot Framework team is currently accepting contributions in the form of bug fixes and new