diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-11-29 05:21:15 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-11-29 05:21:15 +0800 |
| commit | 15ce862334be14a7effcd55840ca96e425912df8 (patch) | |
| tree | b51f48dfb6a0dc66745b62521c108472210dcfaa /packages/website | |
| parent | 72a00ac2df47ff793d74c2a82c7f403f501e784a (diff) | |
| parent | da0af12834b16c960d9ebf2936eec450825ba987 (diff) | |
| download | dexon-0x-contracts-15ce862334be14a7effcd55840ca96e425912df8.tar.gz dexon-0x-contracts-15ce862334be14a7effcd55840ca96e425912df8.tar.zst dexon-0x-contracts-15ce862334be14a7effcd55840ca96e425912df8.zip | |
Merge branch 'development' into fix/refactorDocs
* development: (30 commits)
Export TransactionOpts type
Make website private
Publish
Update CHANGELOG
Change interval to 1h
Rename
Add ifExists to cleanupJobInterval
Add a cleanup job to an order watcher
Improve the comment
Add CHANGELOG comment
Add a HACK comment
Normalise subprovider names
Remove a comment
Fix a typo
Pin testrpc version
Remove gas params from tests
Add fake gas estimate suprovider for tests
Revert "Fix website linter errors"
Fix website linter errors
Fix tests
...
# Conflicts:
# packages/website/ts/utils/constants.ts
Diffstat (limited to 'packages/website')
| -rw-r--r-- | packages/website/package.json | 3 | ||||
| -rw-r--r-- | packages/website/ts/containers/zero_ex_js_documentation.tsx | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/website/package.json b/packages/website/package.json index b8588a31f..ca1f440a4 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -1,6 +1,7 @@ { "name": "website", "version": "0.0.0", + "private": true, "description": "Website and 0x portal dapp", "scripts": { "build": "NODE_ENV=production webpack; exit 0;", @@ -17,7 +18,7 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "0x.js": "^0.26.0", + "0x.js": "^0.27.0", "accounting": "^0.4.1", "basscss": "^8.0.3", "bignumber.js": "~4.1.0", diff --git a/packages/website/ts/containers/zero_ex_js_documentation.tsx b/packages/website/ts/containers/zero_ex_js_documentation.tsx index cfb5c00b5..15a137de1 100644 --- a/packages/website/ts/containers/zero_ex_js_documentation.tsx +++ b/packages/website/ts/containers/zero_ex_js_documentation.tsx @@ -116,6 +116,7 @@ const docsInfoConfig: DocsInfoConfig = { 'MethodOpts', 'ValidateOrderFillableOpts', 'OrderTransactionOpts', + 'TransactionOpts', 'ContractEventArg', 'LogEvent', 'LogEntry', |