diff options
author | Fabio Berger <me@fabioberger.com> | 2018-01-25 23:42:58 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-01-25 23:42:58 +0800 |
commit | 71d68f975cd7bc089f0cbef4e5888a73eab4ee42 (patch) | |
tree | 9482602fc23d2baec3fff1fb97750ad45adc6eca /packages/website/public/images | |
parent | ec3d8a034fe763d8255935985b1fb97aff6c177b (diff) | |
parent | f58f0ddb67555c3f0c7252ea3e003824984c48ad (diff) | |
download | dexon-0x-contracts-71d68f975cd7bc089f0cbef4e5888a73eab4ee42.tar.gz dexon-0x-contracts-71d68f975cd7bc089f0cbef4e5888a73eab4ee42.tar.zst dexon-0x-contracts-71d68f975cd7bc089f0cbef4e5888a73eab4ee42.zip |
Merge branch 'development' into feature/portal-ledger-support
* development: (437 commits)
Publish
Update yarn.lock
Update the CHANGELOG
Fix the bug making it impossible to specify the custom ZRX address
Fix fill/cancel order by looking for NoError instead of empty blockchainErr given the BlockchainErrs type refactor
Add a comment about a yarn bug
Add our mainnet and kovan nodes as backups for Portal requests
Fix bug hiding the user info from topBar
Add dev-utils package to top level README
Prettier newline
Prettier
Allow Token symbols to be alphanumeric
Update CHANGELOG, rebase on development
Should not -> cannot
Reject negative amounts in isValidBaseUnitAmount
Re-add changelog for 0x.js
Fix prettier
Update yarn.lock
Move tests to a separate folder
Change file layout
...
# Conflicts:
# packages/website/README.md
Diffstat (limited to 'packages/website/public/images')
-rw-r--r-- | packages/website/public/images/ether.png | bin | 2312 -> 4235 bytes |
-rw-r--r-- | packages/website/public/images/social/discourse.png | bin | 0 -> 1454 bytes |
-rw-r--r-- | packages/website/public/images/team/jacob.jpg | bin | 0 -> 1177087 bytes |
-rw-r--r-- | packages/website/public/images/team/tom.jpg | bin | 0 -> 41810 bytes |
-rw-r--r-- | packages/website/public/images/token_icons/augur.png | bin | 146258 -> 23161 bytes |
-rw-r--r-- | packages/website/public/images/token_icons/default.png | bin | 17037 -> 20225 bytes |
-rw-r--r-- | packages/website/public/images/token_icons/district0x.png | bin | 67267 -> 25007 bytes |
-rw-r--r-- | packages/website/public/images/token_icons/ether_erc20.png | bin | 69772 -> 7584 bytes |
-rw-r--r-- | packages/website/public/images/token_icons/firstblood.jpg | bin | 72909 -> 7872 bytes |
-rw-r--r-- | packages/website/public/images/token_icons/qtum.png | bin | 169182 -> 32496 bytes |
-rw-r--r-- | packages/website/public/images/token_icons/zero_ex.png | bin | 162879 -> 17905 bytes |
-rw-r--r-- | packages/website/public/images/wrapped_eth_gray.png | bin | 0 -> 7649 bytes |
12 files changed, 0 insertions, 0 deletions
diff --git a/packages/website/public/images/ether.png b/packages/website/public/images/ether.png Binary files differindex 6a40a976d..c92f45681 100644 --- a/packages/website/public/images/ether.png +++ b/packages/website/public/images/ether.png diff --git a/packages/website/public/images/social/discourse.png b/packages/website/public/images/social/discourse.png Binary files differnew file mode 100644 index 000000000..4bca3de0d --- /dev/null +++ b/packages/website/public/images/social/discourse.png diff --git a/packages/website/public/images/team/jacob.jpg b/packages/website/public/images/team/jacob.jpg Binary files differnew file mode 100644 index 000000000..62ff412d2 --- /dev/null +++ b/packages/website/public/images/team/jacob.jpg diff --git a/packages/website/public/images/team/tom.jpg b/packages/website/public/images/team/tom.jpg Binary files differnew file mode 100644 index 000000000..a6b763816 --- /dev/null +++ b/packages/website/public/images/team/tom.jpg diff --git a/packages/website/public/images/token_icons/augur.png b/packages/website/public/images/token_icons/augur.png Binary files differindex 31c257ba9..b7d61100a 100644 --- a/packages/website/public/images/token_icons/augur.png +++ b/packages/website/public/images/token_icons/augur.png diff --git a/packages/website/public/images/token_icons/default.png b/packages/website/public/images/token_icons/default.png Binary files differindex 7ce754030..5c9ea4b0f 100644 --- a/packages/website/public/images/token_icons/default.png +++ b/packages/website/public/images/token_icons/default.png diff --git a/packages/website/public/images/token_icons/district0x.png b/packages/website/public/images/token_icons/district0x.png Binary files differindex edb8f2238..7427b1146 100644 --- a/packages/website/public/images/token_icons/district0x.png +++ b/packages/website/public/images/token_icons/district0x.png diff --git a/packages/website/public/images/token_icons/ether_erc20.png b/packages/website/public/images/token_icons/ether_erc20.png Binary files differindex f4154db7b..bc8beae8b 100644 --- a/packages/website/public/images/token_icons/ether_erc20.png +++ b/packages/website/public/images/token_icons/ether_erc20.png diff --git a/packages/website/public/images/token_icons/firstblood.jpg b/packages/website/public/images/token_icons/firstblood.jpg Binary files differindex 64bb65605..9cd23b10e 100644 --- a/packages/website/public/images/token_icons/firstblood.jpg +++ b/packages/website/public/images/token_icons/firstblood.jpg diff --git a/packages/website/public/images/token_icons/qtum.png b/packages/website/public/images/token_icons/qtum.png Binary files differindex 97e227c5c..b7f09dfd2 100644 --- a/packages/website/public/images/token_icons/qtum.png +++ b/packages/website/public/images/token_icons/qtum.png diff --git a/packages/website/public/images/token_icons/zero_ex.png b/packages/website/public/images/token_icons/zero_ex.png Binary files differindex 6c6deef11..8ed9a984b 100644 --- a/packages/website/public/images/token_icons/zero_ex.png +++ b/packages/website/public/images/token_icons/zero_ex.png diff --git a/packages/website/public/images/wrapped_eth_gray.png b/packages/website/public/images/wrapped_eth_gray.png Binary files differnew file mode 100644 index 000000000..397b31b1c --- /dev/null +++ b/packages/website/public/images/wrapped_eth_gray.png |