Skip to content

Commit

Permalink
Merge branch 'master' into frosty00-transpileTests
Browse files Browse the repository at this point in the history
  • Loading branch information
@kroitor
kroitor committed May 30, 2018
2 parents a6c31b3 + 4c961be commit 97ec231
Show file tree
Hide file tree
Showing 20 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Expand Up @@ -34,7 +34,7 @@ The ccxt library currently supports the following 115 cryptocurrency exchange ma
|![binance](https://user-images.githubusercontent.com/1294454/29604020-d5483cdc-87ee-11e7-94c7-d1a8d9169293.jpg) | binance | [Binance](https://www.binance.com/?ref=10205187) | * | [API](https://github.com/binance-exchange/binance-official-api-docs/blob/master/rest-api.md) | Japan |
|![bit2c](https://user-images.githubusercontent.com/1294454/27766119-3593220e-5ece-11e7-8b3a-5a041f6bcc3f.jpg) | bit2c | [Bit2C](https://www.bit2c.co.il) | * | [API](https://www.bit2c.co.il/home/api) | Israel |
|![bitbank](https://user-images.githubusercontent.com/1294454/37808081-b87f2d9c-2e59-11e8-894d-c1900b7584fe.jpg) | bitbank | [bitbank](https://bitbank.cc/) | 1 | [API](https://docs.bitbank.cc/) | Japan |
|![bitbay](https://user-images.githubusercontent.com/1294454/27766132-978a7bd8-5ece-11e7-9540-bc96d1e9bbb8.jpg) | bitbay | [BitBay](https://bitbay.net) | * | [API](https://bitbay.net/public-api) | Poland, EU |
|![bitbay](https://user-images.githubusercontent.com/1294454/27766132-978a7bd8-5ece-11e7-9540-bc96d1e9bbb8.jpg) | bitbay | [BitBay](https://bitbay.net) | * | [API](https://bitbay.net/public-api) | Malta, EU |
|![bitfinex](https://user-images.githubusercontent.com/1294454/27766244-e328a50c-5ed2-11e7-947b-041416579bb3.jpg) | bitfinex | [Bitfinex](https://www.bitfinex.com) | 1 | [API](https://bitfinex.readme.io/v1/docs) | British Virgin Islands |
|![bitfinex2](https://user-images.githubusercontent.com/1294454/27766244-e328a50c-5ed2-11e7-947b-041416579bb3.jpg) | bitfinex2 | [Bitfinex v2](https://www.bitfinex.com) | 2 | [API](https://bitfinex.readme.io/v2/docs) | British Virgin Islands |
|![bitflyer](https://user-images.githubusercontent.com/1294454/28051642-56154182-660e-11e7-9b0d-6042d1e6edd8.jpg) | bitflyer | [bitFlyer](https://bitflyer.jp) | 1 | [API](https://bitflyer.jp/API) | Japan |
Expand Down
6 changes: 3 additions & 3 deletions build/ccxt.browser.js
View file

Large diffs are not rendered by default.

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

const version = '1.14.98'
const version = '1.14.99'

Exchange.ccxtVersion = version

Expand Down
2 changes: 1 addition & 1 deletion doc/README.rst
View file
Expand Up @@ -46,7 +46,7 @@ The ccxt library currently supports the following 115 cryptocurrency exchange ma
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |bitbank| | bitbank | `bitbank <https://bitbank.cc/>`__ | 1 | `API <https://docs.bitbank.cc/>`__ | Japan |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |bitbay| | bitbay | `BitBay <https://bitbay.net>`__ | \* | `API <https://bitbay.net/public-api>`__ | Poland, EU |
| |bitbay| | bitbay | `BitBay <https://bitbay.net>`__ | \* | `API <https://bitbay.net/public-api>`__ | Malta, EU |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |bitfinex| | bitfinex | `Bitfinex <https://www.bitfinex.com>`__ | 1 | `API <https://bitfinex.readme.io/v1/docs>`__ | British Virgin Islands |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
Expand Down
4 changes: 2 additions & 2 deletions doc/exchanges-by-country.rst
View file
Expand Up @@ -166,6 +166,8 @@ The ccxt library currently supports the following cryptocurrency exchange market
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| Japan | |zaif| | zaif | `Zaif <https://zaif.jp>`__ | 1 | `API <http://techbureau-api-document.readthedocs.io/ja/latest/index.html>`__ |
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| Malta | |bitbay| | bitbay | `BitBay <https://bitbay.net>`__ | \* | `API <https://bitbay.net/public-api>`__ |
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| Malta | |therock| | therock | `TheRockTrading <https://therocktrading.com>`__ | 1 | `API <https://api.therocktrading.com/doc/v1/index.html>`__ |
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| Mexico | |bitso| | bitso | `Bitso <https://bitso.com>`__ | 3 | `API <https://bitso.com/api_info>`__ |
Expand All @@ -188,8 +190,6 @@ The ccxt library currently supports the following cryptocurrency exchange market
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| Philippines | |btcexchange| | btcexchange | `BTCExchange <https://www.btcexchange.ph>`__ | \* | `API <https://github.com/BTCTrader/broker-api-docs>`__ |
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| Poland | |bitbay| | bitbay | `BitBay <https://bitbay.net>`__ | \* | `API <https://bitbay.net/public-api>`__ |
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| Poland | |bitmarket| | bitmarket | `BitMarket <https://www.bitmarket.pl>`__ | \* | `API <https://www.bitmarket.net/docs.php?file=api_public.html>`__ |
+----------------------------+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+
| Russia | |bitlish| | bitlish | `Bitlish <https://bitlish.com>`__ | 1 | `API <https://bitlish.com/api>`__ |
Expand Down
2 changes: 1 addition & 1 deletion doc/exchanges.rst
View file
Expand Up @@ -24,7 +24,7 @@ The ccxt library currently supports the following 115 cryptocurrency exchange ma
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |bitbank| | bitbank | `bitbank <https://bitbank.cc/>`__ | 1 | `API <https://docs.bitbank.cc/>`__ | Japan |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |bitbay| | bitbay | `BitBay <https://bitbay.net>`__ | \* | `API <https://bitbay.net/public-api>`__ | Poland, EU |
| |bitbay| | bitbay | `BitBay <https://bitbay.net>`__ | \* | `API <https://bitbay.net/public-api>`__ | Malta, EU |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |bitfinex| | bitfinex | `Bitfinex <https://www.bitfinex.com>`__ | 1 | `API <https://bitfinex.readme.io/v1/docs>`__ | British Virgin Islands |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion doc/manual.rst
View file
Expand Up @@ -78,7 +78,7 @@ The ccxt library currently supports the following 115 cryptocurrency exchange ma
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |bitbank| | bitbank | `bitbank <https://bitbank.cc/>`__ | 1 | `API <https://docs.bitbank.cc/>`__ | Japan |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |bitbay| | bitbay | `BitBay <https://bitbay.net>`__ | \* | `API <https://bitbay.net/public-api>`__ | Poland, EU |
| |bitbay| | bitbay | `BitBay <https://bitbay.net>`__ | \* | `API <https://bitbay.net/public-api>`__ | Malta, EU |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| |bitfinex| | bitfinex | `Bitfinex <https://www.bitfinex.com>`__ | 1 | `API <https://bitfinex.readme.io/v1/docs>`__ | British Virgin Islands |
+------------------------+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
@@ -1,6 +1,6 @@
{
"name": "ccxt",
"version": "1.14.98",
"version": "1.14.99",
"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
Expand Up @@ -30,7 +30,7 @@

namespace ccxt;

$version = '1.14.98';
$version = '1.14.99';

// rounding mode
const TRUNCATE = 0;
Expand Down
2 changes: 1 addition & 1 deletion php/bitbay.php
View file
Expand Up @@ -13,7 +13,7 @@ public function describe () {
return array_replace_recursive (parent::describe (), array (
'id' => 'bitbay',
'name' => 'BitBay',
'countries' => array ( 'PL', 'EU' ), // Poland
'countries' => array ( 'MT', 'EU' ), // Malta
'rateLimit' => 1000,
'has' => array (
'CORS' => true,
Expand Down
2 changes: 1 addition & 1 deletion python/README.rst
View file
Expand Up @@ -46,7 +46,7 @@ The ccxt library currently supports the following 115 cryptocurrency exchange ma
+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| bitbank | `bitbank <https://bitbank.cc/>`__ | 1 | `API <https://docs.bitbank.cc/>`__ | Japan |
+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| bitbay | `BitBay <https://bitbay.net>`__ | \* | `API <https://bitbay.net/public-api>`__ | Poland, EU |
| bitbay | `BitBay <https://bitbay.net>`__ | \* | `API <https://bitbay.net/public-api>`__ | Malta, EU |
+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
| bitfinex | `Bitfinex <https://www.bitfinex.com>`__ | 1 | `API <https://bitfinex.readme.io/v1/docs>`__ | British Virgin Islands |
+----------------------+-----------------------------------------------------------------------------------+-------+---------------------------------------------------------------------------------------------------+--------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/__init__.py
View file
Expand Up @@ -22,7 +22,7 @@

# ----------------------------------------------------------------------------

__version__ = '1.14.98'
__version__ = '1.14.99'

# ----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/async/__init__.py
View file
Expand Up @@ -4,7 +4,7 @@

# -----------------------------------------------------------------------------

__version__ = '1.14.98'
__version__ = '1.14.99'

# -----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/async/base/exchange.py
View file
Expand Up @@ -2,7 +2,7 @@

# -----------------------------------------------------------------------------

__version__ = '1.14.98'
__version__ = '1.14.99'

# -----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/async/bitbay.py
View file
Expand Up @@ -26,7 +26,7 @@ def describe(self):
return self.deep_extend(super(bitbay, self).describe(), {
'id': 'bitbay',
'name': 'BitBay',
'countries': ['PL', 'EU'], # Poland
'countries': ['MT', 'EU'], # Malta
'rateLimit': 1000,
'has': {
'CORS': True,
Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/base/exchange.py
View file
Expand Up @@ -4,7 +4,7 @@

# -----------------------------------------------------------------------------

__version__ = '1.14.98'
__version__ = '1.14.99'

# -----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/bitbay.py
View file
Expand Up @@ -26,7 +26,7 @@ def describe(self):
return self.deep_extend(super(bitbay, self).describe(), {
'id': 'bitbay',
'name': 'BitBay',
'countries': ['PL', 'EU'], # Poland
'countries': ['MT', 'EU'], # Malta
'rateLimit': 1000,
'has': {
'CORS': True,
Expand Down

0 comments on commit 97ec231

Please sign in to comment.