diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-08 03:45:48 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-08 03:45:48 +0800 |
| commit | 20f93185975d16c77492f05eb86dd89695539cd9 (patch) | |
| tree | 37b0380cbe98b8a44a350232d4125a1cc77b06b0 /packages/website/ts | |
| parent | b646c8441467212e60f03c868a55d6ab70720aba (diff) | |
| parent | 9bc6ebde4e4425799ed3ddfb50495029865e3ae8 (diff) | |
| download | dexon-sol-tools-20f93185975d16c77492f05eb86dd89695539cd9.tar dexon-sol-tools-20f93185975d16c77492f05eb86dd89695539cd9.tar.gz dexon-sol-tools-20f93185975d16c77492f05eb86dd89695539cd9.tar.bz2 dexon-sol-tools-20f93185975d16c77492f05eb86dd89695539cd9.tar.lz dexon-sol-tools-20f93185975d16c77492f05eb86dd89695539cd9.tar.xz dexon-sol-tools-20f93185975d16c77492f05eb86dd89695539cd9.tar.zst dexon-sol-tools-20f93185975d16c77492f05eb86dd89695539cd9.zip | |
Merge branch 'v2-prototype' into feature/combinatorial-testing
* v2-prototype:
Fix linter issue
Fix linter issue
Fix tslint issues
Fix missing paths
Fixed path
Use source-map-support package to include correct line numbers in mocha
move generated contract wrappers from `contract_wrappers/generated/` to `generated_contract_wrappers` in package with no non-generated contract wrappers
Diffstat (limited to 'packages/website/ts')
| -rw-r--r-- | packages/website/ts/components/ui/lifecycle_raised_button.tsx | 1 | ||||
| -rw-r--r-- | packages/website/ts/containers/zero_ex_js_documentation.ts | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/website/ts/components/ui/lifecycle_raised_button.tsx b/packages/website/ts/components/ui/lifecycle_raised_button.tsx index a24de56b7..380fbc77d 100644 --- a/packages/website/ts/components/ui/lifecycle_raised_button.tsx +++ b/packages/website/ts/components/ui/lifecycle_raised_button.tsx @@ -2,7 +2,6 @@ import { colors } from '@0xproject/react-shared'; import { errorUtils } from '@0xproject/utils'; import RaisedButton from 'material-ui/RaisedButton'; import * as React from 'react'; -import { utils } from 'ts/utils/utils'; const COMPLETE_STATE_SHOW_LENGTH_MS = 2000; diff --git a/packages/website/ts/containers/zero_ex_js_documentation.ts b/packages/website/ts/containers/zero_ex_js_documentation.ts index 94efd1cf7..9c3f447fb 100644 --- a/packages/website/ts/containers/zero_ex_js_documentation.ts +++ b/packages/website/ts/containers/zero_ex_js_documentation.ts @@ -101,6 +101,9 @@ const docsInfoConfig: DocsInfoConfig = { '"0x.js/src/contract_wrappers/generated/ether_token"', '"0x.js/src/contract_wrappers/generated/token"', '"0x.js/src/contract_wrappers/generated/exchange"', + '"0x.js/src/generated_contract_wrappers/ether_token"', + '"0x.js/src/generated_contract_wrappers/token"', + '"0x.js/src/generated_contract_wrappers/exchange"', ], }, menuSubsectionToVersionWhenIntroduced: { |