Skip to content

Commit

Permalink
fixed website for now
Browse files Browse the repository at this point in the history
  • Loading branch information
stephengoldbaum committed Aug 10, 2020
1 parent 94f8bc9 commit b4950d3
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 87 deletions.
2 changes: 1 addition & 1 deletion .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Code of Conduct for {project name}
# Code of Conduct for Morphir

Please see the [Community Code of Conduct](https://www.finos.org/code-of-conduct).
14 changes: 7 additions & 7 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributing to {project name}
# Contributing to Morphir

## Contributor License Agreement (CLA)
A CLA is a document that specifies how a project is allowed to use your
Expand All @@ -10,22 +10,22 @@ must be made with a
in place, and there are [additional legal requirements](https://finosfoundation.atlassian.net/wiki/spaces/FINOS/pages/75530375/Legal+Requirements)
that must also be met.**

Commits and pull requests to FINOS repositories such as {project name} will only be accepted from those contributors with an active, executed Individual Contributor License Agreement (ICLA) with FINOS OR who are covered under an existing and active Corporate Contribution License Agreement (CCLA) executed with FINOS. Commits from individuals not covered under an ICLA or CCLA will be flagged and blocked by the FINOS ["CLA Bot" tool](https://github.com/finos/cla-bot). Please note that some CCLAs require individuals/employees to be explicitly named on the CCLA.
Commits and pull requests to FINOS repositories such as morphir will only be accepted from those contributors with an active, executed Individual Contributor License Agreement (ICLA) with FINOS OR who are covered under an existing and active Corporate Contribution License Agreement (CCLA) executed with FINOS. Commits from individuals not covered under an ICLA or CCLA will be flagged and blocked by the FINOS ["CLA Bot" tool](https://github.com/finos/cla-bot). Please note that some CCLAs require individuals/employees to be explicitly named on the CCLA.

As a result, PRs submitted to the {project name} project cannot be accepted until you have a CLA in place with the Foundation.
As a result, PRs submitted to the morphir project cannot be accepted until you have a CLA in place with the Foundation.

Need an ICLA? Unsure if you are covered under an existing CCLA? Email [help@finos.org](mailto:help@finos.org?subject=CLA)

## Contributing Issues

### Prerequisites

* [ ] Have you [searched for duplicates](https://github.com/finos/{project name}/issues?utf8=%E2%9C%93&q=)? A simple search for exception error messages or a summary of the unexpected behaviour should suffice.
* [ ] Have you [searched for duplicates](https://github.com/finos/morphir/issues?utf8=%E2%9C%93&q=)? A simple search for exception error messages or a summary of the unexpected behaviour should suffice.
* [ ] Are you running the latest version?
* [ ] Are you sure this is a bug or missing capability?

### Raising an Issue
* Create your issue [here](https://github.com/finos/{project name}/issues/new).
* Create your issue [here](https://github.com/finos/morphir/issues/new).
* New issues contain two templates in the description: bug report and enhancement request. Please pick the most appropriate for your issue, **then delete the other**.
* Please also tag the new issue with either "Bug" or "Enhancement".
* Please use [Markdown formatting](https://help.github.com/categories/writing-on-github/)
Expand All @@ -37,12 +37,12 @@ To make review of PRs easier, please:

* Please make sure your PRs will merge cleanly - PRs that don't are unlikely to be accepted.
* For code contributions, follow the existing code layout.
* For documentation contributions, follow the general structure, language, and tone of the [existing docs](https://github.com/finos/{project name}/wiki).
* For documentation contributions, follow the general structure, language, and tone of the [existing docs](https://github.com/finos/morphir/wiki).
* Keep commits small and cohesive - if you have multiple contributions, please submit them as independent commits (and ideally as independent PRs too).
* Reference issue #s if your PR has anything to do with an issue (even if it doesn't address it).
* Minimise non-functional changes (e.g. whitespace).
* Ensure all new files include a header comment block containing the [Apache License v2.0 and your copyright information](http://www.apache.org/licenses/LICENSE-2.0#apply).
* If necessary (e.g. due to 3rd party dependency licensing requirements), update the [NOTICE file](https://github.com/finos/{project name}/blob/master/NOTICE) with any new attribution or other notices
* If necessary (e.g. due to 3rd party dependency licensing requirements), update the [NOTICE file](https://github.com/finos/morphir/blob/master/NOTICE) with any new attribution or other notices


### Commit and PR Messages
Expand Down
75 changes: 0 additions & 75 deletions .github/workflows/docusaurus.yml

This file was deleted.

8 changes: 4 additions & 4 deletions LICENSE.spdx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SPDXVersion: SPDX-2.0
DataLicense: CC0-1.0
Creator: {name of copyright owner}
PackageName: {project name}
PackageOriginator: {name of copyright owner}
PackageHomePage: https://github.com/finos/{project name}
Creator: Morgan Stanley
PackageName: Morphir
PackageOriginator: Morgan Stanley
PackageHomePage: https://github.com/finos/morphir
PackageLicenseDeclared: Apache-2.0

0 comments on commit b4950d3

Please sign in to comment.