a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'issue_689'

Browse Source
This commit is contained in:
Mateusz Konieczny 2021-11-07 11:39:23 +01:00
commit bc85a66112
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/frontend/pages/code-of-conduct.tsx
View File

@ -5,9 +5,13 @@ import InfoBox from '../components/info-box';
const CodeOfConductPage = () => ( const CodeOfConductPage = () => (
<article> <article>
<section className="main-col"> <section className="main-col">
<h1 className="h2">Code of Conduct</h1> <h1 className="h2">Contributor Code of Conduct</h1>
<InfoBox msg="Draft code of conduct for discussion" /> <p>
This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
available at <a href="https://www.contributor-covenant.org/version/1/4/code-of-conduct.html">
https://www.contributor-covenant.org/version/1/4/code-of-conduct.html</a>
</p>
<h2 className="h3">Our Pledge</h2> <h2 className="h3">Our Pledge</h2>
@ -42,7 +46,6 @@ const CodeOfConductPage = () => (
<li>Trolling, insulting/derogatory comments, and personal or political attacks</li> <li>Trolling, insulting/derogatory comments, and personal or political attacks</li>
<li>Public or private harassment</li> <li>Public or private harassment</li>
<li>Publishing others' private information, such as a physical or electronic address, without explicit permission</li> <li>Publishing others' private information, such as a physical or electronic address, without explicit permission</li>
<li>Other conduct which could reasonably be considered inappropriate in a professional setting</li> <li>Other conduct which could reasonably be considered inappropriate in a professional setting</li>
</ul> </ul>
@ -75,7 +78,8 @@ const CodeOfConductPage = () => (
<p> <p>
Instances of abusive, harassing, or otherwise unacceptable behaviour may be reported by Instances of abusive, harassing, or otherwise unacceptable behaviour may be reported by
contacting the project team at <a contacting the project team at <a
href="mailto:team@colouring.london">team@colouring.london</a>. All complaints will href="mailto:team@colouring.london">team@colouring.london</a> or <a
href="dataprotection@turing.ac.uk">dataprotection@turing.ac.uk</a>. All complaints will
be reviewed and investigated and will result in a response that is deemed necessary and 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 appropriate to the circumstances. The project team is obligated to maintain
confidentiality with regard to the reporter of an incident. Further details of confidentiality with regard to the reporter of an incident. Further details of
@ -88,13 +92,6 @@ const CodeOfConductPage = () => (
members of the project's leadership. members of the project's leadership.
</p> </p>
<h2 className="h3">Attribution</h2>
<p>
This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
available at <a href="https://www.contributor-covenant.org/version/1/4/code-of-conduct.html">
https://www.contributor-covenant.org/version/1/4/code-of-conduct.html</a>
</p>
<p> <p>
For answers to common questions about this code of conduct, see <a For answers to common questions about this code of conduct, see <a
href="https://www.contributor-covenant.org/faq">https://www.contributor-covenant.org/faq</a> href="https://www.contributor-covenant.org/faq">https://www.contributor-covenant.org/faq</a>

5
app/src/frontend/pages/data-accuracy.tsx
View File

@ -5,7 +5,10 @@ const DataAccuracyPage = () => (
<section className="main-col"> <section className="main-col">
<h1 className="h2">Data Accuracy Agreement</h1> <h1 className="h2">Data Accuracy Agreement</h1>
<p> <p>
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.
</p>
<p>
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.
</p> </p>
</section> </section>
</article> </article>