From 1a3fd0b746649e14e31f6574f50e9a0095d52c08 Mon Sep 17 00:00:00 2001 From: syan-syan <55272802+syan-syan@users.noreply.github.com> Date: Wed, 5 Aug 2020 15:48:05 +0800 Subject: [PATCH 1/5] updated contact email --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 49fd54dbcf..b1c3fe598a 100755 --- a/README.md +++ b/README.md @@ -160,4 +160,4 @@ We welcome contributions to code open sourced by the Government Technology Agenc ## Support -Please contact FormSG (formsg@data.gov.sg) for any details. +Please contact FormSG (formsg@tech.gov.sg) for any details. From 3dbc53330ff953e3081c51ee1eb42a92f0bf35f3 Mon Sep 17 00:00:00 2001 From: syan-syan <55272802+syan-syan@users.noreply.github.com> Date: Wed, 5 Aug 2020 15:55:12 +0800 Subject: [PATCH 2/5] full open source license updated to remove restrictions present in the soft open sourced license --- LICENSE.md | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 95b6f1351b..c579d614f1 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,10 +1,6 @@ -“Except for any logos, trade marks, service marks, names, insignias, emblems, the Singapore state crest and Singapore national coat of arms, and/or any other graphic, image or sound which is used to identify any Singapore public sector agency or is associated with any Singapore public sector agency, or which belongs to a third party such as Shutterstock, Inc., and/or any asset or code identified by the Government Technology Agency (“GovTech”) as not licensed to you (such identification may come in the form of a filename labelled with “restricted” or similar phrasing), the contents of this repository are provided under the MIT License SUBJECT FURTHER TO THE FOLLOWING: +Except for any logos, trade marks, service marks, names, insignias, emblems, the Singapore state crest and Singapore national coat of arms, and/or any other graphic, image or sound which is used to identify any Singapore public sector agency or is associated with any Singapore public sector agency, or which belongs to a third party such as Shutterstock, Inc., and/or any asset or code identified by the Government Technology Agency (“GovTech”) as not licensed to you (such identification may come in the form of a filename labelled with “restricted” or similar phrasing), the contents of this repository are provided under the MIT License SUBJECT FURTHER TO THE FOLLOWING: -(1) Such contents are only licensed to such entities as expressly permitted by GovTech in writing; - -(2) Notwithstanding the MIT License terms, you shall not publish, make public, distribute or sublicense or sell such contents (whether in object or source form) or permit other persons or entities to do so without the prior written consent of GovTech; and - -(3) The MIT License and the terms herein (collectively, the “Terms”) shall be governed by the laws of Singapore. Any dispute arising out of or in connection with the Terms, including any question regarding its existence, validity or termination, shall be referred to and finally resolved by arbitration administered by the Singapore International Arbitration Centre (“SIAC”) in accordance with the Arbitration Rules of the Singapore International Arbitration Centre (“SIAC Rules”) for the time being in force, which rules are deemed to be incorporated by reference in this clause. The seat of arbitration shall be Singapore. The Tribunal shall consist of one (1) arbitrator. The language of the arbitration shall be English. +(1) The MIT License and the terms herein (collectively, the “Terms”) shall be governed by the laws of Singapore. Any dispute arising out of or in connection with the Terms, including any question regarding its existence, validity or termination, shall be referred to and finally resolved by arbitration administered by the Singapore International Arbitration Centre (“SIAC”) in accordance with the Arbitration Rules of the Singapore International Arbitration Centre (“SIAC Rules”) for the time being in force, which rules are deemed to be incorporated by reference in this clause. The seat of arbitration shall be Singapore. The Tribunal shall consist of one (1) arbitrator. The language of the arbitration shall be English. MIT License @@ -12,8 +8,6 @@ Copyright 2020 Government Technology Agency. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.” - +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From 20631613b0a0cd644c881bee4e023150bb5952f6 Mon Sep 17 00:00:00 2001 From: syan-syan <55272802+syan-syan@users.noreply.github.com> Date: Wed, 5 Aug 2020 16:00:23 +0800 Subject: [PATCH 3/5] contributing guidelines --- CONTRIBUTING.md | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000000..69e37e02d9 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,42 @@ +# Contributing to FormSG + +The following is a set of guidelines for contributing to FormSG. These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in an issue. + +# Contributor License Agreement + +Contributions to this project must be accompanied by a Contributor License Agreement. You (or your employer) retain the copyright to your contribution; this simply gives us permission to use and redistribute your contributions as part of the project. +Head over [here](https://go.gov.sg/ogp-cla) to submit one. + +You generally only need to submit a CLA once, so if you've already submitted one (even if it was for a different project owned by [GovTech](https://www.tech.gov.sg)), you probably don't need to do it again. + +# How can I contribute? + +When contributing to this repository, **please first discuss the change you wish to make via issue**, email, or any other method with the owners of this repository before making a change. + +This section guides you through submitting a bug reports or feature requests for GoGovSG. Following these guidelines helps maintainers and the community understand your report, reproduce the behavior, and find related reports. + +Before submitting bug reports or feature request, please check [existing or past issues](https://go.gov.sg/formsg-issues) and [existing or past pull requests](https://go.gov.sg/formsg-pulls). +You might find out that you don't need to create one. + +When **submitting a bug report**, please include as many details as possible, such as the steps to reproduce this bug, expected and actual behaviour. + +When **submitting a feature request**, please include the motivation, alternatives that you've considered and any additional contexts that could help us better understand your goal. + +Here are some tips to writing good issues: +- **Use clear and descriptive title** to identify the problem +- **Describe the exact steps to reproduce the problem** and **explain how you did it** +- **Provide specific examples to demonstrate the steps** +- **Include screenshots or animated GIFs if you can** +- **Explain why this new feature would be useful** + +## Making a pull request + +If you're submitting a pull request, some things to take note: + +1. Ensure any install or build dependencies are removed before the end of the layer when doing a build. Refer to [README.md](FILL IN https://go.gov.sg/formsg-readme) for more details +2. Update the [README.md](FILL IN https://go.gov.sg/formsg-readme) with details of changes to the interface, this includes new environment variables, exposed ports, useful file locations and container parameters. + +3. You may merge the Pull Request in once you have the sign-off of two other developers, or if you do not have permission to do that, you may request the second reviewer to merge it for you. + +Have questions? You can also reach out to us [here](formsg@tech.gov.sg). + From 32a04281e382ac6dda53a5ec38b5c44c594880ce Mon Sep 17 00:00:00 2001 From: syan-syan <55272802+syan-syan@users.noreply.github.com> Date: Wed, 5 Aug 2020 16:03:34 +0800 Subject: [PATCH 4/5] updated readme link --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 69e37e02d9..f404596668 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,8 +33,8 @@ Here are some tips to writing good issues: If you're submitting a pull request, some things to take note: -1. Ensure any install or build dependencies are removed before the end of the layer when doing a build. Refer to [README.md](FILL IN https://go.gov.sg/formsg-readme) for more details -2. Update the [README.md](FILL IN https://go.gov.sg/formsg-readme) with details of changes to the interface, this includes new environment variables, exposed ports, useful file locations and container parameters. +1. Ensure any install or build dependencies are removed before the end of the layer when doing a build. Refer to [README.md](https://go.gov.sg/formsg-readme) for more details +2. Update the [README.md](https://go.gov.sg/formsg-readme) with details of changes to the interface, this includes new environment variables, exposed ports, useful file locations and container parameters. 3. You may merge the Pull Request in once you have the sign-off of two other developers, or if you do not have permission to do that, you may request the second reviewer to merge it for you. From db77a98c423d9396be5b955e5d216a994c4f30cf Mon Sep 17 00:00:00 2001 From: syan-syan <55272802+syan-syan@users.noreply.github.com> Date: Wed, 5 Aug 2020 16:19:20 +0800 Subject: [PATCH 5/5] Updated CONTRIBUTING.md --- CONTRIBUTING.md | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f404596668..2ca5cda003 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,19 +1,14 @@ # Contributing to FormSG -The following is a set of guidelines for contributing to FormSG. These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in an issue. +Welcome to FormSG! The following are guidelines for contribution. Use your best judgment, and feel free to propose changes to this document in an issue. -# Contributor License Agreement +## How can I contribute? -Contributions to this project must be accompanied by a Contributor License Agreement. You (or your employer) retain the copyright to your contribution; this simply gives us permission to use and redistribute your contributions as part of the project. -Head over [here](https://go.gov.sg/ogp-cla) to submit one. - -You generally only need to submit a CLA once, so if you've already submitted one (even if it was for a different project owned by [GovTech](https://www.tech.gov.sg)), you probably don't need to do it again. +When contributing to this repository, **please first discuss the change you wish to make via issue**, email, or any other method with the repository owners before making the change. -# How can I contribute? +## Bug reports and feature requests -When contributing to this repository, **please first discuss the change you wish to make via issue**, email, or any other method with the owners of this repository before making a change. - -This section guides you through submitting a bug reports or feature requests for GoGovSG. Following these guidelines helps maintainers and the community understand your report, reproduce the behavior, and find related reports. +The following guidelines help maintainers and the community understand your report, reproduce the behavior, and find related reports. Before submitting bug reports or feature request, please check [existing or past issues](https://go.gov.sg/formsg-issues) and [existing or past pull requests](https://go.gov.sg/formsg-pulls). You might find out that you don't need to create one. @@ -31,12 +26,23 @@ Here are some tips to writing good issues: ## Making a pull request -If you're submitting a pull request, some things to take note: +Issues available to be picked up by the community are labeled with `contribute`. + +If you're submitting a pull request, some points to note: 1. Ensure any install or build dependencies are removed before the end of the layer when doing a build. Refer to [README.md](https://go.gov.sg/formsg-readme) for more details 2. Update the [README.md](https://go.gov.sg/formsg-readme) with details of changes to the interface, this includes new environment variables, exposed ports, useful file locations and container parameters. 3. You may merge the Pull Request in once you have the sign-off of two other developers, or if you do not have permission to do that, you may request the second reviewer to merge it for you. -Have questions? You can also reach out to us [here](formsg@tech.gov.sg). +## Contributor License Agreement + +Code contributions to this project must be accompanied by a Contributor License Agreement. You (or your employer) retain the copyright to your contribution; this simply gives us permission to use and redistribute your contributions as part of the project. +Head over [here](https://go.gov.sg/ogp-cla) to submit one. + +You generally only need to submit a CLA once, so if you've already submitted one (even if it was for a different project owned by [GovTech](https://www.tech.gov.sg)), you probably don't need to do it again. + +## Contact us + +Have questions? Feel free out to us [here](formsg@tech.gov.sg).