Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ccxt-dev/ccxt
Browse files Browse the repository at this point in the history
  • Loading branch information
@kroitor
kroitor committed May 30, 2018
2 parents fe83e25 + 713b40e commit 53394c9
Show file tree
Hide file tree
Showing 20 changed files with 296 additions and 64 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ The ccxt library currently supports the following 115 cryptocurrency exchange ma
|![coinone](https://user-images.githubusercontent.com/1294454/38003300-adc12fba-323f-11e8-8525-725f53c4a659.jpg) | coinone | [CoinOne](https://coinone.co.kr) | 2 | [API](https://doc.coinone.co.kr) | South Korea |
|![coinsecure](https://user-images.githubusercontent.com/1294454/27766472-9cbd200a-5ed9-11e7-9551-2267ad7bac08.jpg) | coinsecure | [Coinsecure](https://coinsecure.in) | 1 | [API](https://api.coinsecure.in) | India |
|![coinspot](https://user-images.githubusercontent.com/1294454/28208429-3cacdf9a-6896-11e7-854e-4c79a772a30f.jpg) | coinspot | [CoinSpot](https://www.coinspot.com.au) | * | [API](https://www.coinspot.com.au/api) | Australia |
|![cointiger](https://user-images.githubusercontent.com/1294454/39797261-d58df196-5363-11e8-9880-2ec78ec5bd25.jpg) | cointiger | [CoinTiger](https://www.cointiger.com/exchange/register.html?refCode=FfvDtt) | 1 | [API](https://github.com/cointiger/api-docs-en/wiki) | China |
|![cointiger](https://user-images.githubusercontent.com/1294454/39797261-d58df196-5363-11e8-9880-2ec78ec5bd25.jpg) | cointiger | [CoinTiger](https://www.cointiger.pro/exchange/register.html?refCode=FfvDtt) | 1 | [API](https://github.com/cointiger/api-docs-en/wiki) | China |
|![coolcoin](https://user-images.githubusercontent.com/1294454/36770529-be7b1a04-1c5b-11e8-9600-d11f1996b539.jpg) | coolcoin | [CoolCoin](https://www.coolcoin.com) | * | [API](https://www.coolcoin.com/help.api.html) | Hong Kong |
|![cryptopia](https://user-images.githubusercontent.com/1294454/29484394-7b4ea6e2-84c6-11e7-83e5-1fccf4b2dc81.jpg) | cryptopia | [Cryptopia](https://www.cryptopia.co.nz/Register?referrer=kroitor) | * | [API](https://www.cryptopia.co.nz/Forum/Category/45) | New Zealand |
|![dsx](https://user-images.githubusercontent.com/1294454/27990275-1413158a-645a-11e7-931c-94717f7510e3.jpg) | dsx | [DSX](https://dsx.uk) | 3 | [API](https://api.dsx.uk) | UK |
Expand Down
86 changes: 72 additions & 14 deletions build/ccxt.browser.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ccxt.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const Exchange = require ('./js/base/Exchange')
//-----------------------------------------------------------------------------
// this is updated by vss.js when building

const version = '1.14.89'
const version = '1.14.90'

Exchange.ccxtVersion = version

Expand Down
2 changes: 1 addition & 1 deletion doc/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ The ccxt library currently supports the following 115 cryptocurrency exchange ma
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |coinspot| | coinspot | `CoinSpot <https://www.coinspot.com.au>`__ | \* | `API <https://www.coinspot.com.au/api>`__ | Australia |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |cointiger| | cointiger | `CoinTiger <https://www.cointiger.com/exchange/register.html?refCode=FfvDtt>`__ | 1 | `API <https://github.com/cointiger/api-docs-en/wiki>`__ | China |
| |cointiger| | cointiger | `CoinTiger <https://www.cointiger.pro/exchange/register.html?refCode=FfvDtt>`__ | 1 | `API <https://github.com/cointiger/api-docs-en/wiki>`__ | China |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |coolcoin| | coolcoin | `CoolCoin <https://www.coolcoin.com>`__ | \* | `API <https://www.coolcoin.com/help.api.html>`__ | Hong Kong |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion doc/exchanges-by-country.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ The ccxt library currently supports the following cryptocurrency exchange market
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| China | |coingi| | coingi | `Coingi <https://coingi.com>`__ | \* | `API <http://docs.coingi.apiary.io/>`__ |
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| China | |cointiger| | cointiger | `CoinTiger <https://www.cointiger.com/exchange/register.html?refCode=FfvDtt>`__ | 1 | `API <https://github.com/cointiger/api-docs-en/wiki>`__ |
| China | |cointiger| | cointiger | `CoinTiger <https://www.cointiger.pro/exchange/register.html?refCode=FfvDtt>`__ | 1 | `API <https://github.com/cointiger/api-docs-en/wiki>`__ |
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| China | |exx| | exx | `EXX <https://www.exx.com/>`__ | \* | `API <https://www.exx.com/help/restApi>`__ |
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion doc/exchanges.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ The ccxt library currently supports the following 115 cryptocurrency exchange ma
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |coinspot| | coinspot | `CoinSpot <https://www.coinspot.com.au>`__ | \* | `API <https://www.coinspot.com.au/api>`__ | Australia |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |cointiger| | cointiger | `CoinTiger <https://www.cointiger.com/exchange/register.html?refCode=FfvDtt>`__ | 1 | `API <https://github.com/cointiger/api-docs-en/wiki>`__ | China |
| |cointiger| | cointiger | `CoinTiger <https://www.cointiger.pro/exchange/register.html?refCode=FfvDtt>`__ | 1 | `API <https://github.com/cointiger/api-docs-en/wiki>`__ | China |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |coolcoin| | coolcoin | `CoolCoin <https://www.coolcoin.com>`__ | \* | `API <https://www.coolcoin.com/help.api.html>`__ | Hong Kong |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion doc/manual.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ The ccxt library currently supports the following 115 cryptocurrency exchange ma
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |coinspot| | coinspot | `CoinSpot <https://www.coinspot.com.au>`__ | \* | `API <https://www.coinspot.com.au/api>`__ | Australia |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |cointiger| | cointiger | `CoinTiger <https://www.cointiger.com/exchange/register.html?refCode=FfvDtt>`__ | 1 | `API <https://github.com/cointiger/api-docs-en/wiki>`__ | China |
| |cointiger| | cointiger | `CoinTiger <https://www.cointiger.pro/exchange/register.html?refCode=FfvDtt>`__ | 1 | `API <https://github.com/cointiger/api-docs-en/wiki>`__ | China |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |coolcoin| | coolcoin | `CoolCoin <https://www.coolcoin.com>`__ | \* | `API <https://www.coolcoin.com/help.api.html>`__ | Hong Kong |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ccxt",
"version": "1.14.89",
"version": "1.14.90",
"description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 100+ exchanges",
"main": "./ccxt.js",
"unpkg": "build/ccxt.browser.js",
Expand Down
2 changes: 1 addition & 1 deletion php/Exchange.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

namespace ccxt;

$version = '1.14.89';
$version = '1.14.90';

// rounding mode
const TRUNCATE = 0;
Expand Down

0 comments on commit 53394c9

Please sign in to comment.