Merge pull request #231 from microbit-foundation/228-use-microbits-co…

…de-of-conduct-instead-of-our-own 228 use microbits code of conduct instead of our own, inbound licenses, inclusion of third-party sourcecode
microbit-foundation · Jun 19, 2023 · 1e4d8db · 1e4d8db
2 parents 6ad2658 + c2eb977
commit 1e4d8db
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -21,6 +21,8 @@ Thank you for considering contributing to the project!
 
 ## Code of Conduct
 
+Please see Micro:bit Educational Foundation's [code of conduct](https://microbit.org/safeguarding/) which outlines our expectations for all those that participate in the community and details on how to report any concerns and what would happen should breaches occur.
+
 ### Our Pledge
 
 In the interest of fostering an open and welcoming environment, we as
@@ -58,7 +60,7 @@ Examples of unacceptable behavior by participants include:
 ### Our Responsibilities
 
 Maintainers of ML-Machine have the responsibility of upholding code quality and interpreting the code of conduct and are
-expected to make appropriate and fair decisions in response to behaviour and changes.
+expected to make appropriate and fair decisions in response to behavior and changes.
 
 Maintainers have the right to remove, edit or reject any changes such as commits, code wiki edits and issues which are
 not aligned with our pledge, standards or code of conduct, or to ban temporarily or permanently any contributor for

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2023 Center for Computational Thinking and Design, Aarhus University
+Copyright (c) 2023 Center for Computational Thinking and Design at Aarhus University and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -147,22 +147,28 @@ ML-Machine utilises several packages, most notable of which are the following:
 
 ## Contributions
 
-### Contributing
-
 #### Issues
 
 If you experience an issue or have a question regarding the platform please do not hesitate to raise an issue. The
 maintainers will answer to any issues raised as quickly as possible.
 
-#### Code contributions & code of conduct
+#### Code contributions
 
 If you have an improvement on you wish to share with please read the [contributing](CONTRIBUTING.md) page. There you
 will find information about how to contribute. The maintainers will review the changes as soon as possible.
 
 ### Credits
 
-ML-Machine is a platform created by the Center for Computational Thinking and Design (see [CCTD.dk](https://cctd.dk)) at Aarhus University for empowering education in the emerging fields of technology and computation.
+ML-Machine is a platform created by the Center for Computational Thinking and Design (see [CCTD.dk](https://cctd.au.dk)) at Aarhus University for empowering education in the emerging fields of technology and computation.
 
 ## License
 
-[MIT](license) © Center for Computational Thinking and Design, Aarhus University
+[MIT](LICENSE) © Center for Computational Thinking and Design at Aarhus University and contributors.
+
+We use dependencies via the NPM registry as specified by the package.json file under common Open Source licenses.
+
+The repository includes forks of Lancaster's micro:bit-samples repositories for micro:bit [V1](https://github.com/lancaster-university/microbit-samples) and [V2](https://github.com/lancaster-university/microbit-v2-samples). They are MIT licensed.
+
+## Code of Conduct
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. Please see our code of conduct on the [contributing](CONTRIBUTING.md) page and Micro:bit Educational Foundation's [code of conduct](https://microbit.org/safeguarding/) which outlines our expectations for all those that participate in the community and details on how to report any concerns and what would happen should breaches occur.
diff --git a/package.json b/package.json
@@ -1,8 +1,10 @@
 {
-  "name": "svelte-app",
+  "name": "ml-machine",
   "version": "1.0.0",
+  "author": "Center for Computational Thinking and Design at Aarhus University",
   "private": true,
   "type": "module",
+  "license": "MIT",
   "scripts": {
     "build": "vite build",
     "dev": "vite",