aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | 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
| | * | | Merge branch 'development' into feature/testnet-faucets/order-dispenserBrandon Millman2018-02-06117-6934/+6112
| | |\ \ \
| | * | | | PrettierBrandon Millman2018-02-011-1/+1
| | * | | | Update testnet-faucets READMEBrandon Millman2018-02-011-3/+11
| | * | | | Merge branch 'development' into feature/testnet-faucets/order-dispenserBrandon Millman2018-02-0177-720/+1306
| | |\ \ \ \
| | * | | | | Fix lint errorsBrandon Millman2018-01-311-0/+2
| | * | | | | Add order signing and dispensing ability to faucetBrandon Millman2018-01-319-39/+167
* | | | | | | Add networkId to event labelFabio Berger2018-02-074-7/+19
* | | | | | | Update yarn.lockFabio Berger2018-02-071-9/+16
|/ / / / / /
* | | | | | Merge pull request #370 from 0xProject/feature/ga-portal-loggingTom Schmidt2018-02-077-64/+113
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Added logging for order filling and order cancellingThomas Schmidt2018-02-072-1/+26
| * | | | | Moved to async awaitThomas Schmidt2018-02-061-18/+13
| * | | | | Formatting and removed old GA codeThomas Schmidt2018-02-062-80/+77
| * | | | | Converted BigNumber to number for GA loggingThomas Schmidt2018-02-062-3/+3
| * | | | | GA logging for order creationThomas Schmidt2018-02-062-4/+21
| * | | | | Switch GA to React GA and add logging for PortalThomas Schmidt2018-02-065-7/+22
* | | | | | Merge pull request #355 from 0xProject/feature/subproviders/nonce-trackerJacob Evans2018-02-0728-33/+360
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Attribute the origins of NonceTrackerJacob Evans2018-02-072-0/+7
| * | | | | Move BlockParamLiteral to shared types packageJacob Evans2018-02-0712-21/+28
| * | | | | FixesJacob Evans2018-02-072-7/+8
| * | | | | Move BlockParam and BlockParamLiteral to shared typesJacob Evans2018-02-077-21/+19
| * | | | | Merge branch 'development' into feature/subproviders/nonce-trackerJacob Evans2018-02-064-7/+11
| |\ \ \ \ \
| * | | | | | Rename called to something more readableJacob Evans2018-02-061-5/+6
| * | | | | | Newline prettier/lintJacob Evans2018-02-061-1/+1
| * | | | | | Yarn.lockJacob Evans2018-02-061-0/+9
| * | | | | | Merge branch 'development' into feature/subproviders/nonce-trackerJacob Evans2018-02-06109-6906/+5980
| |\ \ \ \ \ \
| * | | | | | | Refactor tests for reuse of the fixture subproviderJacob Evans2018-02-063-107/+61
| * | | | | | | Remove re-fetch of transaction count on errorJacob Evans2018-02-065-33/+41
| * | | | | | | Disable linter for multiple class declarationsJacob Evans2018-02-031-0/+2
| * | | | | | | Remove double declarationJacob Evans2018-02-021-5/+5
| * | | | | | | Enable CIRCLECI and declare web3Jacob Evans2018-02-023-0/+14
| * | | | | | | Test faucets to use new NonceTrackerJacob Evans2018-02-022-2/+3
| * | | | | | | Update changelogJacob Evans2018-02-021-1/+5
| * | | | | | | Readability and prettierJacob Evans2018-02-022-13/+11
| * | | | | | | PrettifyJacob Evans2018-02-023-68/+65
| * | | | | | | Nonce tracker subproviderJacob Evans2018-02-024-0/+329
* | | | | | | | Update utils in top level package to 0.3.0Jacob Evans2018-02-062-10/+1
* | | | | | | | Add 0.2.0 back to yarn lockJacob Evans2018-02-061-0/+9
| |_|/ / / / / |/| | | | | |
* | | | | | | Reword comment on anyJacob Evans2018-02-061-1/+2
* | | | | | | Merge pull request #363 from 0xProject/refactor/subproviders/injected-provide...Jacob Evans2018-02-064-7/+13
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Link to the wiki article in the READMEJacob Evans2018-02-061-0/+2
| * | | | | | Justify the any usageJacob Evans2018-02-061-1/+2
| * | | | | | ChangelogJacob Evans2018-02-031-1/+5
| * | | | | | Change the InjectedWeb3Subprovider to accept Web3.ProviderJacob Evans2018-02-032-6/+5
* | | | | | | Publishcontracts@2.1.9@0xproject/website@0.0.12@0xproject/testnet-faucets@1.0.10@0xproject/monorepo-scripts@0.1.9@0xproject/deployer@0.0.6Leonid Logvinov2018-02-0617-77/+77
* | | | | | | Revert "Temp"Leonid Logvinov2018-02-066-78/+0
| |_|_|_|_|/ |/| | | | |
* | | | | | Add dates to CHANGELOGsLeonid Logvinov2018-02-062-2/+2
* | | | | | Merge branch 'development' of github.com:0xProject/0x.js into developmentLeonid Logvinov2018-02-068-17/+73
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #366 from 0xProject/fix/abi_decoder_colisionLeonid2018-02-063-10/+24
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Change CHANGELOGsLeonid Logvinov2018-02-062-2/+2
| | * | | | | Merge branch 'development' into fix/abi_decoder_colisionLeonid2018-02-065-8/+35
| | |\ \ \ \ \
| | * | | | | | Use forEach instead of mapLeonid Logvinov2018-02-052-4/+8
| | * | | | | | Add PR numberLeonid Logvinov2018-02-051-1/+1
| | * | | | | | Fix an exception when a signature collision happensLeonid Logvinov2018-02-052-5/+18
| * | | | | | | Merge pull request #360 from 0xProject/feature/editorconfigRemco Bloemen2018-02-061-0/+12
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Add .editorconfigRemco Bloemen2018-02-061-0/+12
| | |/ / / / /
| * | | | | | Merge pull request #350 from 0xProject/fix/ether_token_addressLeonid2018-02-065-8/+38
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix a typoLeonid Logvinov2018-02-061-1/+1
| | * | | | | Fix prettierLeonid Logvinov2018-02-051-1/+0
| | * | | | | Merge branch 'development' into fix/ether_token_addressLeonid2018-02-05244-8866/+8273
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add regression testsLeonid Logvinov2018-02-051-0/+12
| | * | | | | Improve the comment and fix an exceptionLeonid Logvinov2018-02-051-3/+7
| | * | | | | Fix PR templateLeonid Logvinov2018-01-301-4/+6
| | * | | | | Update CHANGELOGLeonid Logvinov2018-01-301-0/+4
| | * | | | | Fix linter errorsLeonid Logvinov2018-01-302-1/+1
| | * | | | | Add zeroEx.etherToken.getContractAddressifExistsLeonid Logvinov2018-01-303-2/+11
* | | | | | | TempLeonid Logvinov2018-02-066-0/+78
|/ / / / / /
* | | | | | Merge pull request #358 from 0xProject/feature/build_watchLeonid2018-02-0530-24/+100
|\ \ \ \ \ \
| * | | | | | Add missing comasLeonid Logvinov2018-02-052-2/+2
| * | | | | | Merge branch 'development' into feature/build_watchLeonid2018-02-0593-6894/+5862
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #356 from 0xProject/lerna-ignoreLeonid2018-02-051-0/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Lerna-ignore tslint and tsconfigLeonid Logvinov2018-02-051-1/+1
| * | | | | | Lerna ignore scripts and libLeonid Logvinov2018-02-011-1/+1
| * | | | | | Ignore test files and markdown files changes on publishLeonid Logvinov2018-02-011-0/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #329 from 0xProject/feature/contracts/versioningAmir Bandeali2018-02-0369-6788/+5701
|\ \ \ \ \ \
| * | | | | | Update contract versions, fix testsAmir Bandeali2018-02-0327-88/+90
| * | | | | | Rename directoriesAmir Bandeali2018-02-0364-6432/+5551
| * | | | | | Rename previous contracts, fix imports, add nested file structureAmir Bandeali2018-02-0326-34/+35
| * | | | | | Move all contracts into a single directoryFabio Berger2018-02-0324-7/+8
| * | | | | | Update importFabio Berger2018-02-031-1/+1
| * | | | | | Fix importFabio Berger2018-02-031-1/+1
| * | | | | | Get rid of suffixed contract versioning and replace it with a poor-mans packa...Fabio Berger2018-02-0326-346/+136
|/ / / / / /
* | | | | | Merge pull request #361 from 0xProject/feature/deployer/solc-0.4.19Leonid2018-02-022-0/+23
|\ \ \ \ \ \
| * | | | | | Add solc 0.4.19Remco Bloemen2018-02-022-0/+23
| | |_|_|/ / | |/| | | |
* / | | | | Add CODEOWNERS file for automatically adding reviewers to PRsBrandon Millman2018-02-021-0/+1
|/ / / / /
* | | | | Publishcontracts@2.1.8@0xproject/website@0.0.11@0xproject/testnet-faucets@1.0.9@0xproject/monorepo-scripts@0.1.8@0xproject/deployer@0.0.5Leonid Logvinov2018-02-0118-107/+124
* | | | | Fix linter errorsLeonid Logvinov2018-02-011-2/+2
* | | | | Update changelogLeonid Logvinov2018-02-011-0/+4
* | | | | Merge pull request #357 from ERCdEX/luke/zrx_order_watch_cacheLeonid2018-02-011-1/+5
|\ \ \ \ \
| * | | | | don't remove maker/zrx order from cache twiceLuke Autry2018-02-011-1/+5
| |/ / / /
* / / / / Add OrderWatcherConfig to the list of public typesLeonid Logvinov2018-02-011-0/+1
|/ / / /
| * | | Merge pull request #359 from 0xProject/feature/ts-2.7Leonid2018-02-0519-24/+24
| |\ \ \
| | * | | Fix errors after TS upgradeLeonid Logvinov2018-02-011-4/+4
| | * | | Upgrade TS to the newest versionLeonid Logvinov2018-02-0118-20/+20
| * | | | Add build:watch to README'sLeonid Logvinov2018-02-0211-0/+61
| |/ / /
| * / / Add build:watch command to all TS packagesLeonid Logvinov2018-02-0115-0/+15
|/ / /
* | | Merge pull request #354 from 0xProject/feature/tslint-config/underscore-prote...Brandon Millman2018-02-0121-58/+65
|\ \ \
| * | | PrettierBrandon Millman2018-02-012-2/+5
| * | | Merge branch 'development' into feature/tslint-config/underscore-protected-me...Brandon Millman2018-02-019-18/+39
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #346 from joincivil/feature/abi-gen-partialsLeonid2018-01-319-18/+39
|\ \ \ \
| * | | | Updated contract generation in 0x to new abi-gen CLIOlaf Tomalka2018-01-317-1/+1
| * | | | Removed deprecated CLI optionsOlaf Tomalka2018-01-311-19/+2
| * | | | Added PR # to the changelog of abi-genOlaf Tomalka2018-01-271-1/+3
| * | | | Added CLI options for explicit specifying location of partials and main templateOlaf Tomalka2018-01-272-14/+50
| | * | | Add PR number to changelogBrandon Millman2018-01-311-1/+1
| | * | | Fix lint errorsBrandon Millman2018-01-3117-55/+54
| | * | | Add protected keyword to underscore lint ruleBrandon Millman2018-01-313-3/+8
| |/ / / |/| | |
* | | | Remove unused propFabio Berger2018-01-311-1/+0
* | | | Merge pull request #351 from 0xProject/feature/portal-ledger-supportFabio Berger2018-01-3153-645/+1204
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix prettierFabio Berger2018-01-311-9/+1
| * | | Uppercase Networks enum valuesFabio Berger2018-01-317-22/+22
| * | | Make default gasPrice more readableFabio Berger2018-01-311-1/+3
| * | | Fix prettier messFabio Berger2018-01-311-6/+3
| * | | Fix linter errorsFabio Berger2018-01-3121-72/+20
| * | | Shrink imgFabio Berger2018-01-311-0/+0
| * | | Merge branch 'development' into feature/portal-ledger-supportFabio Berger2018-01-312-0/+2
| |\ \ \
| * | | | Fix all setState calls after unmounted errors. Decided to create our own flag...Fabio Berger2018-01-317-43/+90
| * | | | Fix bug where we were return undefined instead of the empty objectFabio Berger2018-01-311-1/+1
| * | | | Default the derivation path to that found in the Ledger subproviderFabio Berger2018-01-311-1/+4
| * | | | Add browser data to dialog infoFabio Berger2018-01-311-1/+1