Skip to content

Commit 58bfa45

Browse files
authored
Merge branch 'master' into 717-recommended-channels
2 parents 7299630 + 2cee3be commit 58bfa45

80 files changed

Lines changed: 3059 additions & 808 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@ website/static/toolbox
1414
website/node_modules
1515
website/i18n/*
1616
website/package-lock.json
17+
18+
.idea/
19+
*.iml

CHANGELOG.md

Lines changed: 80 additions & 27 deletions
Large diffs are not rendered by default.

CONTRIBUTING.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ _NOTE:_ Commits and pull requests to FINOS repositories will only be accepted fr
77
*Need an ICLA? Unsure if you are covered under an existing CCLA? Email [help@finos.org](mailto:help@finos.org).*
88

99

10-
## 1. Contribution Guidelines.
10+
## 1. Contribution Guidelines.
1111

1212
This Working Group accepts contributions via pull requests. The following section outlines the process for merging contributions to the specification
1313

14-
**1.1. Issues.** Issues are used as the primary method for tracking anything to do with this specification Working Group.
14+
**1.1. Issues.** Issues are used as the primary method for tracking anything to do with this specification Working Group.
1515

1616
**1.1.1. Issue Types.** A number of issue templates are available in the FDC3 respository:
1717

1818
**1.1.1.1. Meetings.** Templates for issues that represent meetings and include agendas, teleconference details and minutes.
1919

20-
**1.1.1.2. Proposals and Enhancement Requests.** Used for items that propose a new ideas or functionality that require a larger discussion. This allows for feedback from others before a specification change is actually written.
20+
**1.1.1.2. Proposals and Enhancement Requests.** Used for items that propose a new ideas or functionality that require a larger discussion. This allows for feedback from others before a specification change is actually written.
2121

2222
**1.1.1.3. Minor Issue:** These track minor changes or corrections that don't alter the Standard significantly but rather correct minor errors or ommisions.
2323

@@ -33,7 +33,7 @@ The issue lifecycle is mainly driven by the Maintainer. All issue types follow t
3333

3434
- The FDC3 Maintainers will apply the proper labels for the issue. This may include labels for priority, type, and metadata.
3535

36-
- (If needed) Clean up the title to succinctly and clearly state the issue.
36+
- (If needed) Clean up the title to succinctly and clearly state the issue.
3737

3838
**2.3. Discussion.**
3939

@@ -47,13 +47,13 @@ The issue lifecycle is mainly driven by the Maintainer. All issue types follow t
4747

4848
The Working Group uses pull requests to track changes. To submit a change to the Standard:
4949

50-
**3.1. Fork the Repo**
50+
**3.1. Fork the Repo**
5151
- (<https://github.com/finos/FDC3/fork>)
5252

5353
**3.2. Create your feature branch**
5454
- `git checkout -b feature/fooBar`
5555

56-
**3.3. Commit your changes**
56+
**3.3. Commit your changes**
5757
- `git commit -am 'Describe what you changed'`
5858

5959
**3.4. Push to the branch**
@@ -62,6 +62,7 @@ The Working Group uses pull requests to track changes. To submit a change to the
6262
**3.5. Create a Pull Request**
6363
- For help creating a pull request from your fork, [see Github's documentation](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork)
6464

65+
To contribute a patch for a New Intent, see the [Submit New Intent](docs/guides/submit-new-intent) guide.
6566

6667
## 4. Pull Request Workflow.
6768

@@ -78,13 +79,13 @@ The next section contains more information on the workflow followed for Pull Req
7879

7980
**4.2. Triage**
8081

81-
- The Maintainers will apply the proper labels for the issue. This may include an indication of the subject area or type (e.g. `deprecation`).
82+
- The Maintainers will apply the proper labels for the issue. This may include an indication of the subject area or type (e.g. `deprecation`).
8283

8384
**4.3. Reviewing/Discussion.**
8485

8586
- All PRs will be reviewed by at least one of the FDC3 Maintainers and any appointed Editors. PRs are also open to review by FDC3 Participants.
8687

87-
- The FDC3 Maintainers are responsible for ensuring that the the Standard Working Group has been consulted on either an issue (that provides a high-level of detail on the proposed changes) or on the PR itself, a decision has been reached that the change should be made and that that decision has been documented.
88+
- The FDC3 Maintainers are responsible for ensuring that the Standard Working Group has been consulted on either an issue (that provides a high-level of detail on the proposed changes) or on the PR itself, a decision has been reached that the change should be made and that that decision has been documented.
8889

8990
- All reviews will be completed using the Github review tool.
9091

0 commit comments

Comments
 (0)