diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-12-19 18:04:25 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-12-19 18:04:25 +0800 |
| commit | 32396b5eca53bdc97d44f0d8683b77ab8fc1c29a (patch) | |
| tree | c0ca2b026a61dfd4762219574a24cdc9617a18f8 /packages/website/ts/index.tsx | |
| parent | fb0b7efc4563c7c561866ab8691361ce6919160b (diff) | |
| parent | c63f76dde7267c54328d2f12f401d94484e5a91a (diff) | |
| download | dexon-sol-tools-32396b5eca53bdc97d44f0d8683b77ab8fc1c29a.tar dexon-sol-tools-32396b5eca53bdc97d44f0d8683b77ab8fc1c29a.tar.gz dexon-sol-tools-32396b5eca53bdc97d44f0d8683b77ab8fc1c29a.tar.bz2 dexon-sol-tools-32396b5eca53bdc97d44f0d8683b77ab8fc1c29a.tar.lz dexon-sol-tools-32396b5eca53bdc97d44f0d8683b77ab8fc1c29a.tar.xz dexon-sol-tools-32396b5eca53bdc97d44f0d8683b77ab8fc1c29a.tar.zst dexon-sol-tools-32396b5eca53bdc97d44f0d8683b77ab8fc1c29a.zip | |
Merge branch 'development' into refactor/website
* development:
Add additional public changes introduced to changelog
Update CHANGELOG
Add a comment
Introduce a variable for true
Remove redundant template string
Implement the address derivations
Add hdnode dependency
Move web3 import after subprovider imports in test web3_factory
Fixed https://github.com/0xProject/wiki/issues/19 by disabling re-rendering of markdownCodeBlock renderer if props haven't updated
Add convenience `rebuild` command
Update website calls to deposit/withdraw
Add entry to CHANGELOG
Fix tests in contracts
Modify the etherToken wrapper methods to accept an etherTokenAddress as the first arg. Since it is becoming apparent we will be updating the canonical WETH contract, we want users of 0x.js to be able to interact with n number of etherTokens without re-instantiating for each one.
Fix documentation issue where `unsubscribeAll` shown as method on every contractWrapper instance even though it's only used by Exchange and Token wrappers.
# Conflicts:
# packages/website/ts/components/eth_weth_conversion_button.tsx
Diffstat (limited to 'packages/website/ts/index.tsx')
0 files changed, 0 insertions, 0 deletions