Skip to content

Commit

Permalink
merged
Browse files Browse the repository at this point in the history
  • Loading branch information
kroitor committed May 24, 2018
2 parents 9e1b80c + 58c0967 commit 0999ade
Show file tree
Hide file tree
Showing 31 changed files with 72 additions and 48 deletions.
22 changes: 14 additions & 8 deletions build/ccxt.browser.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ccxt.js
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.58'
const version = '1.14.59'

Exchange.ccxtVersion = version

Expand Down
6 changes: 3 additions & 3 deletions doc/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ The ccxt library currently supports the following 115 cryptocurrency exchange ma
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |coolcoin| | coolcoin | `CoolCoin <https://www.coolcoin.com>`__ | \* | `API <https://www.coolcoin.com/help.api.html>`__ | Hong Kong |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |cryptopia| | cryptopia | `Cryptopia <https://www.cryptopia.co.nz/Register?referrer=kroitor>`__ | \* | `API <https://www.cryptopia.co.nz/Forum/Category/45>`__ | New Zealand |
| |cryptopia| | cryptopia | `Cryptopia <https://www.cryptopia.co.nz>`__ | \* | `API <https://www.cryptopia.co.nz/Forum/Category/45>`__ | New Zealand |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |dsx| | dsx | `DSX <https://dsx.uk>`__ | 3 | `API <https://api.dsx.uk>`__ | UK |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
Expand Down Expand Up @@ -164,15 +164,15 @@ The ccxt library currently supports the following 115 cryptocurrency exchange ma
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |getbtc| | getbtc | `GetBTC <https://getbtc.org>`__ | \* | `API <https://getbtc.org/api-docs.php>`__ | St. Vincent & Grenadines, Russia |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |hadax| | hadax | `HADAX <https://www.hadax.com>`__ | 1 | `API <https://github.com/huobiapi/API_Docs/wiki>`__ | China |
| |hadax| | hadax | `HADAX <https://www.huobi.br.com/en-us/topic/invited/?invite_code=rwrd3>`__ | 1 | `API <https://github.com/huobiapi/API_Docs/wiki>`__ | China |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |hitbtc| | hitbtc | `HitBTC <https://hitbtc.com>`__ | 1 | `API <https://github.com/hitbtc-com/hitbtc-api/blob/master/APIv1.md>`__ | Hong Kong |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |hitbtc2| | hitbtc2 | `HitBTC v2 <https://hitbtc.com/?ref_id=5a5d39a65d466>`__ | 2 | `API <https://api.hitbtc.com>`__ | Hong Kong |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |huobi| | huobi | `Huobi <https://www.huobi.com>`__ | 3 | `API <https://github.com/huobiapi/API_Docs_en/wiki>`__ | China |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |huobicny| | huobicny | `Huobi CNY <https://www.huobi.com>`__ | 1 | `API <https://github.com/huobiapi/API_Docs/wiki/REST_api_reference>`__ | China |
| |huobicny| | huobicny | `Huobi CNY <https://www.huobi.br.com/en-us/topic/invited/?invite_code=rwrd3>`__ | 1 | `API <https://github.com/huobiapi/API_Docs/wiki/REST_api_reference>`__ | China |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |huobipro| | huobipro | `Huobi Pro <https://www.huobi.br.com/en-us/topic/invited/?invite_code=rwrd3>`__ | 1 | `API <https://github.com/huobiapi/API_Docs/wiki/REST_api_reference>`__ | China |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
Expand Down
6 changes: 3 additions & 3 deletions doc/exchanges-by-country.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ The ccxt library currently supports the following cryptocurrency exchange market
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| China | |gateio| | gateio | `Gate.io <https://gate.io/>`__ | 2 | `API <https://gate.io/api2>`__ |
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| China | |hadax| | hadax | `HADAX <https://www.hadax.com>`__ | 1 | `API <https://github.com/huobiapi/API_Docs/wiki>`__ |
| China | |hadax| | hadax | `HADAX <https://www.huobi.br.com/en-us/topic/invited/?invite_code=rwrd3>`__ | 1 | `API <https://github.com/huobiapi/API_Docs/wiki>`__ |
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| China | |huobi| | huobi | `Huobi <https://www.huobi.com>`__ | 3 | `API <https://github.com/huobiapi/API_Docs_en/wiki>`__ |
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| China | |huobicny| | huobicny | `Huobi CNY <https://www.huobi.com>`__ | 1 | `API <https://github.com/huobiapi/API_Docs/wiki/REST_api_reference>`__ |
| China | |huobicny| | huobicny | `Huobi CNY <https://www.huobi.br.com/en-us/topic/invited/?invite_code=rwrd3>`__ | 1 | `API <https://github.com/huobiapi/API_Docs/wiki/REST_api_reference>`__ |
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| China | |huobipro| | huobipro | `Huobi Pro <https://www.huobi.br.com/en-us/topic/invited/?invite_code=rwrd3>`__ | 1 | `API <https://github.com/huobiapi/API_Docs/wiki/REST_api_reference>`__ |
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
Expand Down Expand Up @@ -174,7 +174,7 @@ The ccxt library currently supports the following cryptocurrency exchange market
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| New Zealand | |anxpro| | anxpro | `ANXPro <https://anxpro.com>`__ | 2 | `API <http://docs.anxv2.apiary.io>`__ |
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| New Zealand | |cryptopia| | cryptopia | `Cryptopia <https://www.cryptopia.co.nz/Register?referrer=kroitor>`__ | \* | `API <https://www.cryptopia.co.nz/Forum/Category/45>`__ |
| New Zealand | |cryptopia| | cryptopia | `Cryptopia <https://www.cryptopia.co.nz>`__ | \* | `API <https://www.cryptopia.co.nz/Forum/Category/45>`__ |
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| New Zealand | |independentreserve| | independentreserve | `Independent Reserve <https://www.independentreserve.com>`__ | \* | `API <https://www.independentreserve.com/API>`__ |
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
Expand Down

0 comments on commit 0999ade

Please sign in to comment.