Skip to content

Commit 40c67d3

Browse files
committed
Merge branch 'release/1.4.0'
2 parents 70050c0 + 309d7a1 commit 40c67d3

12 files changed

Lines changed: 764 additions & 1085 deletions

File tree

CHANGELOG.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
<a name=""></a>
2-
# (2017-12-17)
2+
# 1.4.0
3+
4+
5+
### Features
6+
7+
* adds option to hide missing coins ([3fd1b9c](https://github.com/benmarten/CryptoETF/commit/3fd1b9c))
8+
* save output to file ([0de2b1f](https://github.com/benmarten/CryptoETF/commit/0de2b1f))
9+
* **integration:** adds GDAX integration ([#10](https://github.com/benmarten/CryptoETF/issues/10)) ([e91975a](https://github.com/benmarten/CryptoETF/commit/e91975a))
10+
* **integration:** adds Kraken integration ([#7](https://github.com/benmarten/CryptoETF/issues/7)) ([7e1ba78](https://github.com/benmarten/CryptoETF/commit/7e1ba78))
11+
12+
<a name=""></a>
13+
# 1.3.1
14+
15+
16+
### Features
17+
18+
* Adds Bitfinex support
19+
20+
<a name=""></a>
21+
# 1.3.0
322

423

524
### Bug Fixes

CODE_OF_CONDUCT.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
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, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
6+
7+
## Our Standards
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
24+
25+
## Our Responsibilities
26+
27+
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.
28+
29+
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.
30+
31+
## Scope
32+
33+
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.
34+
35+
## Enforcement
36+
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at ben.marten@me.com. The project team will review and investigate all complaints, and will respond in a way that it deems 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.
38+
39+
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.
40+
41+
## Attribution
42+
43+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
44+
45+
[homepage]: http://contributor-covenant.org
46+
[version]: http://contributor-covenant.org/version/1/4/

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@ Edit settings.json with your exchange api keys, then:
2020
## Exchanges
2121
CryptoETF has API integrations with the following exchanges:
2222
- Coinbase. Join Here: https://www.coinbase.com/join/587ab088801bae035cad02c5
23+
- GDAX. Join Here: https://www.gdax.com/
2324
- Poloniex. Join Here: https://www.poloniex.com
2425
- Bittrex. Join Here: https://www.bittrex.com
2526
- Binance. Join Here: https://www.binance.com/?ref=12278261
2627
- HitBTC. Join Here: https://hitbtc.com/?ref_id=5a3596f643b9e
2728
- Bitfinex. Join Here: https://www.bitfinex.com
29+
- Kraken. Join Here: https://www.kraken.com
2830

2931
With these exchanges, you can easily build yourself your own CryptoETF.
3032

0 commit comments

Comments
 (0)