aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-24118-2294/+2720
|\
| * 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 branch 'v2-prototype' into feature/website/jobs-page-part2Brandon Millman2018-07-21115-913/+1992
|\| | | | | |
| * | | | | | 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
| |/ / / / / /
| | * | | | | Update yarn.lockFabio Berger2018-07-191-27/+4
| | * | | | | Add additional pattern removal and added HACK commentFabio Berger2018-07-191-1/+3
| | * | | | | Renames to remove mention of LernaFabio Berger2018-07-196-68/+64
| | * | | | | Remove unused declarationFabio Berger2018-07-191-1/+0
| | * | | | | Upgrade Lerna to 3.0-Beta14Fabio Berger2018-07-192-4/+3
| | * | | | | Replace lerna-get-packages with our own implementationFabio Berger2018-07-199-51/+79
| | * | | | | Update to Lerna v3.0-betaFabio Berger2018-07-183-180/+679
| | | |_|_|/ | | |/| | |
* | | | | | 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
|/ / / / /
* | | | | 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 pull request #884 from 0xProject/export-more-0x.jsFabio Berger2018-07-1831-255/+312
|\ \ \ \ \
| * | | | | edit changelog messageFabio Berger2018-07-181-1/+1
| * | | | | Fix prettierFabio Berger2018-07-182-9/+3
| * | | | | Fix linterFabio Berger2018-07-182-2/+1
| * | | | | merge v2-prototypeFabio Berger2018-07-1817-161/+518
| |\ \ \ \ \
| * | | | | | Rename decodeAssetDataId to decodeAssetProxyId for consistencyFabio Berger2018-07-185-13/+13
| * | | | | | Add java doc comments to assetDataUtilsFabio Berger2018-07-181-1/+34
| * | | | | | Move encodeUint256 & decodeUint256 out of assetDataUtils since we don't want ...Fabio Berger2018-07-186-31/+43
| * | | | | | Export missing types and add to doc ref whitelistFabio Berger2018-07-172-0/+30
| * | | | | | Remove unused depFabio Berger2018-07-171-1/+0
| * | | | | | Fix typingFabio Berger2018-07-171-1/+1
| * | | | | | Move type decl. to typescript-typingsFabio Berger2018-07-172-8/+8
| * | | | | | Add PRFabio Berger2018-07-171-1/+2
| * | | | | | Make assetData a static property and add to CHANGELOGFabio Berger2018-07-172-1/+4
| * | | | | | Export assetDataUtils from 0x.jsFabio Berger2018-07-171-0/+5
| * | | | | | Rename assetProxyUtils to assetDataUtilsFabio Berger2018-07-1722-223/+204
| | | * | | | 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
| | | | | * | | | | Upgrade sha3 to 1.2.2 to work with node v10Leonid Logvinov2018-07-171-4/+4
| | | | | * | | | | Check if the token doesn't exist before minting in fill scenariosLeonid Logvinov2018-07-172-3/+10
| | | | | * | | | | Make downlevelIteration a global configLeonid Logvinov2018-07-173-3/+2
| | | | | * | | | | Fix tests descriptionsLeonid Logvinov2018-07-171-2/+2
| | | | | * | | | | DRY up the code in order-watcher collision-resistant abi decoderLeonid Logvinov2018-07-171-13/+9
| | | | | * | | | | Await transactions in fillScenariosLeonid Logvinov2018-07-172-5/+9
| | | | | * | | | | Rename decodeAssetData to decodeAssetDataOrThrowLeonid Logvinov2018-07-177-12/+12
| | | | | * | | | | Use normalizedAddressLeonid Logvinov2018-07-171-1/+1
| | | | | * | | | | Make addOrder asyncLeonid Logvinov2018-07-162-17/+17
| | | | | * | | | | Await the promise in order watcher assertionLeonid Logvinov2018-07-161-1/+1
| | | | | * | | | | Merge branch 'feature/order-watcher-v2' into feature/order-watcher-erc721-testsLeonid Logvinov2018-07-1666-10413/+10636
| | | | | |\ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | | * | | | | Yarn lock changesLeonid Logvinov2018-07-161-17/+4
| | | | | * | | | | Import AssetproxyIdLeonid Logvinov2018-07-161-1/+1
| | | | | * | | | | Add ERC721 tests to order watcherLeonid Logvinov2018-07-162-4/+64
| | | | | * | | | | Enable downlevelIterationLeonid Logvinov2018-07-161-0/+1
| | | | | * | | | | Register asset types within collisionResistantAbiDecoderLeonid Logvinov2018-07-161-0/+14
| | | | | * | | | | Add ERC721 support to fill-scenariosLeonid Logvinov2018-07-164-226/+292
| | | | | * | | | | Remove no-unused-variable rule from tslint as it's buggy and has side-effectsLeonid Logvinov2018-07-161-1/+0
| | | | | * | | | | Don't throw on transferFrom is the sender is an ownerLeonid Logvinov2018-07-161-9/+11
| | | | | * | | | | Pass erc721ProxyAddress to fillScenariosLeonid Logvinov2018-07-161-2/+2
| | | | | * | | | | Fix postinstall hook for contracts -> typesLeonid Logvinov2018-07-161-1/+1
| | | * | | | | | | MergeLeonid Logvinov2018-07-1825-401/+590
| | | * | | | | | | Merge branch 'v2-prototype' into feature/order-watcher-v2Leonid Logvinov2018-07-18166-615/+1086
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | / / / / / / | | | |/ / / / / /
* | | | | | | | | Merge pull request #883 from 0xProject/feature/tslint-improvementsLeonid Logvinov2018-07-18140-365/+421
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix tslint issuesLeonid Logvinov2018-07-17113-323/+354
| * | | | | | | | Upgrade tslint to the newest versionLeonid Logvinov2018-07-1727-27/+27
| * | | | | | | | Add new tslint rulesLeonid Logvinov2018-07-171-0/+19
| * | | | | | | | Sort the config file lexicographicallyLeonid Logvinov2018-07-161-26/+31
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Fix an inconsistency in abi-gen CHANGELOG.jsonLeonid Logvinov2018-07-181-9/+4
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #857 from 0xProject/feature/contracts/batchGetOrderInfoAmir Bandeali2018-07-186-12/+344
|\ \ \ \ \ \ \
| * | | | | | | Add tests for getOrderInfo and getOrdersInfoAmir Bandeali2018-07-183-5/+311
| * | | | | | | Reorder checks in getOrderInfoAmir Bandeali2018-07-181-7/+9
| * | | | | | | Add getOrdersInfo functionAmir Bandeali2018-07-182-0/+24
|/ / / / / / /
* | | | | | | Merge pull request #886 from 0xProject/fix/time-offset-accidental-revertAlex Browne2018-07-181-14/+25
|\ \ \ \ \ \ \
| * | | | | | | Mine a dummy block in blockchain_lifecycle to re-apply any time offsetAlex Browne2018-07-181-14/+25
|/ / / / / / /
* | | | | | | Merge pull request #881 from 0xProject/fix/timestamp-conversionsAlex Browne2018-07-1812-137/+151
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix bugs having to do with block timestamps and order expirationTimesAlex Browne2018-07-1712-137/+151
| |/ / / / /
* | | | | | Merge pull request #875 from 0xProject/fix-order-watcherFabio Berger2018-07-1711-73/+50
|\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 11:37:13 +0800