aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add as an option toLeonid Logvinov2018-02-282-1/+2
* Change backend for contracts contractsLeonid Logvinov2018-02-283-8/+8
* Fix namingsLeonid Logvinov2018-02-282-4/+4
* Update template linkLeonid Logvinov2018-02-281-1/+1
* Add PR numberLeonid Logvinov2018-02-282-3/+3
* Fix buildLeonid Logvinov2018-02-282-6/+6
* Use the same templates as 0x.jsLeonid Logvinov2018-02-2830-184/+178
* Pass components to parameterTypeLeonid Logvinov2018-02-281-1/+1
* Apply prettier after generating contractsLeonid Logvinov2018-02-282-3/+3
* Add CHANGELOG entryLeonid Logvinov2018-02-281-0/+1
* Fix build by using local events typesLeonid Logvinov2018-02-288-23/+72
* Add support for ABIv2 to abi-genLeonid Logvinov2018-02-286-10/+35
* Allow users to specify the contracts backend in abi-genLeonid Logvinov2018-02-2819-71/+199
* Add data to TxDataLeonid Logvinov2018-02-282-0/+5
* Pass whole txData to estimateGasLeonid Logvinov2018-02-281-1/+1
* Fix default contract set calculationLeonid Logvinov2018-02-281-0/+3
* Fix default pathsLeonid Logvinov2018-02-281-2/+2
* Add web3Wrapper.callAsync and remove web3Wrapper.getContractInstanceLeonid Logvinov2018-02-283-10/+12
* Merge pull request #415 from 0xProject/fix/unsubscribeAllLeonid Logvinov2018-02-289-12/+13
|\
| * Merge branch 'development' into fix/unsubscribeAllLeonid Logvinov2018-02-2811-71/+152
| |\ | |/ |/|
* | Merge pull request #373 from 0xProject/feature/0x.js/lowercase-addressesFabio Berger2018-02-2811-70/+151
|\ \
| * \ Merge branch 'development' into feature/0x.js/lowercase-addressesJacob Evans2018-02-2768-4769/+1374
| |\ \ | |/ / |/| |
| * | Lowercase web3 wrapper addressesJacob Evans2018-02-272-3/+9
| * | Check isETHAddressHex before lowercaseJacob Evans2018-02-279-67/+60
| * | Check maker is valid addressJacob Evans2018-02-231-3/+8
| * | Lowercase public addressesJacob Evans2018-02-236-89/+172
| | * Rename _unsubscribeAll to unsubscribeAllLeonid Logvinov2018-02-279-12/+13
| |/ |/|
* | Fix english translationsFabio Berger2018-02-241-3/+3
* | Fix footer on mobileFabio Berger2018-02-241-5/+3
* | Merge branch 'development' of github.com:0xProject/0x.js into developmentFabio Berger2018-02-2410-31/+92
|\ \
| * \ Merge pull request #385 from 0xProject/feature/0x_config_validationLeonid Logvinov2018-02-2410-31/+92
| |\ \
| | * | Update CHANGELOGLeonid Logvinov2018-02-212-1/+7
| | * | Remove unused CHANGELOG entryLeonid Logvinov2018-02-211-4/+0
| | * | Remove unused importLeonid Logvinov2018-02-211-1/+1
| | * | Change assert.doesConformToShema interfaceLeonid Logvinov2018-02-212-8/+8
| | * | Remove a type assertionLeonid Logvinov2018-02-211-1/+1
| | * | Remove type-level validationLeonid Logvinov2018-02-155-29/+12
| | * | Access property over thisLeonid Logvinov2018-02-151-1/+1
| | * | Add type castLeonid Logvinov2018-02-151-1/+1
| | * | Fix testsLeonid Logvinov2018-02-155-9/+13
| | * | Add entries to the CHANGELOGLeonid Logvinov2018-02-155-4/+12
| | * | Better validate ZeroExConfig on public networksLeonid Logvinov2018-02-156-35/+99
* | | | re-add google analytics codeFabio Berger2018-02-241-0/+12
|/ / /
* | | Fix Russian translationFabio Berger2018-02-231-1/+1
* | | Merge pull request #411 from 0xProject/fix/types/dev-dependenciesBrandon Millman2018-02-235-5/+5
|\ \ \
| * | | Move all dependencies on @0xproject/types out of devDependenciesBrandon Millman2018-02-225-5/+5
|/ / /
* | | Slight improvement to footerFabio Berger2018-02-221-1/+1
* | | Fix a few Korean translationsFabio Berger2018-02-221-3/+3
* | | Merge pull request #410 from 0xProject/translateHomepageFabio Berger2018-02-2232-341/+1071
|\ \ \
| * | | Move from storing translations in TS files to JSON filesFabio Berger2018-02-2212-453/+427
| * | | Remove Segment.ioFabio Berger2018-02-221-57/+0
| * | | Remove unused varFabio Berger2018-02-221-2/+0
| * | | Remove extenuous defaultPropsFabio Berger2018-02-222-4/+0
| * | | Make translate required by footerFabio Berger2018-02-221-1/+1
| * | | Make translate a required prop of TopBarFabio Berger2018-02-222-1/+2
| * | | Keep topBar and footer language to the one picked by the userFabio Berger2018-02-2218-16/+159
| * | | Re-set language to browserFabio Berger2018-02-221-1/+1
| * | | Fix rocket.chat keyFabio Berger2018-02-221-1/+1
| * | | Mobile optimize translated landing pageFabio Berger2018-02-222-10/+40
| * | | Improve russian translationsLeonid Logvinov2018-02-211-17/+17
| * | | Improve homepage and add translations in chinese, russian, korean and spanishFabio Berger2018-02-2110-16/+398
| * | | Move translate to reduxFabio Berger2018-02-215-91/+161
| * | | Add translation infra and replace english text with calls to translateFabio Berger2018-02-216-219/+412
| * | | Move tsconfig package to devDepsFabio Berger2018-02-211-1/+1
* | | | Merge pull request #408 from 0xProject/fix/deployer/checkDependenciesAmir Bandeali2018-02-2121-4384/+194
|\ \ \ \ | |_|_|/ |/| | |
| * | | Address feedbackAmir Bandeali2018-02-216-50/+55
| * | | Use source tree hash instead of compile flagAmir Bandeali2018-02-213-44/+43
| * | | Fix race conditionAmir Bandeali2018-02-213-11/+14
| * | | Update CHANGELOGAmir Bandeali2018-02-211-0/+4
| * | | Delete artifacts directoryAmir Bandeali2018-02-2111-4287/+0
| * | | Add generated contract artifacts to gitignoreAmir Bandeali2018-02-211-0/+3
| * | | Check dependencies when determining if should be recompiledAmir Bandeali2018-02-216-80/+163
|/ / /
* | | Merge pull request #401 from 0xProject/feature/web3-abi-v2-typesLeonid2018-02-213-8/+11
|\ \ \
| * \ \ Merge branch 'development' into feature/web3-abi-v2-typesLeonid2018-02-2188-1561/+832
| |\ \ \ | |/ / / |/| | |
* | | | Publish@0xproject/connect@0.6.1Brandon Millman2018-02-171-1/+1
* | | | Updated CHANGELOGsBrandon Millman2018-02-171-1/+1
* | | | Merge pull request #407 from 0xProject/fix/connect/empty-responseBrandon Millman2018-02-172-5/+8
|\ \ \ \
| * | | | Do not JSON parse empty reponseBrandon Millman2018-02-172-5/+8
|/ / / /
* | | | Fix incorrect comment on WebSocketOrderbookChannel constructorBrandon Millman2018-02-171-1/+1
* | | | Fix broken postpublish script in connectBrandon Millman2018-02-171-1/+1
* | | | Updated top level @0xproject/utils dependencyBrandon Millman2018-02-171-1/+1
* | | | Publishcontracts@2.1.13@0xproject/website@0.0.16@0xproject/testnet-faucets@1.0.14@0xproject/dev-utils@0.1.0@0xproject/connect@0.6.0Brandon Millman2018-02-1715-71/+71
* | | | Updated CHANGELOGsBrandon Millman2018-02-175-10/+10
* | | | Merge pull request #406 from 0xProject/feature/connect/heartbeatBrandon Millman2018-02-177-2/+56
|\ \ \ \ | |_|/ / |/| | |
| * | | Add an enforced minimum for the heartbeat intervalBrandon Millman2018-02-162-2/+15
| * | | Add configurable heartbeat to WebSocketOrderbookChannelBrandon Millman2018-02-167-2/+43
* | | | Add Rinkeby network to smart contract docsFabio Berger2018-02-163-0/+8
* | | | Updated CHANGELOGFabio Berger2018-02-161-2/+2
* | | | Merge pull request #405 from 0xProject/refactor/docs-redesignFabio Berger2018-02-1618-167/+362
|\ \ \ \ | |/ / / |/| | |
| * | | remove hard-coded colorFabio Berger2018-02-162-4/+2
| * | | Remove section links until they go somewhereFabio Berger2018-02-161-10/+3
| * | | Add more padding on top of section titleFabio Berger2018-02-161-2/+2
| * | | Add hack comment explaining param count short-cutFabio Berger2018-02-161-0/+3
| * | | replace repeated conditionals with variableFabio Berger2018-02-161-18/+17
| * | | Remove unneeded propsFabio Berger2018-02-162-2/+0
| * | | use const over hard-codingFabio Berger2018-02-161-1/+1
| * | | uncomment dev logicFabio Berger2018-02-162-5/+3
| * | | Re-design docs pagesFabio Berger2018-02-167-39/+91
| * | | Add icons for all doc pagesFabio Berger2018-02-165-0/+0
| * | | Re-designed Wiki and half-redesigned docs pagesFabio Berger2018-02-1614-123/+277
|/ / /
* | | Merge branch 'development' of github.com:0xProject/0x.js into developmentFabio Berger2018-02-1659-1348/+403
|\ \ \
| * \ \ Merge pull request #400 from 0xProject/feature/deployer/selectContractsAmir Bandeali2018-02-1628-1263/+53
| |\ \ \
| | * | | Rename variablesAmir Bandeali2018-02-165-15/+15
| | * | | Update CHANGELOGAmir Bandeali2018-02-162-1/+5
| | * | | Add npm config for contracts listAmir Bandeali2018-02-161-1/+4
| | * | | Run prettierAmir Bandeali2018-02-1613-24/+558
| | * | | Fix checks, add contract list to compile script in package.jsonAmir Bandeali2018-02-1626-1815/+38
| | * | | Add contracts to compiler optionsAmir Bandeali2018-02-163-2/+28
| |/ / /
| * | | Add missing public types from connect docsBrandon Millman2018-02-152-2/+3
| * | | Merge pull request #392 from 0xProject/feature/subproviders_moveLeonid2018-02-1510-5/+94
| |\ \ \
| | * | | Change imports orderLeonid Logvinov2018-02-151-1/+2
| | * | | Fix a typoLeonid Logvinov2018-02-151-3/+3
| | * | | Add an assertionLeonid Logvinov2018-02-151-2/+4
| | * | | Add PR numbersLeonid Logvinov2018-02-152-2/+2
| | * | | Fix entry pointsLeonid Logvinov2018-02-151-2/+2
| | * | | Add tests for dev-utils packageLeonid Logvinov2018-02-154-1/+77
| | * | | Move subproviders from dev-utils to subprovidersLeonid Logvinov2018-02-158-3/+13
| | | |/ | | |/|
| * | | Merge pull request #398 from 0xProject/feature/website/stage-documentationBrandon Millman2018-02-156-4/+80
| |\ \ \
| | * | | Add docs staging to 0x.js packageBrandon Millman2018-02-153-4/+31
| | * | | Add support for intersection types in docsBrandon Millman2018-02-153-2/+25
| | * | | Add stagedocs script to connect packageBrandon Millman2018-02-151-0/+26
| * | | | Change default page params in connect to page 1 and perPage 100Brandon Millman2018-02-152-7/+7
| * | | | Merge pull request #386 from 0xProject/fix/windows_installLeonid2018-02-152-2/+4
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge branch 'development' into fix/windows_installLeonid2018-02-1274-518/+288
| | |\ \ \
| | * | | | Use system-independent rm commandLeonid Logvinov2018-02-092-2/+4
* | | | | | Prettier fixesFabio Berger2018-02-161-30/+80
| |_|/ / / |/| | | |
| | | | * Add types for ABIv2Leonid Logvinov2018-02-153-9/+9
| | |_|/ | |/| |
| * | | Add missing CHANGELOG entryLeonid Logvinov2018-02-151-0/+4
| * | | Merge pull request #397 from gagarin55/typings-fixLeonid2018-02-151-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | web3 typings fix - web3.net.peerCount returns numbergagarin552018-02-141-1/+1
| |/ /
| * | Merge pull request #394 from 0xProject/feature/connect/add-paginationBrandon Millman2018-02-1413-75/+168
|/| |
| * | Fix error in paged request schemaBrandon Millman2018-02-141-1/+1
| * | Addressed PR feedbackBrandon Millman2018-02-143-15/+31
| * | Add page options to relevant HttpClient methodsBrandon Millman2018-02-1413-70/+147
|/ /
* | Publishcontracts@2.1.12@0xproject/website@0.0.15@0xproject/testnet-faucets@1.0.13@0xproject/monorepo-scripts@0.1.11@0xproject/deployer@0.0.9@0xproject/connect@0.5.8Fabio Berger2018-02-1016-70/+70
* | Move tslint and tslint-eslint-rules to dev deps since this package needs them...Fabio Berger2018-02-102-2/+6
* | Update utils in top-level package.jsonFabio Berger2018-02-101-1/+1
* | Publishcontracts@2.1.11@0xproject/website@0.0.14@0xproject/testnet-faucets@1.0.12@0xproject/monorepo-scripts@0.1.10@0xproject/deployer@0.0.8@0xproject/connect@0.5.7Fabio Berger2018-02-1019-95/+95
* | Fix version in CHANGELOGFabio Berger2018-02-101-1/+1
* | Update changelog versionFabio Berger2018-02-101-1/+1
* | Fix changelog versionFabio Berger2018-02-101-1/+1
* | Merge pull request #389 from 0xProject/fix/npmInclusionIssuesFabio Berger2018-02-1038-220/+154
|\ \
| * | Fix changelogsFabio Berger2018-02-103-3/+3
| * | Add `yarn-error.log` to all .npmignoreFabio Berger2018-02-1014-0/+14
| * | Add PR number to CHANGELOGsFabio Berger2018-02-1012-12/+12
| * | ignore all files starting with dots in all sub-packagesFabio Berger2018-02-1015-1/+15
| * | Remove top level .npmignoreFabio Berger2018-02-101-6/+0
| * | Add npmignore to web3-wrapper and update CHANGELOGFabio Berger2018-02-102-1/+6
| * | Add npmignore and remove .gitignoreFabio Berger2018-02-103-199/+1
| * | Add npmignore to utils and update CHANGELOGFabio Berger2018-02-102-0/+7
| * | Add npmignore to types and update CHANGELOGFabio Berger2018-02-102-0/+7
| * | cleanup npmignorexFabio Berger2018-02-101-2/+2
| * | Add npmignore to subproviders and update CHANGELOGFabio Berger2018-02-102-0/+8
| * | Add npmignore to json-schemas and update CHANGELOGFabio Berger2018-02-102-0/+9
| * | Add npmignore to dev-utils and update CHANGELOGFabio Berger2018-02-102-0/+7
| * | Add npmignore to deployer along with a changelogFabio Berger2018-02-102-0/+9
| * | Add tslint.json to deployer package and fix all tslint issuesFabio Berger2018-02-107-2/+17
| * | Add npmignore to subpackage and update CHANGELOGFabio Berger2018-02-102-0/+9
| * | Add npmignore to typings packagesFabio Berger2018-02-102-0/+2
| * | Add npmignore to subpackage and update CHANGELOGFabio Berger2018-02-102-1/+9
| * | Add npmignore to abi-gen and update CHANGELOGFabio Berger2018-02-102-5/+12
| * | Add correct npmignore to 0x.js and update CHANGELOGFabio Berger2018-02-102-0/+14
| * | Fix issue where custom TSLint rules were not being published to NPMFabio Berger2018-02-103-6/+9
* | | Merge pull request #388 from 0xProject/fix/testnet-faucet/base-unit-ordersBrandon Millman2018-02-101-8/+8
|\ \ \
| * | | address is not optional in this contextJacob Evans2018-02-101-2/+2
| * | | Convert to baseUnits in signed orderJacob Evans2018-02-101-8/+8
|/ / /
* | | Merge pull request #387 from 0xProject/fix/testnet-faucet/ecsignatureBrandon Millman2018-02-101-1/+1
|\ \ \
| * | | signature -> ecSignatureJacob Evans2018-02-101-1/+1
|/ / /
* | | Merge pull request #382 from 0xProject/feature/clean-post-publish-scriptsBrandon Millman2018-02-1017-194/+26
|\ \ \ | |_|/ |/| |
| * | Fix missing references to 'this'Brandon Millman2018-02-091-4/+4
| * | Simplify standard postpublish script and remove them from some private packagesBrandon Millman2018-02-0917-194/+26
* | | Merge pull request #379 from 0xProject/portal_jsonLeonid2018-02-0919-291/+189
|\ \ \ | |_|/ |/| |
| * | Implement blockchain.portalOrderToZeroExOrderLeonid Logvinov2018-02-092-30/+22
| * | Make naming of schemas consistentLeonid Logvinov2018-02-096-12/+12
| * | Address feedbackLeonid Logvinov2018-02-0815-157/+57
| * | Remove hash from signatureDataLeonid Logvinov2018-02-0811-53/+37
| * | Remove networkId from orderJSONLeonid Logvinov2018-02-087-20/+3
| * | Split Order into signedOrder and metadataLeonid Logvinov2018-02-087-129/+164
| * | Reuse ECSignatureLeonid Logvinov2018-02-071-4/+2
| * | Remove unused types and take their namesLeonid Logvinov2018-02-077-51/+18
| * | Introduce makerToken and takerToken fields for unsigned token metadataLeonid Logvinov2018-02-077-72/+68
| * | Move .taker.amount to .takerTokenAmount and .maker.amount to .makerTokenAmountLeonid Logvinov2018-02-075-17/+21
| * | Move .taker.feeAmount to .takerFee and .maker.feeAmount to .makerFeeLeonid Logvinov2018-02-075-12/+23
| * | Rename signature to ecSignatureLeonid Logvinov2018-02-074-10/+10
| * | Rename exchangeContract to exchangeContractAddressLeonid Logvinov2018-02-074-9/+9
| * | Rename expiration to expirationUnixTimestampSecLeonid Logvinov2018-02-078-23/+51
* | | Merge pull request #383 from 0xProject/fix/website/addMoreRelayersLandingFabio Berger2018-02-0917-71/+124
|\ \ \
| * | | Fix linksFabio Berger2018-02-092-6/+12
| * | | Center header above relayersFabio Berger2018-02-091-8/+8
| * | | Add blog to topBar and as a consequence support external links in topBar menu...Fabio Berger2018-02-092-3/+25
| * | | Add title above "benefits" sectionFabio Berger2018-02-091-1/+11
| * | | Add Relayer section to landingFabio Berger2018-02-0915-66/+81
| | |/ | |/|
* / | Add new entries to the PR template checklistBrandon Millman2018-02-091-0/+4
|/ /
* | Merge pull request #377 from 0xProject/feature/signed_unsigned_order_contractsLeonid2018-02-099-590/+525
|\ \
| * | Fix namingsLeonid Logvinov2018-02-091-84/+90
| * | Use Order and SignedOrder type from 0x.jsLeonid Logvinov2018-02-0710-496/+375
| * | Introduce SignedOrder class and remove type assertionsLeonid Logvinov2018-02-079-324/+365
| * | Make orderHashHex a getter instead of a propertyLeonid Logvinov2018-02-075-32/+41
| |/
* | Fix flash message when receiving test etherFabio Berger2018-02-081-1/+2
* | Fix incorrect network idsBrandon Millman2018-02-081-2/+2
* | Update @0xproject/utils version in top level package.jsonBrandon Millman2018-02-081-1/+1
* | Publishcontracts@2.1.10@0xproject/website@0.0.13@0xproject/testnet-faucets@1.0.11@0xproject/deployer@0.0.7Brandon Millman2018-02-0814-52/+52
* | Update CHANGELOGsBrandon Millman2018-02-085-5/+15
* | Fix wiki stylingFabio Berger2018-02-081-14/+27
* | Merge pull request #374 from 0xProject/feature/website/addOtherTestnetFaucetsFabio Berger2018-02-084-17/+57
|\ \
| * | Only show faucet error if not on a testnetFabio Berger2018-02-071-4/+3
| * | Move isTestNetwork into utils and also check it from showing ZRX request buttonFabio Berger2018-02-072-9/+13
| * | Remove stray logFabio Berger2018-02-071-1/+0
| * | Use isTestNetwork instead of isKovanTestNetwork on balances page except for D...Fabio Berger2018-02-071-7/+15
| * | Properly detect Rinkeby and Ropsten TokenRegistry tokens as mintableFabio Berger2018-02-072-3/+31
| * | Add networkId to faucet requests so that we can request tokens on Kovan, Rink...Fabio Berger2018-02-072-2/+4
* | | Merge pull request #375 from 0xProject/feature/testnet-faucets/queue-by-networkBrandon Millman2018-02-087-169/+150
|\ \ \
| * | | PrettierBrandon Millman2018-02-081-1/+5
| * | | Addressed review commentsBrandon Millman2018-02-084-44/+31
| * | | Merge branch 'development' into feature/testnet-faucets/queue-by-networkBrandon Millman2018-02-0884-392/+588
| |\ \ \
| * | | | Organize async task queues by networkBrandon Millman2018-02-077-171/+172
* | | | | Update Subprovider READMEJacob Evans2018-02-081-2/+2
| |/ / / |/| | |
* | | | Fix Remco's github name in CODEOWNERSLeonid2018-02-071-1/+1
| |_|/ |/| |
* | | Merge pull request #368 from 0xProject/feature/abigen/addNetworkIdLeonid2018-02-0780-389/+568
|\ \ \ | |_|/ |/| |
| * | Fix ABI error messageLeonid Logvinov2018-02-072-2/+3
| * | Stop using definite assignment assertion cause prettier doesn't handle thatLeonid Logvinov2018-02-071-1/+2
| * | Special-case ZRXToken snake case conversionLeonid Logvinov2018-02-073-3/+6
| * | Fix linter errorsLeonid Logvinov2018-02-072-2/+3
| * | Generate contract wrappers on pre-buildLeonid Logvinov2018-02-071-1/+1
| * | Add missing asyncLeonid Logvinov2018-02-071-1/+1
| * | Remove noImplicitThisLeonid Logvinov2018-02-071-0/+1
| * | Tslint disable no-consecutive-blank-lines in generated filesLeonid Logvinov2018-02-071-1/+1
| * | Change compiled sources in contractsLeonid Logvinov2018-02-071-2/+2
| * | Change utilsLeonid Logvinov2018-02-074-32/+41
| * | Change testsLeonid Logvinov2018-02-0710-207/+275
| * | Add base_contract.tsLeonid Logvinov2018-02-071-0/+35
| * | Remove generated filesLeonid Logvinov2018-02-075-2208/+0
| * | .gitignore gemerated filesLeonid Logvinov2018-02-071-0/+8
| * | Change the list of generated wrappersLeonid Logvinov2018-02-071-1/+1
| * | Change contract templatesLeonid Logvinov2018-02-074-43/+28
| * | Add indices for index parameters so that their names don't collideLeonid Logvinov2018-02-071-2/+2
| * | Use abi-gen for events in 0x.jsLeonid Logvinov2018-02-079-125/+76
| * | Fix artifacts pathAmir Bandeali2018-02-074-13/+13
| * | Update compile command and run prettierAmir Bandeali2018-02-072-5/+4
| * | Add CLI option for networkId, add abi-gen to contracts packageAmir Bandeali2018-02-0756-3/+2328
|/ /
* | Merge branch 'development' of github.com:0xProject/0x.js into developmentFabio Berger2018-02-0714-85/+196
|\|
| * Merge pull request #352 from 0xProject/feature/testnet-faucets/order-dispenserBrandon Millman2018-02-0714-94/+196
| |\
| | * Bump subproviders versionBrandon Millman2018-02-071-1/+1
| | * Update yarn.lockBrandon Millman2018-02-071-9/+0
| | * Merge branch 'development' into feature/testnet-faucets/order-dispenserBrandon Millman2018-02-0728-33/+360
| | |\
| | * | Change rpcUrls keys back into string literalsBrandon Millman2018-02-071-4/+4
| | * | Add types-bn package to 0x.js and testnet-faucetsBrandon Millman2018-02-072-0/+2
| | * | PrettierBrandon Millman2018-02-072-2/+3
| | * | Merge branch 'development' into feature/testnet-faucets/order-dispenserBrandon Millman2018-02-0728-163/+92
| | |\ \
| | * | | Addressed comments and update 0xProject/types-ethereumjs-util depsBrandon Millman2018-02-0613-115/+85