aboutsummaryrefslogtreecommitdiffstats
path: root/packages
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Add createOrder with no signing to orderFactoryBrandon Millman2018-08-023-6/+45
| * | | Create marketBuyOrdersOptimizationsBrandon Millman2018-08-023-8/+63
| * | | Update contract-wrappers CHANGELOG.jsonBrandon Millman2018-08-021-0/+9
| * | | Merge pull request #934 from 0xProject/feature/contract-wrappers/forwaderBrandon Millman2018-08-0211-10/+448
| |\ \ \ | | |/ / | |/| |
| | * | Clarify ethAmount is in weiBrandon Millman2018-07-311-2/+2
| | * | Update forwarder_wrapper_testBrandon Millman2018-07-311-0/+16
| | * | Add more assertionsBrandon Millman2018-07-313-6/+102
| | * | Write initial test for forwarder_wrapperBrandon Millman2018-07-312-16/+73
| | * | Fix spelling error in exchange wrapper testsBrandon Millman2018-07-311-1/+1
| | * | Add getOrdersInfo to exchange_wrapperBrandon Millman2018-07-313-3/+32
| | * | Implement initial forwarder wrapperBrandon Millman2018-07-318-2/+242
| * | | Add the CHANGELOG entry for #909Leonid Logvinov2018-07-311-0/+9
| * | | Merge branch 'development' into ritave/resolver-check-dirsLeonid Logvinov2018-07-31201-6198/+59132
| |\| |
| | * | Add back tags in htmlBrandon Millman2018-07-311-1/+7
| | * | Fix jobs page overflow issueBrandon Millman2018-07-303-4/+6
| | * | Create MetaTags componentBrandon Millman2018-07-306-75/+117
| | * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-07-28188-5949/+58670
| | |\ \
| | | * | Add combinatorial tests for internal Exchange functions (#807)Alex Browne2018-07-2723-1269/+780
| | | |/
| | * | Remove unused variablefragosti2018-07-281-1/+0
| | * | Add loading state for initial load and other PR feedbackfragosti2018-07-282-10/+14
| | * | Make a non-jank Spinner component and use itfragosti2018-07-253-2/+83
| | * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-07-25128-2299/+2793
| | |\ \
| | * | | Center allowance toggles in account pagefragosti2018-07-251-7/+9
| | * | | Increase allowance toggle loading spinner size by 1fragosti2018-07-251-1/+1
| | * | | Add unlocking and locking token copyfragosti2018-07-251-2/+2
| | * | | Hide tooltip after allowance toggle clickfragosti2018-07-251-1/+3
| | * | | Make tooltip appear to the left of the toggle when onboarding in progressfragosti2018-07-256-3/+20
| | * | | Fix tooltip wrapping issue in onboardinfragosti2018-07-252-8/+16
| | * | | Fix wrap button alignment issuefragosti2018-07-257-224/+40
| | * | | WIP for allowance toggle redesign workingfragosti2018-07-214-16/+118
| | * | | Show token name dynamically in tooltipfragosti2018-07-214-13/+19
| | * | | Implement tooltipsfragosti2018-07-212-8/+56
| | * | | Add loading statefragosti2018-07-213-3/+4
| | * | | Have basic lock and check working in waleltfragosti2018-07-204-13/+93
| * | | | Added fix to CHANGELOGOlaf Tomalka2018-07-271-0/+4
| * | | | Fixed the relative resolver not checking if the file can be read in theOlaf Tomalka2018-07-251-1/+1
| | |/ / | |/| |
* | | | Add discharge config and deployfragosti2018-08-083-3/+36
* | | | Add static site buildfragosti2018-08-083-4/+3
* | | | Add markdown sectionfragosti2018-08-083-3/+188
* | | | Refactor using some utility methodsfragosti2018-08-036-109/+135
* | | | Add errors and headersfragosti2018-08-032-0/+50
* | | | Limit error codes with rangesfragosti2018-08-031-2/+2
* | | | Create asset_pairs SRA endpoint (and establish conventions)fragosti2018-08-034-172/+81
* | | | Enforce stronger naming convention for json schema idsfragosti2018-08-0325-107/+107
* | | | All schema tests paddingfragosti2018-08-021-6/+17
* | | | update orders channel subscribe schemafragosti2018-08-022-76/+14
* | | | Update order book schema testfragosti2018-08-021-18/+43
* | | | Add relayerApiOrdersResponseTestfragosti2018-08-021-0/+33
* | | | Add tests for asset pair endpointfragosti2018-08-022-85/+111
* | | | Group all standard relayer api tests togetherfragosti2018-08-011-405/+406
* | | | Add test for relayerApiOrderSchemafragosti2018-08-014-3/+20
* | | | Add paginated collection test casefragosti2018-08-013-5/+33
* | | | Get schema tests running (not crashiing)fragosti2018-08-015-160/+121
* | | | Update schemas exportfragosti2018-07-311-23/+17
* | | | Update json-schemas for SRA v1fragosti2018-07-3117-115/+157
* | | | Add scriptsfragosti2018-07-282-6/+4
* | | | Add to READMEfragosti2018-07-271-1/+23
* | | | Create API development environment and json distributionfragosti2018-07-272-7/+14
* | | | Rename to sra-apifragosti2018-07-279-7/+8
* | | | Add typescript typings for Open API specfragosti2018-07-272-1/+4
* | | | Reset CHANGELOGfragosti2018-07-272-187/+3
* | | | Add basic smoke testfragosti2018-07-277-7/+181
* | | | Initial commitfragosti2018-07-278-0/+315
| |_|/ |/| |
* | | Publishcontracts@2.1.39@0xproject/website@0.0.43@0xproject/testnet-faucets@1.0.40@0xproject/react-docs-example@0.0.19@0xproject/metacoin@0.0.14@0xproject/abi-gen@1.0.4Fabio Berger2018-07-2627-151/+151
* | | Updated CHANGELOGSFabio Berger2018-07-2636-10/+184
* | | Point to actual current versionFabio Berger2018-07-2611-22/+22
* | | Add changelog entries for other RCs that did publishFabio Berger2018-07-262-0/+16
* | | Fix changelogs and package versions for ones that weren't publishedFabio Berger2018-07-2616-21/+13
* | | Publishcontracts@2.1.38@0xproject/website@0.0.42@0xproject/testnet-faucets@1.0.39@0xproject/sol-compiler@1.0.3@0xproject/react-docs-example@0.0.18@0xproject/monorepo-scripts@1.0.4@0xproject/metacoin@0.0.13@0xproject/abi-gen@1.0.3Fabio Berger2018-07-2631-252/+252
* | | Updated CHANGELOGSFabio Berger2018-07-2652-7/+289
* | | Still test unrunnable packages for compilation issuesFabio Berger2018-07-261-8/+8
* | | Add changelog entries for next RC publishFabio Berger2018-07-267-0/+56
* | | Split running packages that cannot be run in a node.js scriptFabio Berger2018-07-261-1/+9
* | | Fix accidental import from test folderFabio Berger2018-07-261-1/+1
* | | Re-enable deleted the dir after test runsFabio Berger2018-07-261-1/+1
* | | Change test:installation so it also causes run-time errors to appearFabio Berger2018-07-261-3/+10
* | | Fix lint issueFabio Berger2018-07-261-2/+1
* | | Always append monorepo root path so script can be called from anywhereFabio Berger2018-07-261-3/+5
* | | Delete any remenants of test-env dir before creating a new oneFabio Berger2018-07-261-0/+1
* | | Print version that will be testedFabio Berger2018-07-261-1/+1
* | | Add ending slashFabio Berger2018-07-261-1/+1
* | | Add support for testing installations post-publish as wellFabio Berger2018-07-261-2/+4
* | | Fix asset pathFabio Berger2018-07-261-2/+2
* | | Publishcontracts@2.1.37@0xproject/website@0.0.41@0xproject/testnet-faucets@1.0.38@0xproject/react-docs-example@0.0.17@0xproject/monorepo-scripts@1.0.3@0xproject/metacoin@0.0.12@0xproject/abi-gen@1.0.2Fabio Berger2018-07-2631-261/+257
* | | Updated CHANGELOGSFabio Berger2018-07-2652-8/+299
* | | Fix linterFabio Berger2018-07-262-3/+0
* | | Revert to using execAsyncFabio Berger2018-07-261-10/+2
* | | Revert to publishing ethereum-typesFabio Berger2018-07-2618-18/+17
* | | Fix marshaller importFabio Berger2018-07-261-1/+1
* | | Temporarily have all packages depend on an older, published version of ethere...Fabio Berger2018-07-2617-17/+17
* | | Temporarily make ethereum-types private to exclude from publishingFabio Berger2018-07-261-0/+1
* | | Fix changelogsFabio Berger2018-07-266-3/+30
* | | Remove artifacts for gitFabio Berger2018-07-264-3256/+0
* | | Call 'lerna publish' with spawn so we see stderr and stdout in real-timeFabio Berger2018-07-261-2/+10
* | | Merge pull request #902 from 0xProject/feature/web3-wrapper/unexport-marshallerFrancesco Agosti2018-07-263-2/+6
|\ \ \
| * \ \ Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-07-26172-3250/+3947
| |\ \ \
| * | | | Add remove marshaller to changelog notesfragosti2018-07-201-0/+8
| * | | | Stop exporting marshaller from web3-wrapperfragosti2018-07-203-6/+2
* | | | | Remove careers page feature flagBrandon Millman2018-07-262-14/+2
* | | | | Merge pull request #893 from 0xProject/feature/website/jobs-page-part2Brandon Millman2018-07-2630-438/+420
|\ \ \ \ \
| * | | | | Header copy changeBrandon Millman2018-07-261-8/+7
| * | | | | Margin polishBrandon Millman2018-07-262-4/+4
| * | | | | Update open positions sectionBrandon Millman2018-07-253-10/+29
| * | | | | Update benefits sectionBrandon Millman2018-07-253-23/+48
| * | | | | Update mission sectionBrandon Millman2018-07-252-18/+47
| * | | | | Header copy updatesBrandon Millman2018-07-251-6/+16
| * | | | | Use isMobileWidth utilBrandon Millman2018-07-251-1/+1
| * | | | | Use our image component in missionBrandon Millman2018-07-252-2/+7
| * | | | | Always go to open positions when clicking CTABrandon Millman2018-07-241-0/+1
| * | | | | Fix hiding of dots on small screensBrandon Millman2018-07-241-2/+2
| * | | | | Merge branch 'v2-prototype' into feature/website/jobs-page-part2Brandon Millman2018-07-24115-2279/+2704
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'v2-prototype' into feature/website/jobs-page-part2Brandon Millman2018-07-21112-679/+1030
| |\ \ \ \ \ \
| * | | | | | | Update hr colorBrandon Millman2018-07-192-4/+1
| * | | | | | | Fix lint errorsBrandon Millman2018-07-193-26/+0
| * | | | | | | Add /careers route and fix hr stylingBrandon Millman2018-07-197-9/+19
| * | | | | | | Fix typosBrandon Millman2018-07-192-5/+5
| * | | | | | | Fix key errors and typoBrandon Millman2018-07-192-5/+4
| * | | | | | | Fix padding on open positions sectionBrandon Millman2018-07-191-1/+1
| * | | | | | | Add dots on heroBrandon Millman2018-07-191-1/+11
| * | | | | | | Padding fixesBrandon Millman2018-07-192-7/+4
| * | | | | | | Update open positions sectionBrandon Millman2018-07-193-85/+78
| * | | | | | | Benefits and values sectionsBrandon Millman2018-07-1922-284/+209
| * | | | | | | Remove sectionsBrandon Millman2018-07-191-7/+0
| * | | | | | | Update mission sectionBrandon Millman2018-07-191-37/+29
| * | | | | | | Updates to the Join 0x sectionBrandon Millman2018-07-191-8/+12
| * | | | | | | Fix development environment checkBrandon Millman2018-07-191-1/+1
* | | | | | | | Also skip prompt when publishing for realFabio Berger2018-07-261-2/+2
* | | | | | | | Prettier fixesFabio Berger2018-07-266-3199/+3263
* | | | | | | | Missing artifactFabio Berger2018-07-261-0/+723
* | | | | | | | Replace hard-coded compact_artifacts with migrations artifactsFabio Berger2018-07-2611-381/+3211
* | | | | | | | Update order-utils to use 2.0.0-beta-testnet artifactsFabio Berger2018-07-261-3/+5
* | | | | | | | Remove artifacts which should no longer be commitedFabio Berger2018-07-269-14598/+0
* | | | | | | | New WETH9 artifactsFabio Berger2018-07-262-36/+36
* | | | | | | | Modify WETH9 event arg names to be identical to ERC20 standard suggested namesFabio Berger2018-07-261-4/+4
* | | | | | | | Update artifacts in contract-wrappers, generate artifacts and improve READMEFabio Berger2018-07-2618-3817/+25006
* | | | | | | | Update the kovan addresses in artifactsFabio Berger2018-07-254-6/+6
* | | | | | | | Improve the README instructions for migrationsFabio Berger2018-07-251-2/+22
* | | | | | | | Use infuraFabio Berger2018-07-252-2/+2
* | | | | | | | Fix typoFabio Berger2018-07-251-1/+1
* | | | | | | | Update v2-beta-testnet migrationFabio Berger2018-07-2511-259/+45542
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Remove unused importFabio Berger2018-07-251-1/+0
* | | | | | | Update artifactFabio Berger2018-07-251-8/+8
* | | | | | | Fix dep collisionFabio Berger2018-07-251-1/+0
* | | | | | | merge v2-prototypeFabio Berger2018-07-254-13/+9
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Update orderEpoch commentsAmir Bandeali2018-07-252-2/+2
| * | | | | | Merge pull request #891 from 0xProject/bug/website/wiki-page-topbarFrancesco Agosti2018-07-251-1/+6
| |\ \ \ \ \ \
| | * | | | | | Add zIndex 1 to topbar and fix issue where no box-shadow present on /docsfragosti2018-07-192-2/+6
| | * | | | | | Make topbar zIndex 1fragosti2018-07-181-0/+1
| * | | | | | | Omit specific version of react typesFabio Berger2018-07-241-1/+1
| * | | | | | | Correct next versionFabio Berger2018-07-241-1/+1
| * | | | | | | Merge v2-prototypeFabio Berger2018-07-24105-2228/+2564
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Leave react-dom type version also unspecifiedFabio Berger2018-07-252-2/+2
* | | | | | | | Remove unused typweFabio Berger2018-07-251-12/+0
* | | | | | | | Remove force publishFabio Berger2018-07-251-1/+1
* | | | | | | | Revert "Temporarily add changelog & package.json version changes"Fabio Berger2018-07-2552-290/+8
* | | | | | | | Specify registry url only if local publish attemptedLeonid Logvinov2018-07-254-31/+40
* | | | | | | | Replace dry mode with local publishing modeLeonid Logvinov2018-07-252-28/+36
* | | | | | | | Install our fork of lerna and use itFabio Berger2018-07-251-1/+1
* | | | | | | | Omit specific version of react typesFabio Berger2018-07-241-1/+1
* | | | | | | | Temporarily add changelog & package.json version changesFabio Berger2018-07-2452-8/+290
* | | | | | | | Correct next versionFabio Berger2018-07-241-1/+1
* | | | | | | | Merge fix-rc-packagesFabio Berger2018-07-249-11/+38
|\| | | | | | |
| * | | | | | | Move solidity-parser-antlr type to dependencies since it's used as part of th...Fabio Berger2018-07-231-1/+1
| * | | | | | | Omit verson of react typesFabio Berger2018-07-231-1/+1
| * | | | | | | Stop specifying a specific version of @types/react so there can't be two inst...Fabio Berger2018-07-231-1/+1
| * | | | | | | Move hdkey typings to dependencies since it's part of the exported interfaceFabio Berger2018-07-231-1/+1
| * | | | | | | Add dependent types of the react-popper typingsFabio Berger2018-07-231-1/+3
| * | | | | | | Revert "Move frontend package types out of typescript-typings since this pack...Fabio Berger2018-07-237-56/+53
| * | | | | | | Add troubleshooting section to utils READMEFabio Berger2018-07-231-1/+15
| * | | | | | | Add additional required tsconfig option for utils package since it now relies...Fabio Berger2018-07-231-0/+1
| * | | | | | | Move frontend package types out of typescript-typings since this package will...Fabio Berger2018-07-227-53/+56
| * | | | | | | Add bn.js types as dep of `typescript-typings` since they are needed by ether...Fabio Berger2018-07-221-1/+2
| * | | | | | | Move ECSignature type from types package into eth-light-wallet type dec since...Fabio Berger2018-07-223-8/+14
* | | | | | | | Make the test:installation work with the local npm registryLeonid Logvinov2018-07-242-5/+13
* | | | | | | | Pretend we defined types for @lerna/batch-packagesLeonid Logvinov2018-07-241-0/+1
* | | | | | | | Add utils.getTopologicallySortedPackagesLeonid Logvinov2018-07-241-1/+11
* | | | | | | | Introduce PackageJson fileLeonid Logvinov2018-07-241-10/+12
* | | | | | | | Test installation on latest version, not the packed oneLeonid Logvinov2018-07-241-6/+4
* | | | | | | | Temp: Force publishLeonid Logvinov2018-07-241-1/+3
* | | | | | | | improve logsFabio Berger2018-07-241-3/+2
* | | | | | | | remove legacy prepublishOnlyFabio Berger2018-07-241-1/+0
* | | | | | | | Add --yes flagFabio Berger2018-07-241-1/+1
* | | | | | | | Add nodeFabio Berger2018-07-241-1/+1
* | | | | | | | Use relative path to lerna executableFabio Berger2018-07-241-3/+3
* | | | | | | | Add missing 'publish'Fabio Berger2018-07-241-1/+1
* | | | | | | | Fix publish commandFabio Berger2018-07-241-3/+5
* | | | | | | | Use cdVersions flag instead of interactive promptFabio Berger2018-07-241-63/+4
* | | | | | | | Add ignore flagFabio Berger2018-07-241-0/+8
* | | | | | | | Use includeFabio Berger2018-07-241-3/+1
* | | | | | | | Dedup versionPrompt being triggered multiple timesFabio Berger2018-07-241-2/+8
* | | | | | | | Remove regexFabio Berger2018-07-241-1/+1
* | | | | | | | Make regex less strictFabio Berger2018-07-241-1/+1
* | | | | | | | Add timeout before writing to stdinFabio Berger2018-07-241-4/+11
* | | | | | | | Use string equals and remove returnsFabio Berger2018-07-241-3/+1
* | | | | | | | Add in print statementsFabio Berger2018-07-241-0/+3
* | | | | | | | Add missing varsFabio Berger2018-07-241-2/+4
* | | | | | | | Also add private package new versions to packageToNextVersionFabio Berger2018-07-241-11/+14
* | | | | | | | Make sure private packages have a next versionFabio Berger2018-07-241-0/+8
* | | | | | | | more bogusFabio Berger2018-07-241-1/+1
* | | | | | | | testingFabio Berger2018-07-241-0/+3
* | | | | | | | Fix publish to give lerna actual version rather then the semver diffFabio Berger2018-07-242-12/+12
* | | | | | | | Changed artifactsFabio Berger2018-07-2413-414/+483
* | | | | | | | Temporarily uncommented parts of publish flowFabio Berger2018-07-242-23/+23
* | | | | | | | Fix lerna publish to include publishing prerelease versionsFabio Berger2018-07-242-13/+15
* | | | | | | | Add new RC versions to changelog so that these packages are publised as RC'sFabio Berger2018-07-247-0/+65
* | | | | | | | Revert "Revert "Publish""Fabio Berger2018-07-2431-280/+277
* | | | | | | | Add skip-git for testingFabio Berger2018-07-241-1/+1
* | | | | | | | Allow registry to be configured in lerna.jsonFabio Berger2018-07-243-5/+6
| |/ / / / / / |/| | | | | |
* | | | | | | Remove ERC721 callback functionsAmir Bandeali2018-07-234-49/+3
* | | | | | | Use != instead of > in loops, add sanity checks to market fill functionsAmir Bandeali2018-07-233-19/+19
* | | | | | | Add more tests and fixesAmir Bandeali2018-07-238-412/+484
* | | | | | | Remove MConstants and MixinConstants for LibConstantsAmir Bandeali2018-07-238-57/+23
* | | | | | | Remove redundant external call by reimplementing fillOrderNoThrowAmir Bandeali2018-07-236-166/+355
* | | | | | | Remove orders length checkAmir Bandeali2018-07-232-11/+0
* | | | | | | Add assertValidFillResultsAmir Bandeali2018-07-231-61/+88
* | | | | | | Update web3Wrapper CHANGELOGAmir Bandeali2018-07-231-0/+9
* | | | | | | Get actual gasPrice from transaction instead of setting defaultAmir Bandeali2018-07-232-35/+48
* | | | | | | Store orders length in varible before looping over ordersAmir Bandeali2018-07-232-14/+25
* | | | | | | Use transferFrom instead of safeTransferFromAmir Bandeali2018-07-232-6/+2
* | | | | | | Fix minimal testsAmir Bandeali2018-07-234-730/+748
* | | | | | | Fix rounding error issues, use different logic when makerAsset is ZRXAmir Bandeali2018-07-236-52/+95
* | | | | | | Rename marketSellEth => marketSellWethAmir Bandeali2018-07-232-3/+3
* | | | | | | Update percentage constantsAmir Bandeali2018-07-233-17/+18
* | | | | | | Update transferEthFeeAndRefund, add check to ERC721 transferAmir Bandeali2018-07-236-26/+54
* | | | | | | Refactor forwarding contract architecture, remove batch functionsAmir Bandeali2018-07-2320-1038/+572
* | | | | | | Merge pull request #906 from 0xProject/refactor/contracts/examplesAmir Bandeali2018-07-2314-26/+124
|\ \ \ \ \ \ \
| * | | | | | | Add tests to verify ZRX_ASSET_DATAAmir Bandeali2018-07-235-1/+77
| * | | | | | | Add comments for deploying with constant ZRX_ASSET_DATAAmir Bandeali2018-07-232-2/+15
| * | | | | | | Move example contracts into new examples dirAmir Bandeali2018-07-2310-24/+33
* | | | | | | | Updated CHANGELOGSLeonid Logvinov2018-07-2355-104/+656
|/ / / / / / /
* | | | | | | Add missing timestamps in CHANGELOGsLeonid Logvinov2018-07-237-11/+8
* | | | | | | Add missing timestamps in CHANGELOGsLeonid Logvinov2018-07-232-2/+4
* | | | | | | Merge pull request #877 from 0xProject/feature/contracts/removeERC721CallbackAmir Bandeali2018-07-238-199/+36
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixed merge errorsGreg Hysen2018-07-181-2/+0
| * | | | | | Fixed merge errorGreg Hysen2018-07-181-11/+11
| * | | | | | Ran prettierGreg Hysen2018-07-182-15/+12
| * | | | | | Removed receiverData from ERC721 Proxy Id generationGreg Hysen2018-07-187-17/+12
| * | | | | | Removed receiverData and `onReceive` callback from ERC721 proxy.Greg Hysen2018-07-183-178/+25
* | | | | | | Merge pull request #895 from 0xProject/feature/website/send-eth-from-portalFrancesco Agosti2018-07-229-48/+129
|\ \ \ \ \ \ \
| * | | | | | | Remove TODOfragosti2018-07-191-1/+0
| * | | | | | | Remove unused Token importfragosti2018-07-191-1/+0
| * | | | | | | Add lifecycle messagesfragosti2018-07-193-17/+56
| * | | | | | | WIP for sending ether from portal (works)fragosti2018-07-197-38/+82
| | |_|/ / / / | |/| | | | |
* | | | | | | Fix version of ethereumjs-abi to 0.6.5 to fix decoding bugFabio Berger2018-07-223-2/+11
* | | | | | | Merge pull request #904 from lukeautry/luke/leading_zero_encodeFabio Berger2018-07-222-3/+3
|\ \ \ \ \ \ \
| * | | | | | | fix decodeAssetData for addresses starting in 0Luke Autry2018-07-222-3/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #899 from kroitor/patch-1Amir Bandeali2018-07-211-1/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Deduplicate assert web3-wrapper signMessageAsyncIgor Kroitor2018-07-201-1/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'v2-prototype' into bug/website/fix-websiteBrandon Millman2018-07-2126-0/+27
|\ \ \ \ \ \
| * | | | | | Add missing timestamp to CHANGELOG entriesFabio Berger2018-07-2126-0/+27
| | |/ / / / | |/| | | |