Skip to content

Commit

Permalink
Merge pull request #23754 from code-dot-org/dtl_candidate_f386b7d4
Browse files Browse the repository at this point in the history
  • Loading branch information
deploy-code-org committed Jul 17, 2018
2 parents 8a35c99 + f386b7d commit fef4046
Show file tree
Hide file tree
Showing 70 changed files with 690 additions and 1,595 deletions.
74 changes: 74 additions & 0 deletions CODE_OF_CONDUCT.md
@@ -0,0 +1,74 @@
# Contributor Covenant Code of Conduct

## Our Pledge

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, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* 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

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [support@code.org](mailto:support@code.org). 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 specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

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

[homepage]: https://www.contributor-covenant.org

4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Expand Up @@ -2,9 +2,9 @@

We'd love to have you join our group of contributors! Please e-mail your areas of interest and your availability to contributing@code.org, and we’ll be happy to match you with a project.

This project adheres to the [Open Code of Conduct][code-of-conduct]. By participating, you are expected to honor this code.
This project adheres to the [Contributor Covenant][code-of-conduct]. By participating, you are expected to honor this code.

[code-of-conduct]: https://www.contributor-covenant.org/
[code-of-conduct]: CODE_OF_CONDUCT.md

You can start setting up with these next steps:

Expand Down
5 changes: 4 additions & 1 deletion apps/i18n/common/en_us.json
Expand Up @@ -49,7 +49,6 @@
"answerOptionF": "F",
"answerOptionG": "G",
"answersVisible": "Answers visible (read-only)",
"archiveSection": "Archive Section",
"applabMarketingButton": "Learn more",
"applabMarketingDesc": "See sample projects, watch demos, and learn more about what you can do with App Lab.",
"applabMarketingTitle": "Learn about App Lab",
Expand All @@ -59,6 +58,7 @@
"applabTutorialButton": "Start",
"applabTutorialDesc": "Ready to try JavaScript? Design an app, code in JavaScript with either blocks or text, then share your app in seconds. For Ages 13+.",
"applabTutorialTitle": "App Lab Hour of Code",
"archiveSection": "Archive Section",
"assessmentSteps": "Steps to give assessment for",
"assessmentSettings": "Assessment Settings",
"assign": "Assign",
Expand Down Expand Up @@ -610,6 +610,7 @@
"hiddenSections": "Hidden Sections",
"hiddenScriptTooltip": "Please select a section before trying to toggle whether or not the unit is visible to your students.",
"hide": "Hide",
"hideArchivedSections": "Hide archived sections",
"hideFullList": "Hide full list",
"hideGeneratedCode": "Hide Code",
"hideHiddenSections": "Hide hidden sections",
Expand Down Expand Up @@ -1013,6 +1014,7 @@
"resetPassword": "Reset password",
"resources": "Resources",
"response": "Response",
"restoreSection": "Restore Section",
"restoreThisVersion": "Restore this Version",
"review": "Review",
"reviewCode": "Review Code",
Expand Down Expand Up @@ -1255,6 +1257,7 @@
"viewAllAnnouncements": "View all announcements",
"viewAllCourses": "View all courses",
"viewAllSections": "View all sections",
"viewArchivedSections": "View archived sections",
"viewCode": "View code",
"viewCourse": "View course",
"viewCourses": "View courses",
Expand Down
4 changes: 2 additions & 2 deletions apps/i18n/common/it_it.json
Expand Up @@ -67,7 +67,7 @@
"assignConfirm": "Sei sicuro di voler assegnare \"{assignmentName}\" a \"{sectionName}\"?",
"assignedTo": "Assegnato a",
"assignUnit": "Assegna Unità",
"authorizeGoogleClassrooms": "Clicca qui per autorizzare Google Classrom.",
"authorizeGoogleClassrooms": "Clicca qui per autorizzare Google Classroom.",
"authorizeGoogleClassroomsText": "Prima di poter sincronizzare Google Classroom, devi dare a Code.org i permessi per accedere al tuo account Google Classroom.",
"autoGenerated": "Auto-generata",
"autolock": "Nota: blocco automatico del livello dopo 24 ore.",
Expand Down Expand Up @@ -607,7 +607,7 @@
"iconSearchPlaceholder": "Cerca un'icona...",
"iDontKnow": "Non lo so",
"ignore": "Ignora",
"importFromGoogleClassroom": "Importa classe da Google Classrom",
"importFromGoogleClassroom": "Importa classe da Google Classroom",
"importFromClever": "Importa la classe da Clever",
"incorrectAnswer": "Risposta non corretta",
"incorrectAnswerBody": "La risposta che hai scelto non è corretta. Per favore riprova!",
Expand Down

0 comments on commit fef4046

Please sign in to comment.