Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-20 | 6 | -65/+349 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (22 commits) Fix closing parens in liborder Update after rebase ERC721Proxy Always call safeTransferFrom Rename makerEpoch => orderEpoch Make cancelOrdersUpTo compatible with sender abstraction Update PR template Use Image component instead of img tag Assembler orderHash function Optimize and remove redundant encodePacked Fix linting issue Fix bug where we do fetch balances on wallet login Check network state immediately instead of waiting for delay Fix onboarding persisting when changing routes Consolidate account state messaging logic Only elevate wallet zIndex when onboarding is in progress Rebase and update feedback Run linter Add Portal v2 logging Simplified handling of source < 32 edge case Basic EIP712 encoder ... | ||||
| * | ERC721Proxy Always call safeTransferFrom | Jacob Evans | 2018-06-20 | 1 | -8/+8 |
| | | |||||
| * | Rename makerEpoch => orderEpoch | Amir Bandeali | 2018-06-20 | 5 | -64/+64 |
| | | |||||
| * | Make cancelOrdersUpTo compatible with sender abstraction | Amir Bandeali | 2018-06-20 | 3 | -39/+323 |
| | | |||||
* | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-19 | 6 | -38/+316 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (40 commits) Increase number of columns in relayer grid for small screens Make isValidSignature public Make batchFill methods return FIllResults struct Remove remove_tags script Small fixes Use semver package instead of getNextPatchVersion Use semver library instead of semverUtils small fixes Show all errors of a given kind at once rather then throwing after the first instance is encountered fix package.json Add more prepublish checks remove remove_tags script Create a shared Image component Adjust version in changelog Update RelayerGridTile render logic to incorportate colors and logos Add max width to top bar Set max-width for LargeLayout Finish last onboarding step Finish set allowance step Add onboarding assets ... | ||||
| * | Make isValidSignature public | Amir Bandeali | 2018-06-19 | 6 | -38/+316 |
| | | |||||
* | | - Refactor assetWrapper to contain more of the normalizing logic instead of ↵ | Fabio Berger | 2018-06-15 | 1 | -8/+26 |
|/ | | | | | | | | erc20Wrapper and erc721Wrapper - Add burn method to DummyERC721Token - Add additional methods to assetWrapper to set balance/allowances on ERC20 and ERC721 tokens - Use approve instead of approveAll for ERC721 tokens | ||||
* | Merge pull request #682 from 0xProject/feature/contracts/popProxyId | Amir Bandeali | 2018-06-13 | 9 | -188/+182 |
|\ | | | | | Remove proxyId checks in AssetProxies | ||||
| * | Update artifacts | Amir Bandeali | 2018-06-13 | 9 | -188/+182 |
| | | |||||
* | | Refactor sol-cov to avoid keeping traceInfo in memory | Alex Browne | 2018-06-13 | 1 | -119/+0 |
|/ | |||||
* | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts ↵ | Alex Browne | 2018-06-12 | 16 | -148/+849 |
| | | | | tests | ||||
* | Implement SolidityProfiler & adapt sol-cov to work with Geth | Leonid Logvinov | 2018-06-09 | 10 | -119/+59 |
| | |||||
* | Minor fixes after rebase | Greg Hysen | 2018-06-08 | 1 | -735/+1 |
| | |||||
* | updated migrations artifacts | Greg Hysen | 2018-06-08 | 1 | -1/+735 |
| | |||||
* | LibAssetProxyDecoder tests | Greg Hysen | 2018-06-08 | 1 | -8/+39 |
| | |||||
* | Foundation for TestLibAssetProxyDecoder | Greg Hysen | 2018-06-08 | 1 | -0/+88 |
| | |||||
* | Fix tslint failure | Fabio Berger | 2018-06-08 | 1 | -7/+7 |
| | |||||
* | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 1 | -13/+17 |
|\ | | | | | | | feature/improve-linting | ||||
| * | Remove extra logs and other small fixes | Alex Browne | 2018-06-07 | 1 | -11/+11 |
| | | |||||
| * | Add more transactions to Geth on init. Skip tests that are failing. | Alex Browne | 2018-06-07 | 3 | -614/+611 |
| | | |||||
* | | Get build and tests to pass | fragosti | 2018-06-07 | 17 | -1491/+1360 |
|/ | |||||
* | Merge pull request #656 from 0xProject/refactor/fill-scenarios/for-v2 | Fabio Berger | 2018-06-05 | 2 | -0/+601 |
|\ | | | | | Refactor fill-scenarios for v2 | ||||
| * | Add new 2.0 artifacts to migrations | Fabio Berger | 2018-06-05 | 2 | -0/+601 |
| | | |||||
* | | Update artifacts in migrations | Alex Browne | 2018-06-05 | 8 | -51/+79 |
|/ | |||||
* | Update v2 artifacts | Fabio Berger | 2018-06-02 | 17 | -4493/+4727 |
| | |||||
* | Update Whitelist | Amir Bandeali | 2018-05-31 | 1 | -0/+280 |
| | |||||
* | Merge pull request #571 from 0xProject/feature/contracts/proxyOwner | Amir Bandeali | 2018-05-25 | 1 | -0/+782 |
|\ | | | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress | ||||
| * | Fix build | Amir Bandeali | 2018-05-25 | 1 | -0/+782 |
| | | |||||
* | | Use domain separator for exchange address | Jacob Evans | 2018-05-25 | 2 | -2292/+2273 |
|/ | |||||
* | Ran prettier | Greg Hysen | 2018-05-22 | 16 | -7692/+7892 |
| | |||||
* | Added getNullFillResults | Greg Hysen | 2018-05-19 | 2 | -14/+14 |
| | |||||
* | orderFilledAmount -> orderTakerAssetFilledAmount | Greg Hysen | 2018-05-19 | 2 | -20/+20 |
| | |||||
* | Style improvements to order matching | Greg Hysen | 2018-05-19 | 1 | -10/+10 |
| | |||||
* | Upgraded to Solidity 0.4.24 | Greg Hysen | 2018-05-19 | 10 | -149/+149 |
| | |||||
* | Rebased against v2-prototype | Greg Hysen | 2018-05-19 | 16 | -7544/+7692 |
| | |||||
* | Fix prettier | Brandon Millman | 2018-05-19 | 16 | -7343/+7544 |
| | |||||
* | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 16 | -0/+7359 |