Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |