Skip to content

Commit 1e4d8db

Browse files
authored
Merge pull request #231 from microbit-foundation/228-use-microbits-code-of-conduct-instead-of-our-own
228 use microbits code of conduct instead of our own, inbound licenses, inclusion of third-party sourcecode
2 parents 6ad2658 + c2eb977 commit 1e4d8db

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ Thank you for considering contributing to the project!
2121

2222
## Code of Conduct
2323

24+
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.
25+
2426
### Our Pledge
2527

2628
In the interest of fostering an open and welcoming environment, we as
@@ -58,7 +60,7 @@ Examples of unacceptable behavior by participants include:
5860
### Our Responsibilities
5961

6062
Maintainers of ML-Machine have the responsibility of upholding code quality and interpreting the code of conduct and are
61-
expected to make appropriate and fair decisions in response to behaviour and changes.
63+
expected to make appropriate and fair decisions in response to behavior and changes.
6264

6365
Maintainers have the right to remove, edit or reject any changes such as commits, code wiki edits and issues which are
6466
not aligned with our pledge, standards or code of conduct, or to ban temporarily or permanently any contributor for

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2023 Center for Computational Thinking and Design, Aarhus University
1+
Copyright (c) 2023 Center for Computational Thinking and Design at Aarhus University and contributors
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,22 +147,28 @@ ML-Machine utilises several packages, most notable of which are the following:
147147

148148
## Contributions
149149

150-
### Contributing
151-
152150
#### Issues
153151

154152
If you experience an issue or have a question regarding the platform please do not hesitate to raise an issue. The
155153
maintainers will answer to any issues raised as quickly as possible.
156154

157-
#### Code contributions & code of conduct
155+
#### Code contributions
158156

159157
If you have an improvement on you wish to share with please read the [contributing](CONTRIBUTING.md) page. There you
160158
will find information about how to contribute. The maintainers will review the changes as soon as possible.
161159

162160
### Credits
163161

164-
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.
162+
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.
165163

166164
## License
167165

168-
[MIT](license) © Center for Computational Thinking and Design, Aarhus University
166+
[MIT](LICENSE) © Center for Computational Thinking and Design at Aarhus University and contributors.
167+
168+
We use dependencies via the NPM registry as specified by the package.json file under common Open Source licenses.
169+
170+
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.
171+
172+
## Code of Conduct
173+
174+
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.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
2-
"name": "svelte-app",
2+
"name": "ml-machine",
33
"version": "1.0.0",
4+
"author": "Center for Computational Thinking and Design at Aarhus University",
45
"private": true,
56
"type": "module",
7+
"license": "MIT",
68
"scripts": {
79
"build": "vite build",
810
"dev": "vite",

0 commit comments

Comments
 (0)