aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unused importFabio Berger2018-07-251-1/+0
* Update artifactFabio Berger2018-07-251-8/+8
* update yarn.lockFabio Berger2018-07-251-0/+7
* 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
| * | Merge pull request #905 from 0xProject/fix-rc-packagesFabio Berger2018-07-259-13/+37
| |\ \
| | * | Omit specific version of react typesFabio Berger2018-07-241-1/+1
| | * | Correct next versionFabio Berger2018-07-241-1/+1
| | * | Merge v2-prototypeFabio Berger2018-07-24106-2233/+2565
| | |\ \ | | |/ / | |/| |
* | | | 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
* | | | Add back build stepFabio Berger2018-07-251-1/+1
* | | | Specify registry url only if local publish attemptedLeonid Logvinov2018-07-256-36/+42
* | | | Replace dry mode with local publishing modeLeonid Logvinov2018-07-253-30/+38
* | | | Install our fork of lerna and use itFabio Berger2018-07-253-451/+472
* | | | Omit specific version of react typesFabio Berger2018-07-241-1/+1
* | | | Temporarily add changelog & package.json version changesFabio Berger2018-07-2452-8/+290
* | | | Fix lerna versonFabio Berger2018-07-242-18/+18
* | | | 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
* | | | Add .npmrc to gitignoreLeonid Logvinov2018-07-241-0/+1
* | | | Test installation on latest version, not the packed oneLeonid Logvinov2018-07-241-6/+4
* | | | Temp: Force publishLeonid Logvinov2018-07-241-1/+3
* | | | Fix(lerna): Change lerna versionLeonid Logvinov2018-07-242-17/+17
* | | | 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
* | | | Upgrade to new lernaFabio Berger2018-07-242-62/+62
* | | | 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
* | | | Temporarily use local lernaFabio Berger2018-07-243-96/+96
* | | | 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
* | | | Update lerna.jsonFabio Berger2018-07-241-2/+2
* | | | Changed artifactsFabio Berger2018-07-2413-414/+483
* | | | And also temporarily remove rebuilding from publish flowFabio Berger2018-07-241-2/+2
* | | | Temporarily uncommented parts of publish flowFabio Berger2018-07-242-23/+23
* | | | Fix lerna publish to include publishing prerelease versionsFabio Berger2018-07-242-13/+15
* | | | Omit building website before publishFabio Berger2018-07-241-2/+4
* | | | 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-244-6/+8
| |/ / |/| |
* | | Merge pull request #847 from 0xProject/refactor/contracts/simplify-forwarderAmir Bandeali2018-07-2333-1890/+1740
|\ \ \
| * | | 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
* | | | Revert "Publish"Leonid Logvinov2018-07-2331-277/+280
* | | | PublishLeonid Logvinov2018-07-2331-280/+277
|/ / /
* | | 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-2356-109/+657
|/ / /
* | | 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 #880 from feuGeneA/patch-5Fabio Berger2018-07-221-7/+5
|\ \ \
| * | | make PR template checklist more usefulF. Eugene Aumson2018-07-171-7/+5
* | | | 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-224-5/+21
* | | | | Merge pull request #904 from lukeautry/luke/leading_zero_encodeFabio Berger2018-07-223-4/+4
|\ \ \ \ \
| * | | | | fix decodeAssetData for addresses starting in 0Luke Autry2018-07-223-4/+4
* | | | | | Merge pull request #899 from kroitor/patch-1Amir Bandeali2018-07-211-1/+0
|\ \ \ \ \ \
| * | | | | | Deduplicate assert web3-wrapper signMessageAsyncIgor Kroitor2018-07-201-1/+0
* | | | | | | Merge pull request #903 from 0xProject/bug/website/fix-websiteBrandon Millman2018-07-215-71/+29
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ 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
| |_|/ / / / / |/| | | | | |
| * | | | | | Add changelog entry for @0xproject/utilsBrandon Millman2018-07-211-0/+9
| * | | | | | Add AbortController polyfill to fetchAsync in utilsBrandon Millman2018-07-213-0/+8
| * | | | | | Increase node heap size for webpack commandBrandon Millman2018-07-211-1/+1
| * | | | | | Upgrade some @0xproject packages to 1.0.0 in websiteBrandon Millman2018-07-212-70/+11
|/ / / / / /
* | | | | | Merge pull request #892 from 0xProject/refactor/contracts/LibAbiEncoderAmir Bandeali2018-07-202-170/+234
|\ \ \ \ \ \
| * | | | | | Hard code fillOrder selector into abiEncodeFillOrderAmir Bandeali2018-07-201-7/+4
| * | | | | | Returns byte array instead of memory range for encoding fillOrder calldataGreg Hysen2018-07-202-24/+26
| * | | | | | Created LibAbiEncoder with `fillOrderNoThrow`Greg Hysen2018-07-202-170/+235
|/ / / / / /
* | | | | | Merge pull request #901 from 0xProject/feature/abi-gen-fixLeonid Logvinov2018-07-203-3/+12
|\ \ \ \ \ \
| * | | | | | Fix the abi-gen entry pointLeonid Logvinov2018-07-203-3/+12
| |/ / / / /
* | | | | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-proto...Fabio Berger2018-07-203-35/+243
|\| | | | |
| * | | | | Fix linter errorLeonid Logvinov2018-07-201-0/+1
| * | | | | Remove the postinstall hookLeonid Logvinov2018-07-202-35/+242
* | | | | | Add missing dep in migrationsFabio Berger2018-07-201-0/+1
|/ / / / /
* | | | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-proto...Fabio Berger2018-07-202-2/+10
|\ \ \ \ \
| * | | | | @0xproject/sra-report@1.0.0Leonid Logvinov2018-07-202-1/+9
| * | | | | Change all package to depend on the new @0xproject/connect@1.0.0Leonid Logvinov2018-07-201-1/+1
* | | | | | Update website package.json with original importsFabio Berger2018-07-201-9/+9
|/ / / / /
* | | | | @0xproject/connect@1.0.0Leonid Logvinov2018-07-202-2/+2
* | | | | Use old assert version in @0xproject/connectLeonid Logvinov2018-07-202-103/+184
* | | | | FIx a typoLeonid Logvinov2018-07-2024-24/+24
* | | | | Remove rc versions from unmigrated packagesLeonid Logvinov2018-07-202-5/+5
* | | | | 0x.js@1.0.0-rc.2Leonid Logvinov2018-07-201-1/+1
* | | | | Move methods in `ZeroEx.assetData` to `ZeroEx` itselfFabio Berger2018-07-202-4/+59
* | | | | Fix scoping of assets in 0x.jsLeonid Logvinov2018-07-201-9/+7
* | | | | 0x.js@1.0.0-rc.1Leonid Logvinov2018-07-202-12/+8
* | | | | Remove bundles configLeonid Logvinov2018-07-201-7/+1
* | | | | @0xproject/order-watcher@1.0.0-rc.1Leonid Logvinov2018-07-202-1/+10
* | | | | Add monorepo-scripts postpublish.tsLeonid Logvinov2018-07-201-0/+8
* | | | | Change all package to depend on the new @0xproject/contract-wrappers@1.0.0-rc.1Leonid Logvinov2018-07-204-11/+3
* | | | | @0xproject/contract-wrappers@1.0.0-rc.1Leonid Logvinov2018-07-202-5/+5
* | | | | Change all package to depend on the new @0xproject/migrations@1.0.0Leonid Logvinov2018-07-204-4/+5
* | | | | @0xproject/migrations@1.0.0Leonid Logvinov2018-07-202-1/+9
* | | | | Change all package to depend on the new @0xproject/sol-cov@1.0.0Leonid Logvinov2018-07-202-2/+2
* | | | | @0xproject/sol-cov@1.0.0Leonid Logvinov2018-07-202-8/+10
* | | | | Change all package to depend on the new @0xproject/react-docs@1.0.0Leonid Logvinov2018-07-202-2/+2
* | | | | @0xproject/react-docs@1.0.0Leonid Logvinov2018-07-202-1/+9
* | | | | Change all package to depend on the new @0xproject/react-shared@1.0.0Leonid Logvinov2018-07-202-2/+2
* | | | | @0xproject/react-shared@1.0.0Leonid Logvinov2018-07-202-1/+9
* | | | | Copy postpublish scripts on build in fill-scenariosLeonid Logvinov2018-07-201-1/+1
* | | | | Change all package to depend on the new @0xproject/fill-scenarios@1.0.0-rc.1Leonid Logvinov2018-07-202-2/+2
* | | | | @0xproject/fill-scenarios@1.0.0-rc.1Leonid Logvinov2018-07-202-2/+2
* | | | | Change all package to depend on the new @0xproject/order-utils@1.0.0-rc.1Leonid Logvinov2018-07-208-8/+8
* | | | | @0xproject/order-utils@1.0.0-rc.1Leonid Logvinov2018-07-202-2/+2
* | | | | Change all package to depend on the new @0xproject/sol-compiler@1.0.0Leonid Logvinov2018-07-209-9/+9
* | | | | @0xproject/sol-compiler@1.0.0Leonid Logvinov2018-07-202-1/+9
* | | | | Change all package to depend on the new @0xproject/dev-utils@1.0.0Leonid Logvinov2018-07-2011-11/+11
* | | | | @0xproject/dev-utils@1.0.0Leonid Logvinov2018-07-202-1/+9
* | | | | Change all package to depend on the new @0xproject/subproviders@1.0.0Leonid Logvinov2018-07-209-9/+9
* | | | | @0xproject/subproviders@1.0.0Leonid Logvinov2018-07-202-3/+8
* | | | | Change all package to depend on the new @0xproject/base-contract@1.0.0Leonid Logvinov2018-07-208-8/+8
* | | | | Fix the scripts buildLeonid Logvinov2018-07-201-1/+1
* | | | | @0xproject/base-contract@1.0.0Leonid Logvinov2018-07-202-1/+9
* | | | | Change all package to depend on the new @0xproject/web3-wrapper@1.0.0Leonid Logvinov2018-07-2015-15/+15
* | | | | FIx a typoLeonid Logvinov2018-07-201-1/+1
* | | | | @0xproject/web3-wrapper@1.0.0Leonid Logvinov2018-07-202-2/+2
* | | | | Change all package to depend on the new @0xproject/abi-gen@1.0.0Leonid Logvinov2018-07-207-7/+7
* | | | | @0xproject/abi-gen@1.0.0Leonid Logvinov2018-07-202-2/+2
* | | | | Change all package to depend on the new @0xproject/assert@1.0.0Leonid Logvinov2018-07-209-9/+9
* | | | | Add forgotten file to gitLeonid Logvinov2018-07-201-0/+7
* | | | | @0xproject/assert@1.0.0Leonid Logvinov2018-07-202-2/+2
* | | | | Change all package to depend on the new @0xproject/sol-resolver@1.0.0Leonid Logvinov2018-07-201-1/+1
* | | | | Add monorepo-scripts to sol-resolverLeonid Logvinov2018-07-202-1/+9
* | | | | @0xproject/sol-resolver@1.0.0Leonid Logvinov2018-07-202-2/+2
* | | | | Change all package to depend on the new @0xproject/json-schemas@1.0.0-rc.1Leonid Logvinov2018-07-208-8/+8
* | | | | @0xproject/json-schemas@1.0.0-rc.1Leonid Logvinov2018-07-201-1/+1
* | | | | Change the next @0xproject/json-schemas version to be 1.0.0-rc.1Leonid Logvinov2018-07-201-2/+2
* | | | | Change all package to depend on the new @0xproject/utils@1.0.0Leonid Logvinov2018-07-2022-23/+23
* | | | | @0xproject/utils@1.0.0Leonid Logvinov2018-07-201-1/+1
* | | | | Add a missing CHANGELOG entryLeonid Logvinov2018-07-201-0/+9
* | | | | Change all package to depend on the new @0xproject/types@1.0.0-rc.1Leonid Logvinov2018-07-2016-16/+16
* | | | | FIx a typoLeonid Logvinov2018-07-201-1/+1
* | | | | @0xproject/types@1.0.0-rc.1Leonid Logvinov2018-07-201-1/+1
* | | | | Change the next @0xproject/types version to be 1.0.0-rc.1Leonid Logvinov2018-07-201-1/+1
* | | | | Change all package to depend on the new @0xproject/tslint-config@1.0.0Leonid Logvinov2018-07-2027-27/+27
* | | | | @0xproject/tslint-config@1.0.0Leonid Logvinov2018-07-201-1/+1
* | | | | Change the next @0xproject/tslint-config version to be 1.0.0Leonid Logvinov2018-07-201-0/+9
* | | | | Change all package to depend on the new @0xproject/typescript-typings@1.0.0Leonid Logvinov2018-07-2023-23/+23
* | | | | @0xproject/typescript-typings@1.0.0Leonid Logvinov2018-07-201-1/+1
* | | | | Change the next @0xproject/typescript-typings version to be 1.0.0Leonid Logvinov2018-07-201-1/+1
* | | | | Change all package to depend on the new @0xproject/monorepo-scripts@1.0.0Leonid Logvinov2018-07-2024-24/+24
* | | | | @0xproject/monorepo-scripts@1.0.0Leonid Logvinov2018-07-201-1/+1
* | | | | Change all package to depend on the new ethereum-types@1.0.0Leonid Logvinov2018-07-2019-19/+19
* | | | | Make PR numbers links on Github releasesLeonid Logvinov2018-07-202-2/+5
* | | | | v1.0.0Leonid Logvinov2018-07-201-1/+1
* | | | | Change the next ethereum-types version to be 1.0.0Leonid Logvinov2018-07-201-1/+1
* | | | | Merge pull request #897 from 0xProject/doc-changesFabio Berger2018-07-2010-13/+33
|\ \ \ \ \
| * | | | | Specify exact versionFabio Berger2018-07-201-1/+1
| * | | | | Add PR nr.Fabio Berger2018-07-201-1/+2
| * | | | | Fix version dropdown so it also renders RC versions properlyFabio Berger2018-07-201-2/+1
| * | | | | Update doc md files for v2 packagesFabio Berger2018-07-204-0/+17
| * | | | | Compare host rather then origin so that it comes without the http/https prefixFabio Berger2018-07-201-1/+1
| * | | | | Merge branch 'v2-prototype' into doc-changesFabio Berger2018-07-2031-68/+119
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #844 from 0xProject/support-multiple-doc-mdFabio Berger2018-07-2031-68/+119
|\ \ \ \ \ \
| * \ \ \ \ \ merge v2-prototypeFabio Berger2018-07-19388-8379/+117301
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #896 from 0xProject/update-lernaFabio Berger2018-07-1913-285/+785
|\ \ \ \ \ \ \
| | * | | | | | Add missing importFabio Berger2018-07-101-0/+1
| | * | | | | | Remove comment and add assertionFabio Berger2018-07-101-1/+7
| | * | | | | | merge v2-prototypeFabio Berger2018-07-1081-239/+563
| | |\ \ \ \ \ \
| | * | | | | | | Add ability to nest doc ref markdown under specific versionsFabio Berger2018-07-1031-68/+111
| | | | * | | | | Don't export object literal because the docs cannot yet render them, moved ty...Fabio Berger2018-07-194-10/+13
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Improve logFabio Berger2018-07-191-1/+1
| * | | | | | | Merge branch 'v2-prototype' into update-lernaFabio Berger2018-07-19127-3473/+2351
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #894 from 0xProject/bug/minor-fixes-json-schema-order-utilsJacob Evans2018-07-194-2/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Update CHANGELOGJacob Evans2018-07-192-0/+8
| * | | | | | | | Rename call data schema id to CallData.Jacob Evans2018-07-192-2/+2
| | |_|_|/ / / / | |/| | | | | |
* / | | | | | | Fix broken links in sol-cov documentationBrandon Millman2018-07-191-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #889 from 0xProject/update_versionsFabio Berger2018-07-1869-180/+502
|\ \ \ \ \ \ \
| * | | | | | | Update yarn.lockFabio Berger2018-07-181-29/+79
| * | | | | | | Fix 0x.js ts warningsFabio Berger2018-07-181-1/+4
| * | | | | | | merge v2-prototypeFabio Berger2018-07-1858-3300/+1845
| |\ \ \ \ \ \ \
| * | | | | | | | Update package versionsFabio Berger2018-07-1826-149/+149
| * | | | | | | | Update changelogsFabio Berger2018-07-1842-5/+277
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Fix 0x.js ts warningsFabio Berger2018-07-181-1/+4
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Fix 0x.js tests on CILeonid Logvinov2018-07-181-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #887 from 0xProject/feature/order-watcher-v2Leonid Logvinov2018-07-1858-3301/+1846
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix a bad mergeLeonid Logvinov2018-07-1817-50/+100
| * | | | | Merge branch 'v2-prototype' into feature/order-watcher-v2Leonid Logvinov2018-07-1830-252/+309
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'feature/order-watcher-v2' of github.com:0xProject/0x-monorepo i...Leonid Logvinov2018-07-180-0/+0
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'v2-prototype' into feature/order-watcher-v2Leonid Logvinov2018-07-1832-249/+581
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge pull request #879 from 0xProject/feature/order-watcher-erc721-testsLeonid Logvinov2018-07-1820-288/+462
| | |\ \ \ \ \ \
| | | * | | | | | Add a test for ERC721 AllowanceLeonid Logvinov2018-07-181-1/+37
| | | * | | | | | Use allowance instead of approval for all in fill-scenariosLeonid Logvinov2018-07-181-4/+7