From fa3261cdfbed2bcc864eca00cd7c9027a94bfaa4 Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Fri, 5 Nov 2021 18:24:56 +0100 Subject: [PATCH 1/2] apply provided data accuracy text --- app/src/frontend/pages/data-accuracy.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/frontend/pages/data-accuracy.tsx b/app/src/frontend/pages/data-accuracy.tsx index 193a35af..3f3ef5d2 100644 --- a/app/src/frontend/pages/data-accuracy.tsx +++ b/app/src/frontend/pages/data-accuracy.tsx @@ -5,7 +5,10 @@ const DataAccuracyPage = () => (

Data Accuracy Agreement

- The data are provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, accuracy, fitness for a particular purpose and non-infringement. In no event shall UCL be liable for any reliance that you place on or how you use the data nor any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the data or the use or other dealings in the data'. + Colouring London data are provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, accuracy, fitness for a particular purpose and non-infringement. In no event shall the Alan Turing Institute be liable for any reliance that you place on or how you use the data nor any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the data or the use or other dealings in the data. +

+

+ Colouring London data are crowdsourced from multiple sources and may contain errors. Though we cannot comment on data accuracy, we try to include as many features as possible to help users assess their reliability and suitability for specific types of use (be this a school project or scientific paper). As information on sources is very important, contributors are asked to add these, and to verify data, wherever possible.

From e110a07a8348c6f5c1b7dc79ee4748bb24aab20d Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Sat, 6 Nov 2021 06:13:50 +0100 Subject: [PATCH 2/2] apply new code of conduct text --- app/src/frontend/pages/code-of-conduct.tsx | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/app/src/frontend/pages/code-of-conduct.tsx b/app/src/frontend/pages/code-of-conduct.tsx index 1cca415a..ce501a6a 100644 --- a/app/src/frontend/pages/code-of-conduct.tsx +++ b/app/src/frontend/pages/code-of-conduct.tsx @@ -5,9 +5,13 @@ import InfoBox from '../components/info-box'; const CodeOfConductPage = () => (
-

Code of Conduct

+

Contributor Code of Conduct

- +

+ This Code of Conduct is adapted from the Contributor Covenant, version 1.4, + available at + https://www.contributor-covenant.org/version/1/4/code-of-conduct.html +

Our Pledge

@@ -42,7 +46,6 @@ const CodeOfConductPage = () => (
  • Trolling, insulting/derogatory comments, and personal or political attacks
  • Public or private harassment
  • Publishing others' private information, such as a physical or electronic address, without explicit permission
  • -
  • Other conduct which could reasonably be considered inappropriate in a professional setting
  • @@ -75,7 +78,8 @@ const CodeOfConductPage = () => (

    Instances of abusive, harassing, or otherwise unacceptable behaviour may be reported by contacting the project team at team@colouring.london. All complaints will + href="mailto:team@colouring.london">team@colouring.london or dataprotection@turing.ac.uk. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of @@ -88,13 +92,6 @@ const CodeOfConductPage = () => ( members of the project's leadership.

    -

    Attribution

    -

    - This Code of Conduct is adapted from the Contributor Covenant, version 1.4, - available at - https://www.contributor-covenant.org/version/1/4/code-of-conduct.html -

    -

    For answers to common questions about this code of conduct, see https://www.contributor-covenant.org/faq