Skip to content

Commit

Permalink
Merge pull request #2 from finos/master
Browse files Browse the repository at this point in the history
upstream
  • Loading branch information
maoo authored Feb 27, 2020
2 parents d1f9110 + 6f40669 commit 84b0d5d
Show file tree
Hide file tree
Showing 143 changed files with 6,587 additions and 3,353 deletions.
12 changes: 8 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,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 FDC3 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 FDC3 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 [[email protected]](mailto:[email protected]?subject=CLA)

# Contributing Issues

## Prerequisites

* [ ] Have you [searched for duplicates](https://github.com/FDC3/FDC3/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/FDC3/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/FDC3/FDC3/issues/new).
* Create your issue [here](https://github.com/finos/FDC3/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 @@ -34,12 +38,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/FDC3/FDC3/wiki).
* For documentation contributions, follow the general structure, language, and tone of the [existing docs](https://github.com/finos/FDC3/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 shenanigans).
* 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/FDC3/FDC3/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/FDC3/blob/master/NOTICE) with any new attribution or other notices


## Commit and PR Messages
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ script:
- git config --global user.name "${GH_NAME}"
- git config --global user.email "${GH_EMAIL}"
- echo "machine github.com login ${GH_NAME} password ${GH_TOKEN}" > ~/.netrc
- cd website && yarn install && yarn run redoc-appd && GIT_USER="${GH_NAME}" yarn run publish-gh-pages
- cd website && yarn install && GIT_USER="${GH_NAME}" yarn run publish-gh-pages
32 changes: 16 additions & 16 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,23 @@ Thank you to the following contributors who helped with this release:
* @saori-tr

### Added
* Use Case 15 ([#49](https://github.com/FDC3/FDC3/pull/49))
* FDC3 Roadmap ([#55](https://github.com/FDC3/FDC3/pull/55))
* User showcase on website ([#67](https://github.com/FDC3/FDC3/pull/67))
* Use Case 15 ([#49](https://github.com/finos/FDC3/pull/49))
* FDC3 Roadmap ([#55](https://github.com/finos/FDC3/pull/55))
* User showcase on website ([#67](https://github.com/finos/FDC3/pull/67))

### Changed
* Use case text on front page of website ([#54](https://github.com/FDC3/FDC3/pull/54))
* Feature icons on website ([#57](https://github.com/FDC3/FDC3/pull/57))
* Use case text on front page of website ([#54](https://github.com/finos/FDC3/pull/54))
* Feature icons on website ([#57](https://github.com/finos/FDC3/pull/57))

### Fixed
* General cleanup of spelling, grammar and punctuation ([#34](https://github.com/FDC3/FDC3/pull/34))
* Remove unnecessary dates from use case file names ([#41](https://github.com/FDC3/FDC3/pull/41))
* Fix header colouring on responsive website ([#56](https://github.com/FDC3/FDC3/pull/56))
* Fix workflow numbers in Use Case 1 ([#60](https://github.com/FDC3/FDC3/pull/60))
* More proofreading changes to existing docs ([62](https://github.com/FDC3/FDC3/pull/62))
* Fix examples in Intent Overview doc ([#65](https://github.com/FDC3/FDC3/pull/65))
* Fix errors in DesktopAgent API doc ([#66](https://github.com/FDC3/FDC3/pull/66))
* Add hyperlink to FDC3 Intro doc ([#69](https://github.com/FDC3/FDC3/pull/69))
* General cleanup of spelling, grammar and punctuation ([#34](https://github.com/finos/FDC3/pull/34))
* Remove unnecessary dates from use case file names ([#41](https://github.com/finos/FDC3/pull/41))
* Fix header colouring on responsive website ([#56](https://github.com/finos/FDC3/pull/56))
* Fix workflow numbers in Use Case 1 ([#60](https://github.com/finos/FDC3/pull/60))
* More proofreading changes to existing docs ([62](https://github.com/finos/FDC3/pull/62))
* Fix examples in Intent Overview doc ([#65](https://github.com/finos/FDC3/pull/65))
* Fix errors in DesktopAgent API doc ([#66](https://github.com/finos/FDC3/pull/66))
* Add hyperlink to FDC3 Intro doc ([#69](https://github.com/finos/FDC3/pull/69))

## [1.0.0-beta] - 2019-03-05

Expand All @@ -69,6 +69,6 @@ Thank you to the following contributors who helped with this release:
* Documentation website generated with [Docusaurus](https://docusaurus.io).


[Unreleased]: https://github.com/FDC3/FDC3/compare/v1.0.0..HEAD
[1.0.0]: https://github.com/FDC3/FDC3/compare/v1.0.0..v1.0.0-beta
[1.0.0-beta]: https://github.com/FDC3/FDC3/releases/tag/v1.0.0-beta
[Unreleased]: https://github.com/finos/FDC3/compare/v1.0.0..HEAD
[1.0.0]: https://github.com/finos/FDC3/compare/v1.0.0..v1.0.0-beta
[1.0.0-beta]: https://github.com/finos/FDC3/releases/tag/v1.0.0-beta
2 changes: 1 addition & 1 deletion LICENSE.spdx
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ DataLicense: CC0-1.0
Creator: FDC3
PackageName: FDC3
PackageOriginator: FDC3
PackageHomePage: https://github.com/FDC3/FDC3
PackageHomePage: https://github.com/finos/FDC3
PackageLicenseDeclared: Apache-2.0
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FDC3 - FINOS
Copyright 2017 FDC3 info@finos.org
Copyright 2017-2019 OpenFin info@openfin.co

This product includes software developed at the Fintech Open Source Foundation (https://www.finos.org/).

16 changes: 12 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.org/FDC3/FDC3.svg?branch=master)](https://travis-ci.org/FDC3/FDC3)
[![Build Status](https://travis-ci.org/finos/FDC3.svg?branch=master)](https://travis-ci.org/finos/FDC3)
[![FINOS - Released](https://cdn.jsdelivr.net/gh/finos/contrib-toolbox@master/images/badge-released.svg)](https://finosfoundation.atlassian.net/wiki/display/FINOS/Released)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
[![Stack Overflow](https://img.shields.io/badge/stackoverflow-fdc3-orange.svg)](https://stackoverflow.com/questions/tagged/fdc3)
Expand All @@ -8,17 +8,25 @@
The mission of the Financial Desktop Connectivity and Collaboration Consortium (FDC3) is to develop specific protocols and taxonomies to advance the ability of desktop applications in financial workflows to interoperate in a plug-and-play fashion and without prior, bi-lateral agreements.

## About this Repository
FDC3 is a standard. This repository houses the documentation and specifications for the ratified FDC3 standards. To join Working Groups meetings and Mailing lists where the standard is built, please check the [FDC3 space in the FINOS Wiki](http://wiki.finos.org/fdc3).
FDC3 is a standard. This repository houses the documentation and specifications for the ratified FDC3 standards.

## Using the standard
Check out [the documentation website](https://fdc3.finos.org) for the different components of the standard, an overview of [common use cases](https://fdc3.finos.org/docs/use-cases/overview), developer [API docs](https://fdc3.finos.org/docs/api/api-intro) and [standard compliance information](https://fdc3.finos.org/docs/fdc3-compliance).

Latest version of the standard is [1.0](https://fdc3.finos.org/docs/1.0/fdc3-intro). See [all available versions](https://fdc3.finos.org/versions).

## Contributing
To join Working Groups meetings and Mailing lists where the standard is built, please check the [FDC3 space in the FINOS Wiki](http://wiki.finos.org/fdc3). If you'd like to contribute code to this repository:

1. Fork it (<https://github.com/FDC3/FDC3/fork>)
1. Fork it (<https://github.com/finos/FDC3/fork>)
2. Create your feature branch (`git checkout -b feature/fooBar`)
3. Commit your changes (`git commit -am 'Add some fooBar'`)
4. Push to the branch (`git push origin feature/fooBar`)
5. Create a new Pull Request

The team will review the PR and decide about merging. Note that you will require a contributor agreement (individual or corporate) before your code can be merge, so please review [FINOS Contribution requirements](.github/CONTRIBUTING.md).
The team will review the PR and decide about merging.

Note that you will require a contributor agreement (individual or corporate) before your code can be merge, so please review [FINOS Contribution requirements](.github/CONTRIBUTING.md).

_NOTE:_ Commits and pull requests to FINOS repositories 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 Clabot tool. Please note that some CCLAs require individuals/employees to be explicitly named on the CCLA.

Expand Down
13 changes: 0 additions & 13 deletions docs/api/Context.md

This file was deleted.

236 changes: 0 additions & 236 deletions docs/api/DesktopAgent.md

This file was deleted.

Loading

0 comments on commit 84b0d5d

Please sign in to comment.