Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add code of conduct for the team #3

Merged
merged 49 commits into from
Aug 4, 2022
Merged
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
db2a1d6
Add code of conduct for review
malvikasharan Jan 8, 2022
e8d9e76
Update CODE_OF_CONDUCT.md
malvikasharan Jan 9, 2022
9c451c6
Update CODE_OF_CONDUCT.md
malvikasharan Jan 9, 2022
be83256
Update CODE_OF_CONDUCT.md
malvikasharan Jan 9, 2022
b2039be
Update CODE_OF_CONDUCT.md
malvikasharan Jan 9, 2022
fe7ad2a
minor formatting
malvikasharan Jan 10, 2022
cd51bdb
Update CODE_OF_CONDUCT.md
malvikasharan Jan 10, 2022
29bed39
Update CODE_OF_CONDUCT.md
malvikasharan Jan 10, 2022
82f647e
Update CODE_OF_CONDUCT.md
malvikasharan Jan 10, 2022
0eb7ead
Update CODE_OF_CONDUCT.md
malvikasharan Mar 29, 2022
b887fde
Add turing policies and numbered claus
malvikasharan Jul 23, 2022
3300155
Update CODE_OF_CONDUCT.md
malvikasharan Jul 23, 2022
ed4a9b5
Update CODE_OF_CONDUCT.md
malvikasharan Jul 23, 2022
2436fda
Update CODE_OF_CONDUCT.md
malvikasharan Jul 23, 2022
a2cb07f
Update CODE_OF_CONDUCT.md
malvikasharan Jul 23, 2022
465b53c
inclusion of derisive comments
arronlacey Jul 25, 2022
f1afc6c
add an extra coc contact person
malvikasharan Jul 26, 2022
cecb857
Merge pull request #104 from alan-turing-institute/code-of-conduct-AL…
arronlacey Jul 26, 2022
57e0739
Update CODE_OF_CONDUCT.md
malvikasharan Jul 27, 2022
7e7bdb4
Update CODE_OF_CONDUCT.md
malvikasharan Jul 27, 2022
57a865c
add Arron and Emma
malvikasharan Jul 28, 2022
fa001fa
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
151972e
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
17059e6
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
2e0e913
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
7567434
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
e5f11d2
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
f08fc00
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
235c85c
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
e21b4b1
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
240e0e2
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
307d729
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
d8cc8b3
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
4a36d87
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
1afc8cb
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
da25d3e
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
a0d52f7
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
4d35a5b
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
2da49c0
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
2d70323
Update CODE_OF_CONDUCT.md
malvikasharan Jul 28, 2022
cbddbb0
Update CODE_OF_CONDUCT.md
malvikasharan Jul 29, 2022
c39b5fc
Update CODE_OF_CONDUCT.md
malvikasharan Jul 29, 2022
1c34e9f
Update CODE_OF_CONDUCT.md
malvikasharan Jul 29, 2022
bc51f29
Update CODE_OF_CONDUCT.md
malvikasharan Jul 29, 2022
a18416f
Update CODE_OF_CONDUCT.md
malvikasharan Jul 29, 2022
90ea8cb
Update CODE_OF_CONDUCT.md
malvikasharan Jul 29, 2022
88e6082
Update CODE_OF_CONDUCT.md
malvikasharan Jul 29, 2022
dc81054
addressing inconsistency issue
malvikasharan Jul 30, 2022
4591c09
Update CODE_OF_CONDUCT.md
aleesteele Aug 3, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update CODE_OF_CONDUCT.md
  • Loading branch information
malvikasharan committed Jul 27, 2022
commit 57e0739263d21f2b3a0d811dcc6de4970a1e5a76
8 changes: 4 additions & 4 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ or unacceptable behaviour by other participants.
We are committed to providing a welcoming, collaborative and inspiring experience
for all members of this team and expect our code of conduct to be honoured.

## 2. Our Pledge
## 2. Our Commitment

We as members, contributors, and leaders pledge to make participation in our
We as members, contributors, and leaders commit to make participation in our
malvikasharan marked this conversation as resolved.
Show resolved Hide resolved
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
We commit to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## 3. Restorative Practice
Expand Down Expand Up @@ -208,7 +208,7 @@ as difficult (not straightforward) except when any potential conflict of interes

To report an issue involving the team lead, please email directly to the Tools, Practices and Systems
Programme Director, Kirstie Whitaker. Since she is currently on maternity leave, please contact TPS
Programme Manager Arielle Bennett (abennett@turing.ac.uk).
Programme Manager Arielle Bennett (abennett@turing.ac.uk) - who is also our ombudsperson.
malvikasharan marked this conversation as resolved.
Show resolved Hide resolved

**13.2** In your report please include:

Expand Down