Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix all setState calls after unmounted errors. Decided to create our own ↵ | Fabio Berger | 2018-01-31 | 7 | -43/+90 |
| | | | | flag rather then using a cancellablePromise since there was little to be gained from this alternative | ||||
* | Fix bug where we were return undefined instead of the empty object | Fabio Berger | 2018-01-31 | 1 | -1/+1 |
| | |||||
* | Default the derivation path to that found in the Ledger subprovider | Fabio Berger | 2018-01-31 | 1 | -1/+4 |
| | |||||
* | Add browser data to dialog info | Fabio Berger | 2018-01-31 | 1 | -1/+1 |
| | |||||
* | Add Rinkeby support | Fabio Berger | 2018-01-30 | 1 | -6/+3 |
| | |||||
* | Pass in whether we want the personal message prefix appended and never ↵ | Fabio Berger | 2018-01-30 | 2 | -1/+20 |
| | | | | append it for Ledger. This fixes signing when Ledger is used and the backing node is not Parity | ||||
* | Wholesale replace the tokenByAddress and de-dup properly | Fabio Berger | 2018-01-30 | 4 | -26/+31 |
| | |||||
* | Call destroy ealier so that web3Wrapper stops polling for ↵ | Fabio Berger | 2018-01-30 | 2 | -3/+8 |
| | | | | userAddress/networkId updates before we prep for the batchDispatch | ||||
* | Disallow negative amounts | Fabio Berger | 2018-01-30 | 1 | -1/+1 |
| | |||||
* | Remove the ability to clear tokenByAddress. It should simply be updated. | Fabio Berger | 2018-01-30 | 4 | -14/+0 |
| | |||||
* | Use live backend on development | Fabio Berger | 2018-01-29 | 1 | -1/+1 |
| | |||||
* | Fetch default gasPrice from our ethGasStation API mirror and set it for all ↵ | Fabio Berger | 2018-01-29 | 1 | -3/+34 |
| | | | | transactions | ||||
* | remove unused type | Fabio Berger | 2018-01-29 | 1 | -10/+0 |
| | |||||
* | Small improvements | Fabio Berger | 2018-01-29 | 1 | -2/+2 |
| | |||||
* | Fix bug related to balance/allowance fetching being async | Fabio Berger | 2018-01-29 | 1 | -0/+14 |
| | |||||
* | Add missing entries for Ropsten and Rinkeby testnets, added Ropsten to ↵ | Fabio Berger | 2018-01-29 | 6 | -23/+32 |
| | | | | Ledger network dropdown | ||||
* | Re-set Ledger config dialog to connect step if dialog is closed | Fabio Berger | 2018-01-29 | 1 | -0/+1 |
| | |||||
* | Add flash message instructing user to confirm tx on Ledger | Fabio Berger | 2018-01-29 | 1 | -0/+13 |
| | |||||
* | Add the stack trace to help with debugging | Fabio Berger | 2018-01-29 | 1 | -1/+1 |
| | |||||
* | Make it such that users can switch between Ledger accounts without first ↵ | Fabio Berger | 2018-01-29 | 3 | -9/+12 |
| | | | | switching back to an injected provider | ||||
* | Use colors module and remove in-lined colors | Fabio Berger | 2018-01-29 | 2 | -7/+10 |
| | |||||
* | Replace heavy loading animation with simple circular loader | Fabio Berger | 2018-01-29 | 2 | -41/+14 |
| | |||||
* | Add network name to the select provider | Fabio Berger | 2018-01-29 | 1 | -12/+15 |
| | |||||
* | Fix bug where could not switch to Ledger and back | Fabio Berger | 2018-01-29 | 6 | -31/+65 |
| | |||||
* | Implement just-in-time loading of token balances & allowances | Fabio Berger | 2018-01-28 | 23 | -295/+384 |
| | |||||
* | Initial Ledger support implementation | Fabio Berger | 2018-01-28 | 17 | -160/+553 |
| | |||||
* | Remove unused Ledgerco import | Fabio Berger | 2018-01-28 | 1 | -1/+0 |
| | |||||
* | Add light blue as our accent color | Fabio Berger | 2018-01-28 | 1 | -0/+1 |
| | |||||
* | Properly detect user signing cancellation on Metamask, Parity signer and Ledger | Fabio Berger | 2018-01-28 | 6 | -7/+7 |
| | |||||
* | Fix fill/cancel order by looking for NoError instead of empty blockchainErr ↵ | Fabio Berger | 2018-01-22 | 1 | -2/+2 |
| | | | | given the BlockchainErrs type refactor | ||||
* | Add our mainnet and kovan nodes as backups for Portal requests | Fabio Berger | 2018-01-19 | 1 | -2/+2 |
| | |||||
* | Fix bug hiding the user info from topBar | Fabio Berger | 2018-01-19 | 1 | -1/+1 |
| | |||||
* | Allow Token symbols to be alphanumeric | Jacob Evans | 2018-01-19 | 1 | -4/+4 |
| | |||||
* | Fix prettier | Leonid Logvinov | 2018-01-18 | 3 | -46/+56 |
| | |||||
* | Merge pull request #325 from 0xProject/fix/portal-bugs | Leonid | 2018-01-18 | 6 | -19/+27 |
|\ | | | | | Small Fixes/Additions | ||||
| * | Use intervalUtils.clearAsyncExcludingInterval instead of calling ↵ | Fabio Berger | 2018-01-18 | 2 | -4/+4 |
| | | | | | | | | clearInterval directly for grepability | ||||
| * | Add discourse forum to Community section of website footer | Fabio Berger | 2018-01-18 | 2 | -0/+7 |
| | | |||||
| * | Remove dead-code | Fabio Berger | 2018-01-18 | 1 | -5/+0 |
| | | |||||
| * | Fix Portal topbar so that it displays the mobile menu | Fabio Berger | 2018-01-18 | 1 | -8/+6 |
| | | |||||
| * | Add missing onError callbacks | Fabio Berger | 2018-01-18 | 2 | -2/+10 |
| | | |||||
| * | Fix balance page copy to refer to the Wrap ETH tab instead of a "convert" button | Fabio Berger | 2018-01-18 | 1 | -1/+1 |
| | | |||||
* | | Enable restrict-plus-operands and fix issues detected | Leonid Logvinov | 2018-01-17 | 4 | -4/+4 |
|/ | |||||
* | Fix @bmilman linkedin link | Leonid Logvinov | 2018-01-12 | 1 | -1/+1 |
| | |||||
* | Add new team photos | Leonid Logvinov | 2018-01-12 | 1 | -4/+6 |
| | |||||
* | Add @tom and @dekz while removing @PhABC | Leonid Logvinov | 2018-01-12 | 2 | -14/+26 |
| | |||||
* | Fix ts error in portal after enabling more strict checks | Leonid Logvinov | 2018-01-10 | 11 | -37/+40 |
| | |||||
* | Fix linter errors | Leonid Logvinov | 2018-01-04 | 3 | -5/+3 |
| | |||||
* | Use configured version of bignumber in all packages | Leonid Logvinov | 2018-01-04 | 31 | -35/+31 |
| | |||||
* | Apply prettier config | Leonid Logvinov | 2018-01-03 | 112 | -3298/+2774 |
| | |||||
* | Merge branch 'development' into fix/docLinks | Fabio Berger | 2017-12-22 | 57 | -849/+849 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Update and standardize contracts README Add to CHANGELOG Refactor toBaseUnitAmount so that it throws if user supplies unitAmount with too many decimals Make assertion stricter so that one cannot submit invalid baseUnit amounts to `toUnitAmount` Add some missed underscores, update changelog and comments Add new underscore-privates rule to @0xproject/tslint-config and fix lint errors # Conflicts: # packages/website/ts/pages/documentation/documentation.tsx # packages/website/ts/pages/shared/nested_sidebar_menu.tsx | ||||
| * | Merge pull request #285 from 0xProject/fix/underscorePrivate | Brandon Millman | 2017-12-22 | 57 | -849/+849 |
| |\ | | | | | | | Add new underscore-privates rule to @0xproject/tslint-config and fix … | ||||
| | * | Merge branch 'development' into fix/underscorePrivate | Brandon Millman | 2017-12-21 | 8 | -14/+19 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (29 commits) Move call to error reporter to end of handler so that even if reporting the error takes a while, it doesn't block the UI Update outdated WETH ranges Fix conditional Fix top-padding Publish Update CHANGELOGs Add slashes to base URLs Fix linter issue Fix WETH symbol Update snapshot and artifacts Replace our EtherTokens with WETH9 from maker Fix test description Fix a typo Add err==null assertions Add WETH9 tests Use the new snapshot including WETH9 and it's artifacts Add WETH9 and mirations Fix WETH events watching Fix a typo Init the _etherTokenContractsByAddress ... | ||||
| | * | | Add new underscore-privates rule to @0xproject/tslint-config and fix lint errors | Brandon Millman | 2017-12-20 | 57 | -849/+849 |
| | | | | |||||
* | | | | Create types sectionName constant | Fabio Berger | 2017-12-22 | 4 | -3/+7 |
| | | | | |||||
* | | | | Add sectionName prefix to all anchor links in order to fix method name ↵ | Fabio Berger | 2017-12-22 | 8 | -20/+64 |
|/ / / | | | | | | | | | | collisions between sections | ||||
* | / | Fix Max button bug | Fabio Berger | 2017-12-21 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Move call to error reporter to end of handler so that even if reporting the ↵ | Fabio Berger | 2017-12-21 | 4 | -6/+6 |
| | | | | | | | | error takes a while, it doesn't block the UI | ||||
* | | Update outdated WETH ranges | Fabio Berger | 2017-12-21 | 1 | -4/+4 |
| | | |||||
* | | Fix conditional | Fabio Berger | 2017-12-21 | 1 | -1/+1 |
| | | |||||
* | | Fix top-padding | Fabio Berger | 2017-12-21 | 3 | -5/+5 |
| | | |||||
* | | Export new public types | Leonid Logvinov | 2017-12-20 | 1 | -0/+3 |
| | | |||||
* | | Add etherToken.getLogsAsync and etherToken.subscribe with tests | Leonid Logvinov | 2017-12-20 | 1 | -0/+2 |
|/ | |||||
* | Remove etherToken from smart contract docs | Fabio Berger | 2017-12-20 | 3 | -7/+0 |
| | |||||
* | Update new WETH addresses and localStorage clearance key | Fabio Berger | 2017-12-20 | 1 | -3/+3 |
| | |||||
* | Fix merge | Fabio Berger | 2017-12-20 | 4 | -7/+8 |
| | |||||
* | Merge branch 'development' into createWethPage | Fabio Berger | 2017-12-20 | 72 | -994/+941 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (27 commits) Remove re-assignment Fix scrolling topBar on Portal Fix overflow issue on calculated fillAmount Fix faulty import Introduce an identityCommandBuilder Define types for methodID Define types for ethereumjs-abi Install types for yargs Fix comments Fix linter issues Fix linter error Rename SubscriptionOpts to BlockRange Refactor remaining _.assign to spread operator Move muiTheme into it's own module Refactor configs and constants, standardize on uppercase/snakecase, alphebetize, rename for logical grouping Sort colors into color spectrum remove unused style standarize on `grey` over `gray` spelling and other color related fixes Standardize colors to always be in uppercase hex and consolidate material-ui greys Consolidate all custom colors and material-ui colors into a colors module ... # Conflicts: # packages/website/ts/components/eth_wrappers.tsx # packages/website/ts/components/portal.tsx # packages/website/ts/utils/configs.ts # packages/website/ts/utils/constants.ts | ||||
| * | Remove re-assignment | Fabio Berger | 2017-12-20 | 1 | -5/+9 |
| | | |||||
| * | Merge branch 'development' into refactor/website | Fabio Berger | 2017-12-20 | 2 | -3/+4 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Introduce an identityCommandBuilder Define types for methodID Define types for ethereumjs-abi Install types for yargs Fix comments Fix linter issues Fix linter error Rename SubscriptionOpts to BlockRange | ||||
| | * | Rename SubscriptionOpts to BlockRange | Leonid Logvinov | 2017-12-19 | 2 | -3/+4 |
| | | | |||||
| * | | Fix scrolling topBar on Portal | Fabio Berger | 2017-12-19 | 2 | -2/+2 |
| | | | |||||
| * | | Fix overflow issue on calculated fillAmount | Fabio Berger | 2017-12-19 | 1 | -15/+13 |
| | | | |||||
| * | | Fix faulty import | Fabio Berger | 2017-12-19 | 1 | -1/+1 |
| | | | |||||
| * | | Refactor remaining _.assign to spread operator | Fabio Berger | 2017-12-19 | 4 | -8/+15 |
| | | | |||||
| * | | Move muiTheme into it's own module | Fabio Berger | 2017-12-19 | 2 | -35/+37 |
| | | | |||||
| * | | Merge branch 'development' into refactor/website | Fabio Berger | 2017-12-19 | 3 | -16/+25 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | Refactor configs and constants, standardize on uppercase/snakecase, ↵ | Fabio Berger | 2017-12-19 | 28 | -295/+298 |
| | | | | | | | | | | | | alphebetize, rename for logical grouping | ||||
| * | | Sort colors into color spectrum | Fabio Berger | 2017-12-18 | 1 | -8/+22 |
| | | | |||||
| * | | remove unused style | Fabio Berger | 2017-12-18 | 1 | -5/+0 |
| | | | |||||
| * | | standarize on `grey` over `gray` spelling and other color related fixes | Fabio Berger | 2017-12-18 | 40 | -92/+91 |
| | | | |||||
| * | | Standardize colors to always be in uppercase hex and consolidate material-ui ↵ | Fabio Berger | 2017-12-18 | 21 | -50/+48 |
| | | | | | | | | | | | | greys | ||||
| * | | Consolidate all custom colors and material-ui colors into a colors module | Fabio Berger | 2017-12-18 | 48 | -226/+169 |
| | | | |||||
| * | | Remove unused `location` prop | Fabio Berger | 2017-12-18 | 6 | -8/+6 |
| | | | |||||
| * | | Use bigNumberConfigs from @0xproject/utils in website repo | Fabio Berger | 2017-12-18 | 1 | -5/+2 |
| | | | |||||
| * | | Fix unhoverable help tooltip by renaming `Trade Permissions` to `Allowance` | Fabio Berger | 2017-12-18 | 1 | -2/+2 |
| | | | |||||
| * | | Replace remaining strEnums with property TS string enums | Fabio Berger | 2017-12-18 | 15 | -92/+79 |
| | | | |||||
| * | | Update ActionType enum and move from using _.assign in reducer | Fabio Berger | 2017-12-18 | 3 | -180/+222 |
| | | | |||||
| * | | Remove unused enums | Fabio Berger | 2017-12-18 | 3 | -39/+0 |
| | | | |||||
| * | | Update first two string enums to native type | Fabio Berger | 2017-12-18 | 13 | -58/+56 |
| | | | |||||
* | | | Add WETH | Fabio Berger | 2017-12-19 | 1 | -1/+1 |
| | | | |||||
* | | | remove extra space | Fabio Berger | 2017-12-19 | 1 | -1/+1 |
| | | | |||||
* | | | Remove binding on prop passed callbacks | Fabio Berger | 2017-12-19 | 2 | -4/+4 |
| | | | |||||
* | | | Add airtable tasks to TODO's | Fabio Berger | 2017-12-19 | 1 | -0/+3 |
| | | | |||||
* | | | Merge branch 'development' into createWethPage | Fabio Berger | 2017-12-19 | 1 | -10/+19 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | Merge pull request #268 from 0xProject/fix/codeSelectingInDocs | Fabio Berger | 2017-12-19 | 1 | -10/+19 |
| |\ \ | | | | | | | | | Fix code selection bug in docs | ||||
| | * | | Fixed https://github.com/0xProject/wiki/issues/19 by disabling re-rendering ↵ | Fabio Berger | 2017-12-18 | 1 | -10/+19 |
| | |/ | | | | | | | | | | of markdownCodeBlock renderer if props haven't updated | ||||
| * / | Update website calls to deposit/withdraw | Fabio Berger | 2017-12-18 | 2 | -6/+6 |
| |/ | |||||
* | | Temporarily pretend as if new WETH contracts are already whitelisted by ↵ | Fabio Berger | 2017-12-18 | 2 | -6/+18 |
| | | | | | | | | tokenRegistry and put hacks behind the shouldDeprecateOldWethToken flag | ||||
* | | Add notice dialog to balances page about updating the WETH contract. We also ↵ | Fabio Berger | 2017-12-18 | 3 | -10/+79 |
| | | | | | | | | draw attention to the new dedicated section for unwrapping from outdated WETH tokens | ||||
* | | Fix linter errors | Fabio Berger | 2017-12-18 | 1 | -2/+4 |
| | | |||||
* | | Move weth.io url to constants | Fabio Berger | 2017-12-18 | 2 | -1/+2 |
| | | |||||
* | | Make it such that Wrapped Ether page works on networks without any outdated ↵ | Fabio Berger | 2017-12-18 | 1 | -11/+19 |
| | | | | | | | | WETH tokens | ||||
* | | Add `Max` convenience button in unwrap WETH dialog | Fabio Berger | 2017-12-18 | 1 | -1/+15 |
| | | |||||
* | | Link all EtherTokens to Etherscan and add address tooltip | Fabio Berger | 2017-12-18 | 1 | -20/+53 |
| | | |||||
* | | Update to passing etherTokenAddress into withdraw and deposit calls | Fabio Berger | 2017-12-18 | 2 | -6/+6 |
| | | |||||
* | | Since sending the error report could take some time, we first trigger ↵ | Fabio Berger | 2017-12-17 | 1 | -1/+1 |
|/ | | | | `onError` so that the user gets notified immediately | ||||
* | Temporary hack to alleviate issues with updating tokenRegistry with new WETH ↵ | Fabio Berger | 2017-12-16 | 1 | -1/+14 |
| | | | | address | ||||
* | Two mysteriously missing imports | Fabio Berger | 2017-12-16 | 2 | -0/+2 |
| | |||||
* | Fix linter errors | Fabio Berger | 2017-12-16 | 3 | -13/+0 |
| | |||||
* | Merge branch 'development' into createWethPage | Fabio Berger | 2017-12-16 | 57 | -263/+36 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (54 commits) Fix redundant spaces Fix tests Fix website unused vars Fix connect unused vars Fix 0x.js unused vars Dissallow unused vars/imports Implement first custom linter rule async-suffix Reuse intervalutils in website Add a newline Name a variable Add a comment Fix a conditional Make migrations deterministic Fix linter error Fix linter errors Add a function to init token balances Rename tokenUtils.getNonProtocolTokens to tokenUtils.getDummyTokens Add DummyToken to gitignore Add DummyToken to artifacts list Increase mocha timeout ... | ||||
| * | Fix redundant spaces | Leonid Logvinov | 2017-12-16 | 2 | -2/+2 |
| | | |||||
| * | Fix website unused vars | Leonid Logvinov | 2017-12-15 | 56 | -256/+28 |
| | | |||||
| * | Reuse intervalutils in website | Leonid Logvinov | 2017-12-15 | 2 | -6/+6 |
| | | |||||
* | | Update name to be a call to action | Fabio Berger | 2017-12-16 | 1 | -1/+1 |
| | | |||||
* | | Add default value for onConversionSuccessful | Fabio Berger | 2017-12-16 | 1 | -3/+2 |
| | | |||||
* | | Improve WETH page styling | Fabio Berger | 2017-12-15 | 2 | -12/+35 |
| | | |||||
* | | Use new wrap/unwrap buttons, fetch outdated WETH balances and re-fetch after ↵ | Fabio Berger | 2017-12-15 | 3 | -72/+208 |
| | | | | | | | | a successful unwrap. | ||||
* | | Refactor the WETH conversion dialog/button to be either wrap or unwrap ↵ | Fabio Berger | 2017-12-15 | 2 | -59/+109 |
| | | | | | | | | specific and not both | ||||
* | | Clear trackedTokens so that a user starts tracking the new WETH and no ↵ | Fabio Berger | 2017-12-14 | 3 | -0/+14 |
| | | | | | | | | longer the old one | ||||
* | | Make label optional and make sure the input field still renders properly ↵ | Fabio Berger | 2017-12-14 | 1 | -3/+4 |
| | | | | | | | | without it | ||||
* | | Remove ETH-WETH convert button from balances page | Fabio Berger | 2017-12-14 | 2 | -25/+0 |
| | | |||||
* | | Remove temporary hack | Fabio Berger | 2017-12-14 | 1 | -2/+0 |
| | | |||||
* | | Merge branch 'development' into createWethPage | Fabio Berger | 2017-12-13 | 2 | -31/+57 |
|\| | | | | | | | | | | | | | * development: update yarn.lock Fix typedoc_utils to take into account subPackageName when rendering call path Add WebSocketOrderbookChannel to connect docs | ||||
| * | Fix typedoc_utils to take into account subPackageName when rendering call path | Brandon Millman | 2017-12-13 | 1 | -30/+44 |
| | | |||||
| * | Add WebSocketOrderbookChannel to connect docs | Brandon Millman | 2017-12-12 | 1 | -1/+13 |
| | | |||||
* | | progress weth page | Fabio Berger | 2017-12-13 | 7 | -2/+264 |
|/ | |||||
* | Merge pull request #257 from 0xProject/fix/ethereum-address | Leonid | 2017-12-12 | 2 | -7/+2 |
|\ | | | | | Remove ethereum-address dependency and add this logic to the repo | ||||
| * | Fix an invocation | Leonid Logvinov | 2017-12-12 | 1 | -1/+1 |
| | | |||||
| * | Move isAddress to shared utils and remove all dependencies on ethereum-address | Leonid Logvinov | 2017-12-11 | 2 | -6/+1 |
| | | |||||
* | | Don't unsubscribe on error. It's done automatically | Leonid Logvinov | 2017-12-12 | 1 | -6/+3 |
|/ | |||||
* | Merge branch 'development' into feature/addSubproviders | Fabio Berger | 2017-12-09 | 3 | -13/+12 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Update README.md Inline network module Stop supporting different file extensions in abi-gen Refactor networkId out of web3Wrapper Update connect types in preperation for publishing Fix CI command Address feedback Refactor web3Wrapper to a separate package # Conflicts: # package.json # packages/website/ts/blockchain.ts | ||||
| * | Merge branch 'development' into feature/web3-wrapper | Leonid | 2017-12-08 | 2 | -6/+12 |
| |\ | |||||
| * | | Refactor web3Wrapper to a separate package | Leonid Logvinov | 2017-12-07 | 5 | -15/+14 |
| | | | |||||
* | | | Merge branch 'development' into feature/addSubproviders | Fabio Berger | 2017-12-08 | 2 | -6/+12 |
|\ \ \ | | |/ | |/| | | | | | | | | | | * development: Make sure we don't pass empty maker into getOrderHashHex Make sure we always pass in the correct networkId even if no injectedWeb3 found | ||||
| * | | Make sure we don't pass empty maker into getOrderHashHex | Fabio Berger | 2017-12-08 | 1 | -1/+2 |
| | | | |||||
| * | | Make sure we always pass in the correct networkId even if no injectedWeb3 found | Fabio Berger | 2017-12-08 | 1 | -5/+10 |
| |/ | |||||
* | | remove unneeded reset | Fabio Berger | 2017-12-07 | 1 | -2/+0 |
| | | |||||
* | | Fix tslint error | Fabio Berger | 2017-12-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'development' into feature/addSubproviders | Fabio Berger | 2017-12-07 | 3 | -3/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Inline function Introduce a const Make private Add version matcher script Use same versions of dependencies everywhere Add missing await Move declaration into proper conditional block Fix Party element so that an identicon's height is that which was passed in # Conflicts: # packages/website/package.json # yarn.lock | ||||
| * | Add missing await | Fabio Berger | 2017-12-06 | 1 | -1/+1 |
| | | |||||
| * | Move declaration into proper conditional block | Fabio Berger | 2017-12-06 | 1 | -1/+1 |
| | | |||||
| * | Fix Party element so that an identicon's height is that which was passed in | Fabio Berger | 2017-12-06 | 1 | -1/+1 |
| | | |||||
* | | Use subproviders subpackage in website and remove old subproviders | Fabio Berger | 2017-12-06 | 6 | -300/+44 |
|/ | |||||
* | Add orderWatcher to 0x.js docs | Fabio Berger | 2017-11-30 | 3 | -1/+14 |
| | |||||
* | Add order and signedOrder to public types | Fabio Berger | 2017-11-30 | 1 | -0/+2 |
| | |||||
* | Add TokenTradeInfo to public types | Fabio Berger | 2017-11-30 | 1 | -0/+1 |
| | |||||
* | Rename packageName to displayName for clarity | Fabio Berger | 2017-11-29 | 7 | -9/+9 |
| | |||||
* | Fix phantom `Contracts` section issue | Fabio Berger | 2017-11-29 | 1 | -0/+5 |
| | |||||
* | Add 0x Connect to footer | Fabio Berger | 2017-11-29 | 1 | -0/+4 |
| | |||||
* | Merge branch 'development' into feature/connect-docs | Fabio Berger | 2017-11-29 | 3 | -13/+4 |
|\ | | | | | | | | | | | | | * development: rename for clarity remove unused code Publish | ||||
| * | rename for clarity | Fabio Berger | 2017-11-29 | 2 | -4/+4 |
| | | |||||
| * | remove unused code | Fabio Berger | 2017-11-29 | 1 | -9/+0 |
| | | |||||
* | | Add 0x Connect Docs to the menu and topBar | Fabio Berger | 2017-11-29 | 2 | -6/+22 |
| | | |||||
* | | Add connect docs | Fabio Berger | 2017-11-29 | 3 | -0/+105 |
| | | |||||
* | | Add subPackageName and get rid of hard-coded 0x.js in sourceLink | Fabio Berger | 2017-11-29 | 6 | -2/+17 |
|/ | |||||
* | Merge branch 'development' into fix/refactorDocs | Fabio Berger | 2017-11-29 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | Export TransactionOpts type | Leonid Logvinov | 2017-11-29 | 1 | -0/+1 |
| | | |||||
* | | Refactor the topLevel documentation react components for 0x.js and Smart ↵ | Fabio Berger | 2017-11-29 | 10 | -599/+323 |
| | | | | | | | | contracts into a single component | ||||
* | | Fix tslint error | Fabio Berger | 2017-11-29 | 1 | -1/+1 |
| | | |||||
* | | Refactor docs to be more declarative, put all hard-coded doc-related data in ↵ | Fabio Berger | 2017-11-29 | 16 | -286/+428 |
|/ | | | | one place so it easier to add new doc pages | ||||
* | Last remaining website fixes | Fabio Berger | 2017-11-28 | 2 | -8/+10 |
| | |||||
* | fix remaining tslint errors | Fabio Berger | 2017-11-28 | 85 | -467/+493 |
| | |||||
* | Fix tslint issues | Fabio Berger | 2017-11-28 | 18 | -255/+272 |
| | |||||
* | remove comment | Fabio Berger | 2017-11-28 | 1 | -1/+0 |
| | |||||
* | Add "Web3" prefix to web3 alias types and link to the correct line in the ↵ | Fabio Berger | 2017-11-28 | 2 | -2/+14 |
| | | | | web3 typings | ||||
* | Fix overlapping arg names | Fabio Berger | 2017-11-28 | 1 | -2/+1 |
| | |||||
* | Fix source links in 0x.js docs | Fabio Berger | 2017-11-28 | 1 | -3/+6 |
| | |||||
* | Fix subscriptions given latest changes to 0x.js | Fabio Berger | 2017-11-24 | 1 | -4/+5 |
| | |||||
* | update tokenByAddress after tokenStateByAddress to avoid race-condition | Fabio Berger | 2017-11-24 | 1 | -1/+1 |
| | |||||
* | Add error when unexpected condition hit | Fabio Berger | 2017-11-24 | 1 | -0/+3 |
| | |||||
* | Fix alignment | Fabio Berger | 2017-11-24 | 1 | -9/+9 |
| | |||||
* | Add missing keys | Fabio Berger | 2017-11-24 | 1 | -0/+2 |
| | |||||
* | Fix bug | Fabio Berger | 2017-11-24 | 1 | -2/+2 |
| | |||||
* | Force the clearance of tradeHistory | Fabio Berger | 2017-11-23 | 1 | -1/+1 |
| | |||||
* | Upgrade to latest 0x.js version and refactor subscriptions to use latest ↵ | Fabio Berger | 2017-11-23 | 2 | -25/+53 |
| | | | | interface | ||||
* | Add website to mono repo, update packages to align with existing ↵ | Fabio Berger | 2017-11-22 | 113 | -0/+16254 |
sub-packages, use new subscribeAsync 0x.js method |