Skip to content

Commit

Permalink
Merge branch 'main' into dev-1
Browse files Browse the repository at this point in the history
  • Loading branch information
mertcanaltin committed Apr 29, 2024
2 parents c7a3eb7 + 0c41bca commit ded0d68
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Dates-and-Reminders.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ This document captures important dates and reminders.

Position | Term Length | Nomination Period | Voting Period | Term Start/End
-- | -- | -- | -- | --
CPC Directors | 1 Year | April: 1st & 2nd Week | April: 3rd week | May 1
CPC Impact | 1 Year | Oct: 1st & 2nd Week | Oct: 3rd week | Nov 1
CPC At Large | 1 Year | Oct: 1st & 2nd Week | Oct: 3rd week | Nov 1
CPC Regular | 1 Year | Oct: 1st & 2nd Week | Oct: 3rd week | Nov 1
CPC Directors (3) | 1 Year | April: 1st & 2nd Week | April: 3rd week | May 1
CPC Impact representative selection (2 per project) | 1 Year | Oct: 1st & 2nd Week | Oct: 3rd week | Nov 1
CPC At Large voting members (2) | 1 Year | Oct: 1st & 2nd Week | Oct: 3rd week | Nov 1
CPC Regular voting members (2) | 1 Year | Oct: 1st & 2nd Week | Oct: 3rd week | Nov 1

Position | Term Length | Nomination Period | Voting Period | Term Start/End
-- | -- | -- | -- | --
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ The following projects are official OpenJS Foundation projects. If you are inter
| <img alt="logo of project Interledger.js" src="https://github.com/openjs-foundation/artwork/raw/HEAD/projects/interledgerjs/interledgerjs-icon-color.svg" width="30" /> | [Interledger.js](https://interledger.org/) | | [Contributing Guide](https://github.com/interledger/rfcs/blob/HEAD/CONTRIBUTING.md) |
| <img alt="logo of project Intern" src="https://github.com/openjs-foundation/artwork/raw/HEAD/projects/intern/intern-icon-color.svg" width="30" /> | [Intern](https://theintern.github.io/) | | [Contributing Guide](https://github.com/theintern/intern/blob/HEAD/CONTRIBUTING.md) |
| <img alt="logo of project JerryScript" src="https://github.com/openjs-foundation/artwork/raw/HEAD/projects/jerryscript/jerryscript-icon-color.svg" width="30" /> | [JerryScript](https://jerryscript.net/) | | [Contributing Guide](https://github.com/jerryscript-project/jerryscript/blob/HEAD/CONTRIBUTING.md) |
| <img alt="logo of project Jest" src="https://raw.githubusercontent.com/facebook/jest/main/website/static/img/jest.svg" width="30" /> | [Jest](https://jestjs.io/) | [Charter](https://github.com/jestjs/jest/blob/main/PROJECT_CHARTER.md) | [Contributing Guide](https://github.com/facebook/jest#contributing) |
| <img alt="logo of project Lodash" src="https://github.com/openjs-foundation/artwork/raw/HEAD/projects/lodash/lodash-icon-color.svg" width="30" /> | [Lodash](https://lodash.com/) | | [Contributing Guide](https://github.com/lodash/lodash/blob/HEAD/.github/CONTRIBUTING.md) |
| <img alt="logo of project LoopBack" src="https://github.com/openjs-foundation/artwork/raw/HEAD/projects/loopback/mark/blue/loopback.svg" width="30" /> | [LoopBack](https://loopback.io) | | [Contributing Guide](https://github.com/loopbackio/loopback-next/blob/HEAD/docs/CONTRIBUTING.md) |
| <img alt="logo of project Marko" src="https://github.com/openjs-foundation/artwork/raw/HEAD/projects/marko/marko-icon-color.svg" width="30" /> | [Marko](https://markojs.com/) | | [Contributing Guide](https://github.com/marko-js/marko/blob/HEAD/.github/CONTRIBUTING.md) |
Expand Down Expand Up @@ -74,7 +75,6 @@ The following projects are official OpenJS Foundation projects. If you are inter
| | Project | Charter | Contributing |
|-|----------------|:-----------------:|:------------------:|
| <img alt="logo of project ajv" src="https://github.com/openjs-foundation/artwork/raw/HEAD/projects/ajv/ajv-logo-color.svg" width="30" /> | [Ajv](https://ajv.js.org/) | | [Contributing Guide](https://ajv.js.org/contributing) |
| <img alt="logo of project Jest" src="https://raw.githubusercontent.com/facebook/jest/main/website/static/img/jest.svg" width="30" /> | [Jest](https://jestjs.io/) | | [Contributing Guide](https://github.com/facebook/jest#contributing) |
| | [kepler.gl](https://kepler.gl/) | | [Contributing Guide](https://github.com/keplergl/kepler.gl/blob/HEAD/contributing) |
| <img alt="logo of project NativeScript" src="https://github.com/openjs-foundation/artwork/raw/HEAD/projects/nativescript/nativescript-icon-color.svg" width="30" /> | [NativeScript](https://nativescript.org/) | | [Contributing Guide](https://github.com/NativeScript/NativeScript/blob/HEAD/tools/notes/CONTRIBUTING.md) |
| | [vis.gl](https://vis.gl/) | | [Contributing Guide](https://github.com/visgl/deck.gl/blob/HEAD/CONTRIBUTING.md) |
Expand Down Expand Up @@ -175,6 +175,7 @@ Anyone who has been active in the foundation or one of its member projects, as d
- Michael Dawson ([@mhdawson](https://github.com/mhdawson))
- Mike Samuel ([@mikesamuel](https://github.com/mikesamuel))
- Mohammed Keyvanzadeh ([@VoltrexKeyva](https://github.com/VoltrexKeyva))
- Natalia Venditto ([@anfibiacreativa](https://github.com/anfibiacreativa))
- Nick O'Leary ([@knolleary](https://github.com/knolleary))
- Nitin Kumar ([@snitin315](https://github.com/snitin315))
- Paula Paul ([@paulapaul](https://github.com/paulapaul))
Expand Down
6 changes: 3 additions & 3 deletions conduct/COC_TEAM_CHARTER.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ The CoC Team's responsibilities are to:

## CoC Team Structure

The CoC Team is composed of five (5) [primary members][#primary-members] and a variable number of [alternate community members][#alternate-community-members].
The CoC Team is composed of five (5) [primary members](#primary-members) and a variable number of [alternate community members](#alternate-community-members).

### Primary members

Primary members are CoC Team members responsible for [handling cases][#handling-cases].
Primary members are CoC Team members responsible for [handling cases](#handling-cases).

The five primary members are:

Expand All @@ -37,7 +37,7 @@ The name and email address of the primary members are documented in the [code of

### Alternate community members

Alternate community members are CoC Team Members who are available as backup when there aren't enough primary community members available to [handle a case][#handling-cases].
Alternate community members are CoC Team Members who are available as backup when there aren't enough primary community members available to [handle a case](#handling-cases).

### Member selection

Expand Down

0 comments on commit ded0d68

Please sign in to comment.