Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 16 | -129/+236 |
|\ | |||||
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-25 | 46 | -908/+1178 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (48 commits) Fix typos in comments Add modifier and tests for removeAuthorizedAddressAtIndex Update and add tests Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex Move isFunctionRemoveAuthorizedAddress to test Fix usage of `popLastByte` Fix LibBytes is a library Remove `areBytesEqual` Fix usage of `contentAddress()` Clean low bits in bytes4 Clean high bits in address Refactor LibBytes.readBytes4 for consistency Fix LibBytes.equals Add trailing garbage testcase for LibBytes.equals Rename bytes.equals Add slice and sliceDestructive Rename bytes.rawAddress and add bytes.contentAddress Rename read/writeBytesWithLength Using LibBytes for bytes Make LibBytes a library ... # Conflicts: # packages/contracts/src/contracts/current/utils/Ownable/Ownable.sol # packages/contracts/test/libraries/lib_bytes.ts | ||||
| * | | Fix tslint | Fabio Berger | 2018-06-23 | 4 | -4/+4 |
| | | | |||||
| * | | Fix prettier | Fabio Berger | 2018-06-23 | 5 | -15/+13 |
| | | | |||||
| * | | Rename ContractLibErrors to RevertReasons | Fabio Berger | 2018-06-23 | 11 | -96/+96 |
| | | | |||||
| * | | Remove revert reason 'Exchange' prefix | Fabio Berger | 2018-06-23 | 2 | -3/+3 |
| | | | |||||
| * | | Move constants over to ContractLibError enum and update all tests | Fabio Berger | 2018-06-23 | 5 | -44/+42 |
| | | | |||||
| * | | Standardize ERC20 error strings given convention | Fabio Berger | 2018-06-23 | 1 | -3/+2 |
| | | | |||||
| * | | Fix test now that contract reverts with message | Fabio Berger | 2018-06-22 | 2 | -5/+4 |
| | | | |||||
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-22 | 3 | -27/+48 |
| |\ \ | | | | | | | | | | | | | | | | | * v2-prototype: Check that assetProxy exists before attempting transfer | ||||
| * | | | Add revert reason checks to wrapper tests | Fabio Berger | 2018-06-22 | 1 | -10/+19 |
| | | | | |||||
| * | | | Fix tests | Fabio Berger | 2018-06-22 | 1 | -2/+2 |
| | | | | |||||
| * | | | Change Whitelist error messages to conform to rest and added revert reason ↵ | Fabio Berger | 2018-06-22 | 3 | -21/+31 |
| | | | | | | | | | | | | | | | | checks to transactions tests | ||||
| * | | | Add revert reason checks to match_orders tests | Fabio Berger | 2018-06-22 | 1 | -7/+18 |
| | | | | |||||
| * | | | Fix tests | Fabio Berger | 2018-06-22 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-22 | 6 | -21/+268 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Update ganache-core in yarn.lock Add coverage and test:circleci command to sra-report Add missing artifacts Skip failing tests temporarily Fix web3-wrapper test fix name Add missing package tests from circleci | ||||
| * | | | | Fix expected version in test | Fabio Berger | 2018-06-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-22 | 146 | -887/+1891 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (40 commits) Use make-promises-safe as a preloader instead of manually importing Updated compiler runs to be 1,000,000 Add event to setSignatureValidatorApproval, rename signer => signerAddress accross all contracts Add senderAddress to Fill and Cancel logs, add comments to events and types Fix Island component Add missing image assets for Chris and Mel Fix some bugs in sol-cov Remove unreachable PreSigned check Fix linting Buttons look hella disabled now Remove border radius, fix width issue for unlock step Add Chris and Mel to about page fix linter issues only call getLocationByOffset if source if defined Set settleOrder and settleMatchedOrders to private Prevent prettier issue Support mobile friendly onboarding flows Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and `settleMatchedOrders` into `MixinMatchOrders` Migrations after rebasing Linter ... | ||||
| * | | | | | Check revert reason in dispatcher tests | Fabio Berger | 2018-06-22 | 2 | -5/+13 |
| | | | | | | |||||
| * | | | | | remove unused import | Fabio Berger | 2018-06-22 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Test revert reasons in proxy tests | Fabio Berger | 2018-06-21 | 1 | -11/+23 |
| | | | | | | |||||
| * | | | | | remove only | Fabio Berger | 2018-06-21 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Check revert reasons in Authorizable tests | Fabio Berger | 2018-06-21 | 2 | -6/+15 |
| | | | | | | |||||
| * | | | | | Change revert reason in ownable to be similar to all other revert reasons | Fabio Berger | 2018-06-21 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | remove .only | Fabio Berger | 2018-06-21 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Update yarn.lock | Fabio Berger | 2018-06-21 | 1 | -105/+68 |
| | | | | | | |||||
| * | | | | | Update core tests to actually check revert message | Fabio Berger | 2018-06-21 | 3 | -34/+97 |
| | | | | | | |||||
| * | | | | | Add command to remove all node_modules, nested and hoisted | Fabio Berger | 2018-06-21 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-25 | 179 | -1859/+3476 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (97 commits) Fix typos in comments Add modifier and tests for removeAuthorizedAddressAtIndex Update and add tests Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex Move isFunctionRemoveAuthorizedAddress to test Fix usage of `popLastByte` Fix LibBytes is a library Remove `areBytesEqual` Fix usage of `contentAddress()` Clean low bits in bytes4 Clean high bits in address Refactor LibBytes.readBytes4 for consistency Fix LibBytes.equals Add trailing garbage testcase for LibBytes.equals Rename bytes.equals Add slice and sliceDestructive Rename bytes.rawAddress and add bytes.contentAddress Rename read/writeBytesWithLength Using LibBytes for bytes Make LibBytes a library ... # Conflicts: # packages/contracts/src/utils/constants.ts # packages/contracts/test/exchange/core.ts | ||||
| * | | | | | Merge pull request #735 from feuGeneA/metacoin-independence | Leonid Logvinov | 2018-06-25 | 2 | -3/+16 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Metacoin independence | ||||
| | * | | | | | ethereum-types now only has v0.0.2, no 0.0.1 | F. Eugene Aumson | 2018-06-20 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | add missing metacoin dependencies | F. Eugene Aumson | 2018-06-20 | 1 | -0/+4 |
| | | | | | | | |||||
| | * | | | | | make metacoin tsconfig independent | F. Eugene Aumson | 2018-06-20 | 1 | -2/+11 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #758 from 0xProject/fix/order-utils/known-order-hash | Jacob Evans | 2018-06-25 | 1 | -8/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix known order hash value test in order-utils | ||||
| | * | | | | | | Fix known order hash value test | Jacob Evans | 2018-06-22 | 1 | -8/+4 |
| | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge pull request #698 from 0xProject/fix/contracts/using-libbytes | Remco Bloemen | 2018-06-23 | 25 | -700/+947 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixes and refactoring regarding LibBytes | ||||
| | * | | | | | | Fix typos in comments | Remco Bloemen | 2018-06-23 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Add modifier and tests for removeAuthorizedAddressAtIndex | Amir Bandeali | 2018-06-23 | 3 | -2/+79 |
| | | | | | | | | |||||
| | * | | | | | | Update and add tests | Amir Bandeali | 2018-06-23 | 4 | -173/+274 |
| | | | | | | | | |||||
| | * | | | | | | Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex | Amir Bandeali | 2018-06-23 | 2 | -13/+22 |
| | | | | | | | | |||||
| | * | | | | | | Move isFunctionRemoveAuthorizedAddress to test | Remco Bloemen | 2018-06-23 | 6 | -22/+70 |
| | | | | | | | | |||||
| | * | | | | | | Fix usage of `popLastByte` | Remco Bloemen | 2018-06-23 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Fix LibBytes is a library | Remco Bloemen | 2018-06-23 | 6 | -15/+12 |
| | | | | | | | | |||||
| | * | | | | | | Remove `areBytesEqual` | Remco Bloemen | 2018-06-23 | 1 | -35/+0 |
| | | | | | | | | |||||
| | * | | | | | | Fix usage of `contentAddress()` | Remco Bloemen | 2018-06-23 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Clean low bits in bytes4 | Remco Bloemen | 2018-06-23 | 1 | -0/+3 |
| | | | | | | | | |||||
| | * | | | | | | Clean high bits in address | Remco Bloemen | 2018-06-23 | 1 | -0/+4 |
| | | | | | | | | |||||
| | * | | | | | | Refactor LibBytes.readBytes4 for consistency | Remco Bloemen | 2018-06-23 | 4 | -14/+25 |
| | | | | | | | | |||||
| | * | | | | | | Fix LibBytes.equals | Remco Bloemen | 2018-06-23 | 1 | -21/+4 |
| | | | | | | | | |||||
| | * | | | | | | Add trailing garbage testcase for LibBytes.equals | Remco Bloemen | 2018-06-23 | 2 | -0/+21 |
| | | | | | | | | |||||
| | * | | | | | | Rename bytes.equals | Remco Bloemen | 2018-06-23 | 3 | -15/+50 |
| | | | | | | | | |||||
| | * | | | | | | Add slice and sliceDestructive | Remco Bloemen | 2018-06-23 | 1 | -0/+46 |
| | | | | | | | | |||||
| | * | | | | | | Rename bytes.rawAddress and add bytes.contentAddress | Remco Bloemen | 2018-06-23 | 2 | -8/+25 |
| | | | | | | | | |||||
| | * | | | | | | Rename read/writeBytesWithLength | Remco Bloemen | 2018-06-23 | 4 | -36/+36 |
| | | | | | | | | |||||
| | * | | | | | | Using LibBytes for bytes | Remco Bloemen | 2018-06-23 | 6 | -26/+38 |
| | | | | | | | | |||||
| | * | | | | | | Make LibBytes a library | Remco Bloemen | 2018-06-23 | 6 | -35/+30 |
| | | | | | | | | |||||
| | * | | | | | | Merge LibMem and LibBytes | Remco Bloemen | 2018-06-23 | 11 | -399/+322 |
| | | | | | | | | |||||
| | * | | | | | | Use provided mem in refernce memcpy | Remco Bloemen | 2018-06-23 | 1 | -2/+2 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #749 from 0xProject/feature/contracts/transactionHashAsm | Amir Bandeali | 2018-06-23 | 1 | -8/+18 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Converted `hashZeroExTransaction` to assembly. Saves 1k gas | ||||
| | * | | | | | | Apply mask to address to zero-out unused bytes. | Greg Hysen | 2018-06-23 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Converted `hashZeroExTransaction` to assembly. Saves 1k gas | Greg Hysen | 2018-06-22 | 1 | -8/+18 |
| | | | | | | | | |||||
| * | | | | | | | Remove extra border from the bottom of the wallet | Brandon Millman | 2018-06-23 | 1 | -3/+11 |
| | | | | | | | | |||||
| * | | | | | | | Do not render ZRX or WETH as removable tracked tokens | Brandon Millman | 2018-06-23 | 1 | -1/+4 |
| | | | | | | | | |||||
| * | | | | | | | Center items in portal drawer header | Brandon Millman | 2018-06-23 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #764 from 0xProject/feature/website/relay-grid-stacking-bug | Francesco Agosti | 2018-06-23 | 2 | -5/+10 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix issue where hovered tiles appear over top bar | ||||
| | * | | | | | | | Fix issue where hovered tiles appear over top bar | fragosti | 2018-06-23 | 2 | -5/+10 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #746 from 0xProject/feature/website/relayer-grid-polish | Francesco Agosti | 2018-06-23 | 11 | -152/+138 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Relayer grid polish | ||||
| | * | | | | | | | Remove unecessary position relative rules | fragosti | 2018-06-23 | 2 | -2/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Lint and fix typo | fragosti | 2018-06-22 | 2 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix z-index issues | fragosti | 2018-06-22 | 6 | -49/+63 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix issues that arose from merge | fragosti | 2018-06-22 | 2 | -4/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove Background component | Brandon Millman | 2018-06-22 | 5 | -57/+12 |
| | | | | | | | | | |||||
| | * | | | | | | | Padding adjustment | Brandon Millman | 2018-06-22 | 1 | -1/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove styles from Portal component | Brandon Millman | 2018-06-22 | 1 | -24/+13 |
| | | | | | | | | | |||||
| | * | | | | | | | Add Background component | Brandon Millman | 2018-06-22 | 3 | -14/+35 |
| | | | | | | | | | |||||
| | * | | | | | | | Various relayer grid ui polish items | Brandon Millman | 2018-06-22 | 6 | -42/+42 |
| | |/ / / / / / | |||||
| * | | | | | | | Fix tslint error | fragosti | 2018-06-23 | 1 | -10/+10 |
| | | | | | | | | |||||
| * | | | | | | | Merge https://github.com/0xProject/0x-monorepo into v2-prototype | fragosti | 2018-06-23 | 2 | -14/+16 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge pull request #750 from 0xProject/bug/website/fix-add-token | Brandon Millman | 2018-06-23 | 2 | -14/+16 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Various add token flow bugs | ||||
| | | * | | | | | | | Pulled out reset AssetPicker state into a common variable | Brandon Millman | 2018-06-23 | 1 | -15/+9 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Fix state mutation in reducer | Brandon Millman | 2018-06-22 | 1 | -4/+4 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Do not add empty token to local storage | Brandon Millman | 2018-06-22 | 1 | -0/+8 |
| | | |/ / / / / / | |||||
| * | | | | | | | | Remove diverse from about page | fragosti | 2018-06-23 | 1 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Use Ops instead of Operations in Mels description | fragosti | 2018-06-23 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | | | | | / | Comment out Chris, and move Mel up in about page | fragosti | 2018-06-23 | 2 | -12/+12 |
| | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merge pull request #748 from 0xProject/fix/contracts/nullAssetProxy | Fabio Berger | 2018-06-22 | 3 | -27/+48 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | Check that assetProxy exists before attempting transfer | ||||
| | * | | | | | Check that assetProxy exists before attempting transfer | Amir Bandeali | 2018-06-22 | 3 | -27/+48 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #757 from 0xProject/fix/circle-ci | Fabio Berger | 2018-06-22 | 8 | -127/+337 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | Add missing package tests from circleci | ||||
| | * | | | | | Update ganache-core in yarn.lock | Fabio Berger | 2018-06-22 | 1 | -105/+68 |
| | | | | | | | |||||
| | * | | | | | Add coverage and test:circleci command to sra-report | Fabio Berger | 2018-06-22 | 2 | -0/+4 |
| | | | | | | | |||||
| | * | | | | | Add missing artifacts | Fabio Berger | 2018-06-22 | 2 | -0/+194 |
| | | | | | | | |||||
| | * | | | | | Skip failing tests temporarily | Fabio Berger | 2018-06-22 | 1 | -2/+6 |
| | | | | | | | |||||
| | * | | | | | Fix web3-wrapper test | Fabio Berger | 2018-06-22 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | fix name | Fabio Berger | 2018-06-22 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Add missing package tests from circleci | Fabio Berger | 2018-06-22 | 1 | -19/+64 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #752 from 0xProject/make-promises-safe-preloader | Fabio Berger | 2018-06-22 | 71 | -72/+17 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Use make-promises-safe as a preloader instead of manually importing | ||||
| | * | | | | | Use make-promises-safe as a preloader instead of manually importing | Alex Browne | 2018-06-22 | 71 | -72/+17 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge pull request #751 from 0xProject/feature/contracts/compilerRuns | Amir Bandeali | 2018-06-22 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Updated compiler runs to be 1,000,000 | ||||
| | * | | | | Updated compiler runs to be 1,000,000 | Greg Hysen | 2018-06-22 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #740 from 0xProject/feature/contracts/updateEvents | Amir Bandeali | 2018-06-22 | 18 | -112/+189 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Update events | ||||
| | * | | | | | Add event to setSignatureValidatorApproval, rename signer => signerAddress ↵ | Amir Bandeali | 2018-06-22 | 15 | -70/+144 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | accross all contracts | ||||
| | * | | | | | Add senderAddress to Fill and Cancel logs, add comments to events and types | Amir Bandeali | 2018-06-22 | 5 | -44/+47 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #747 from 0xProject/fix/sol-cov-bugs | Alex Browne | 2018-06-22 | 2 | -7/+23 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Fix some bugs in sol-cov | ||||
| | * | | | | Fix some bugs in sol-cov | Alex Browne | 2018-06-22 | 2 | -7/+23 |
| | |/ / / | |||||
| * | | | | Merge pull request #744 from NoteGio/v2-prototype-unreachable | Amir Bandeali | 2018-06-22 | 1 | -4/+0 |
| |\ \ \ \ | | | | | | | | | | | | | Remove unreachable PreSigned check | ||||
| | * | | | | Remove unreachable PreSigned check | Austin Roberts | 2018-06-22 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | This code was unreachable, as it had the exact same condition as line 206. | ||||
| * | | | | | Fix Island component | fragosti | 2018-06-22 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Add missing image assets for Chris and Mel | fragosti | 2018-06-22 | 2 | -0/+0 |
| | | | | | | |||||
| * | | | | | Merge pull request #739 from ↵ | Francesco Agosti | 2018-06-22 | 12 | -159/+267 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | 0xProject/feature/website/mobile-friendly-onboarding Add support for mobile-friendly onboarding flows | ||||
| | * | | | | Fix linting | fragosti | 2018-06-22 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Buttons look hella disabled now | fragosti | 2018-06-22 | 2 | -9/+17 |
| | | | | | | |||||
| | * | | | | Remove border radius, fix width issue for unlock step | fragosti | 2018-06-22 | 4 | -5/+12 |
| | | | | | | |||||
| | * | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-22 | 70 | -647/+1798 |
| | |\| | | | | | | | | | | | | | | | | | | | | | feature/website/mobile-friendly-onboarding | ||||
| | * | | | | Prevent prettier issue | fragosti | 2018-06-21 | 1 | -10/+8 |
| | | | | | | |||||
| | * | | | | Support mobile friendly onboarding flows | fragosti | 2018-06-21 | 9 | -87/+180 |
| | | | | | | |||||
| | * | | | | Scroll to wallet for mobile onboarding | fragosti | 2018-06-21 | 1 | -23/+28 |
| | | | | | | |||||
| | * | | | | Change Island to use styled-components | fragosti | 2018-06-20 | 1 | -15/+8 |
| | | | | | | |||||
| | * | | | | Show start onboarding flow button on top of wallet on mobile | fragosti | 2018-06-20 | 1 | -25/+29 |
| | | | | | | |||||
| * | | | | | Merge pull request #742 from 0xProject/feature/website/chris-mel-about-page | Francesco Agosti | 2018-06-22 | 2 | -2/+21 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Add Chris and Mel to about page | ||||
| | * | | | | Add Chris and Mel to about page | fragosti | 2018-06-22 | 2 | -2/+21 |
| | | | | | | |||||
| * | | | | | Merge pull request #734 from 0xProject/feature/website/shadow-styling | Brandon Millman | 2018-06-22 | 4 | -10/+8 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Update Island shadow styling and use Island in more places | ||||
| | * | | | | | Update Island shadow styling and use Island in more places | Brandon Millman | 2018-06-20 | 4 | -10/+8 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge pull request #702 from perissology/feature/missing-sources | Leonid Logvinov | 2018-06-22 | 3 | -3/+9 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | [sol-cov] Only collect coverage for provided sources | ||||
| | * | | | | | fix linter issues | perissology | 2018-06-22 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | only call getLocationByOffset if source if defined | perissology | 2018-06-21 | 1 | -4/+1 |
| | | | | | | | |||||
| | * | | | | | Collect coverage for provided sources | perissology | 2018-06-15 | 3 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When solidity generates source maps during contract compilation, the contracts are referred to by an id, which corresponds to an array index. We may not want to cover all sources that were included in a compilation, but because we use array indexes (vs. the id that is provided by solidity compiler) to map the contract to the sourceMap, the provided sourceCodes array must include the code at the correct index. This can result in empty slots in the sourceCodes array. This commit allows the coverage to only be collected for the contracts with provided sourceCode. | ||||
| * | | | | | | Merge pull request #692 from 0xProject/refactor/contracts/RemovedMixinSettlement | Remco Bloemen | 2018-06-21 | 9 | -295/+249 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | Removed MixinSettlement | ||||
| | * | | | | | Set settleOrder and settleMatchedOrders to private | Greg Hysen | 2018-06-21 | 5 | -85/+104 |
| | | | | | | | |||||
| | * | | | | | Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and ↵ | Greg Hysen | 2018-06-21 | 9 | -297/+232 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | `settleMatchedOrders` into `MixinMatchOrders` | ||||
| * | | | | | Merge pull request #733 from 0xProject/bug/website/identicon-layout | Brandon Millman | 2018-06-21 | 3 | -3/+6 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Move some layout logic out of the Identicon component | ||||
| | * | | | | | Move some layout logic out of the Identicon component | Brandon Millman | 2018-06-20 | 3 | -3/+6 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge pull request #736 from ↵ | Greg Hysen | 2018-06-21 | 27 | -218/+857 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/contracts/MixinSignatureValidatorTests MixinSignatureValidator Test Cases + Bug Fixes | ||||
| | * | | | | | Migrations after rebasing | Greg Hysen | 2018-06-21 | 13 | -188/+320 |
| | | | | | | | |||||
| | * | | | | | Linter | Greg Hysen | 2018-06-21 | 1 | -2/+1 |
| | | | | | | | |||||
| | * | | | | | Renamed constants in test wallet/validator | Greg Hysen | 2018-06-21 | 2 | -11/+11 |
| | | | | | | | |||||
| | * | | | | | Few more minor #nit wording changes | Greg Hysen | 2018-06-21 | 2 | -5/+5 |
| | | | | | | | |||||
| | * | | | | | Changed wording of two tests #nit | Greg Hysen | 2018-06-21 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Minor improvements to MixinSignatureValidator tests | Greg Hysen | 2018-06-21 | 1 | -14/+8 |
| | | | | | | | |||||
| | * | | | | | Remove .only | Greg Hysen | 2018-06-21 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Fixed two mislabelled revert reasons + Signature Validator revert tests ↵ | Greg Hysen | 2018-06-21 | 3 | -8/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | working on Geth | ||||
| | * | | | | | Minor style tweaks | Greg Hysen | 2018-06-21 | 3 | -8/+8 |
| | | | | | | | |||||
| | * | | | | | Fixed how trezor messages are signed in `signature_utils`. Now uses ↵ | Greg Hysen | 2018-06-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | `byteLength` instead of `length`. | ||||
| | * | | | | | Fixed `callAsync` template. Previously did not append `callData`, so we ↵ | Greg Hysen | 2018-06-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | couldn’t specify `from` address | ||||
| | * | | | | | Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported ↵ | Greg Hysen | 2018-06-21 | 10 | -27/+531 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | types. Fixed trezor prefix. | ||||
| * | | | | | Merge pull request #725 from 0xProject/feature/revert-trace-code-snippets | Alex Browne | 2018-06-21 | 9 | -39/+282 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Include source code snippets in revert stack traces | ||||
| | * | | | | Update version for @types/solidity-parser-antlr | Alex Browne | 2018-06-21 | 2 | -4/+4 |
| | | | | | | |||||
| | * | | | | Update to match latest type definitions and other small changes | Alex Browne | 2018-06-21 | 2 | -9/+11 |
| | | | | | | |||||
| | * | | | | Update sol-cov CHANGELOG.json | Alex Browne | 2018-06-21 | 1 | -12/+20 |
| | | | | | | |||||
| | * | | | | Include source code snippets in revert stack traces | Alex Browne | 2018-06-21 | 5 | -21/+254 |
| |/ / / / | |||||
| * | | | | Merge pull request #738 from 0xProject/fix/changelogs | Alex Browne | 2018-06-21 | 5 | -0/+112 |
| |\ \ \ \ | | | | | | | | | | | | | Fix CHANGELOG entries changed during incorrect merge (2a4456b) | ||||
| | * | | | | Fix CHANGELOG entries changed during incorrect merge (2a4456b) | Fabio Berger | 2018-06-21 | 5 | -0/+112 |
| |/ / / / | |||||
* | | | | | Add support for approveAll in assetWrapper and fillOrderScenarios | Fabio Berger | 2018-06-21 | 4 | -5/+80 |
| | | | | | |||||
* | | | | | Fix orderValidationUtils where was confusing a makerAssetAmount as a ↵ | Fabio Berger | 2018-06-21 | 3 | -11/+18 |
| | | | | | | | | | | | | | | | | | | | | takerAssetAmount | ||||
* | | | | | Improve verbose logging | Fabio Berger | 2018-06-21 | 1 | -2/+5 |
| | | | | | |||||
* | | | | | Fix merge variable name issue | Fabio Berger | 2018-06-20 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Add support for setting allowance to unlimited | Fabio Berger | 2018-06-20 | 2 | -7/+35 |
| | | | | | |||||
* | | | | | Add noop conditionals for clarity | Fabio Berger | 2018-06-20 | 1 | -0/+10 |
| | | | | | |||||
* | | | | | Rename for clarity | Fabio Berger | 2018-06-20 | 1 | -8/+8 |
| | | | | | |||||
* | | | | | Split balance and allowance amount types in prep of adding the "unlimited" ↵ | Fabio Berger | 2018-06-20 | 3 | -51/+59 |
| | | | | | | | | | | | | | | | | | | | | allowance enum value | ||||
* | | | | | Remove unneeded explicit type def | Fabio Berger | 2018-06-20 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Add TS 2.7 numeric separators to improve readability | Fabio Berger | 2018-06-20 | 1 | -6/+6 |
| | | | | | |||||
* | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-20 | 48 | -366/+1167 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ... | ||||
| * | | | | Merge pull request #637 from 0xProject/bug/contracts/eip712-191-prefix | Jacob Evans | 2018-06-20 | 11 | -107/+305 |
| |\ \ \ \ | | | | | | | | | | | | | Add missing EIP191 prefix for EIP712 and Execute Transaction | ||||
| | * | | | | Fix closing parens in liborder | Jacob Evans | 2018-06-20 | 1 | -16/+15 |
| | | | | | | |||||
| | * | | | | Merge pull request #730 from ↵ | Jacob Evans | 2018-06-20 | 1 | -18/+22 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/bug/contracts/eip712-191-prefix-asm-orderhash Assembler orderHash function | ||||
| | | * | | | | Assembler orderHash function | Remco Bloemen | 2018-06-19 | 1 | -18/+22 |
| | |/ / / / | |||||
| | * | | | | Optimize and remove redundant encodePacked | Jacob Evans | 2018-06-19 | 6 | -18/+23 |
| | | | | | | |||||
| | * | | | | Merge branch 'v2-prototype' into bug/contracts/eip712-191-prefix | Jacob Evans | 2018-06-18 | 475 | -8090/+10335 |
| | |\ \ \ \ | |||||
| | * | | | | | Rebase and update feedback | Jacob Evans | 2018-06-18 | 8 | -114/+114 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache the domain separator data with address this Use the EIP712Types enum for types everywhere Rename EIP712 struct ExecuteTransaction to ZeroExTransaction | ||||
| | * | | | | | Basic EIP712 encoder | Jacob Evans | 2018-06-08 | 3 | -40/+61 |
| | | | | | | | |||||
| | * | | | | | Update Order utils to use eip712 | Jacob Evans | 2018-06-06 | 12 | -183/+121 |
| | | | | | | | |||||
| | * | | | | | Add missing EIP191 prefix for EIP712 | Jacob Evans | 2018-06-05 | 10 | -50/+279 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #717 from ↵ | Jacob Evans | 2018-06-20 | 3 | -17/+15 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | 0xProject/feature/contracts/erc721proxy-always-safeTransferFrom ERC721Proxy Always call safeTransferFrom | ||||
| | * | | | | | Update after rebase | Jacob Evans | 2018-06-20 | 1 | -7/+1 |
| | | | | | | | |||||
| | * | | | | | ERC721Proxy Always call safeTransferFrom | Jacob Evans | 2018-06-20 | 2 | -10/+14 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #714 from 0xProject/feature/contracts/cancelOrdersUpToSender | Amir Bandeali | 2018-06-20 | 16 | -96/+600 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Make cancelOrdersUpTo compatible with sender abstraction | ||||
| | * | | | | | Rename makerEpoch => orderEpoch | Amir Bandeali | 2018-06-20 | 12 | -110/+113 |
| | | | | | | | |||||
| | * | | | | | Make cancelOrdersUpTo compatible with sender abstraction | Amir Bandeali | 2018-06-20 | 11 | -47/+548 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #724 from 0xProject/bug/website/onboarding-improvements | Francesco Agosti | 2018-06-20 | 4 | -7/+22 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix Wallet appearing over Drawer, and Onboarding not exiting when changing routes | ||||
| | * \ \ \ \ \ | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-20 | 114 | -718/+1373 |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | bug/website/onboarding-improvements | ||||
| | * | | | | | | Fix onboarding persisting when changing routes | fragosti | 2018-06-19 | 2 | -3/+12 |
| | | | | | | | | |||||
| | * | | | | | | Only elevate wallet zIndex when onboarding is in progress | fragosti | 2018-06-19 | 3 | -4/+10 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #727 from ↵ | Francesco Agosti | 2018-06-20 | 1 | -3/+7 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | 0xProject/bug/website/fix-fetching-balances-on-wallet-login Fix bug where we do not fetch balances on wallet login | ||||
| | * | | | | | | Fix linting issue | fragosti | 2018-06-19 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Fix bug where we do fetch balances on wallet login | fragosti | 2018-06-19 | 1 | -3/+7 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #732 from 0xProject/feature/update-pr-template | Brandon Millman | 2018-06-20 | 1 | -16/+2 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | Update PR template | ||||
| | * | | | | | Update PR template | Brandon Millman | 2018-06-20 | 1 | -16/+2 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #723 from 0xProject/bug/website/drawer-address | Brandon Millman | 2018-06-20 | 6 | -48/+82 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Consolidate account state display message logic | ||||
| | * | | | | | Use Image component instead of img tag | Brandon Millman | 2018-06-20 | 3 | -8/+9 |
| | | | | | | | |||||
| | * | | | | | Consolidate account state messaging logic | Brandon Millman | 2018-06-19 | 5 | -47/+80 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #706 from 0xProject/feature/website/portal-v2-analytics | Francesco Agosti | 2018-06-20 | 8 | -15/+74 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add logging to Portal V2 | ||||
| | * \ \ \ \ | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-20 | 166 | -1025/+3150 |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | feature/website/portal-v2-analytics | ||||
| * | | | | | | Merge pull request #726 from 0xProject/bug/website/late-eth-balance | Brandon Millman | 2018-06-20 | 2 | -47/+48 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Check network state immediately instead of waiting for delay | ||||
| | * | | | | | | Check network state immediately instead of waiting for delay | Brandon Millman | 2018-06-19 | 2 | -47/+48 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #683 from 0xProject/fix/contracts/memcpy | Remco Bloemen | 2018-06-19 | 1 | -10/+12 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Simplified handling of source < 32 edge case | ||||
| | * | | | | | | | Simplified handling of source < 32 edge case | Remco Bloemen | 2018-06-11 | 1 | -10/+12 |
| | | | | | | | | | |||||
| | | | * | | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-15 | 36 | -61/+946 |
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/website/portal-v2-analytics | ||||
| | | | * | | | | | | Run linter | fragosti | 2018-06-15 | 5 | -8/+21 |
| | | | | | | | | | | |||||
| | | | * | | | | | | Add Portal v2 logging | fragosti | 2018-06-15 | 8 | -15/+62 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Add ability for verbose logging | Fabio Berger | 2018-06-20 | 1 | -2/+10 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fix typo | Fabio Berger | 2018-06-19 | 1 | -2/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Rename NewOrderFactory to OrderFactoryFromScenario for clarity | Fabio Berger | 2018-06-19 | 2 | -5/+5 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Remove hack in ERC20Wrapper | Fabio Berger | 2018-06-19 | 7 | -12/+30 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Cleanup coreCombinatorialUtils | Fabio Berger | 2018-06-19 | 1 | -220/+226 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Comments and cleanup | Fabio Berger | 2018-06-19 | 1 | -20/+8 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-19 | 95 | -581/+1154 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Prettier fix Update default params in sendRawPaylodAsync for improved JSON-RPC compatibility Fix missed merge conflicts Fix additional versions and update yarn.lock Add OrderWatcherConfig type to 0x.js docs page Export OrderWatcherConfig from 0x.js Update all package versions to match latest published to NPM Update CHANGELOG's with publishes performed on development branch Rebase with latest removing PROXY_ID from transfer Split transfer impl and AssetProxyMixin change @0xproject/types to ethereum-types remove mistaken comment workaround for TypeScript trailing comma bug Document contract_templates | ||||
| * | | | | | | | | | Prettier fix | Fabio Berger | 2018-06-19 | 1 | -3/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #701 from feuGeneA/v2-prototype | Fabio Berger | 2018-06-19 | 3 | -5/+16 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Document use of contract_templates (take 2; based on v2-prototype, not master) | ||||
| | * | | | | | | | | | change @0xproject/types to ethereum-types | F. Eugene Aumson | 2018-06-15 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | remove mistaken comment | F. Eugene Aumson | 2018-06-15 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It must have been left over from when an abi-gen output was modified to be the source of this template. | ||||
| | * | | | | | | | | | workaround for TypeScript trailing comma bug | F. Eugene Aumson | 2018-06-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before this change, TypeScript compilation of the generated contract wrapper was giving me the following errors: $ abi-gen --abis 'build/contracts/*.json' --out build/types --template contract_templates/contract.handlebars --partials 'contract_templates/partials/*.handlebars' Found 7 partial templates Found 1 ABI files Processing: Migrations... Created: build/types/migrations.ts $ tsc build/types/migrations.ts(81,23): error TS1013: A rest parameter or binding pattern may not have a trailing comma. build/types/migrations.ts(108,23): error TS1013: A rest parameter or binding pattern may not have a trailing comma. build/types/migrations.ts(130,23): error TS1013: A rest parameter or binding pattern may not have a trailing comma. build/types/migrations.ts(146,25): error TS1013: A rest parameter or binding pattern may not have a trailing comma. build/types/migrations.ts(173,25): error TS1013: A rest parameter or binding pattern may not have a trailing comma. build/types/migrations.ts(195,25): error TS1013: A rest parameter or binding pattern may not have a trailing comma. info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command. Here is the generated code around the first error: 74: public setCompleted = { 75: async sendTransactionAsync( 76: completed: BigNumber, 77: txData: Partial<TxData> = {}, 78: ): Promise<string> { 79: const self = this as any as MigrationsContract; 80: const inputAbi = self._lookupAbi('setCompleted(uint256)').inputs; 81: [completed, 82: ] = BaseContract._formatABIDataItemList(inputAbi, [completed, 83: ], BaseContract._bigNumberToString.bind(self)); All of the other errors are the same, a destructuring assignment with a single element but with a trailing comma. This is legal JavaScript but it is not allowed by the TypeScript compiler, apparently per the bug described at https://github.com/Microsoft/TypeScript/issues/24628 . While awaiting the 3.0 version of TypeScript, it's a simple enough change to have the template not append a trailing comma. | ||||
| | * | | | | | | | | | Document contract_templates | F. Eugene Aumson | 2018-06-15 | 1 | -0/+15 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #728 from 0xProject/fix/post-dev-publish | Fabio Berger | 2018-06-19 | 85 | -443/+921 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Update v2-prototype w/ development changes since publish | ||||
| | * | | | | | | | | | Fix missed merge conflicts | Fabio Berger | 2018-06-19 | 3 | -14/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fix additional versions and update yarn.lock | Fabio Berger | 2018-06-19 | 9 | -97/+75 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Add OrderWatcherConfig type to 0x.js docs page | Fabio Berger | 2018-06-19 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Export OrderWatcherConfig from 0x.js | Fabio Berger | 2018-06-19 | 1 | -0/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Update all package versions to match latest published to NPM | Fabio Berger | 2018-06-19 | 31 | -234/+234 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Update CHANGELOG's with publishes performed on development branch | Fabio Berger | 2018-06-19 | 50 | -111/+622 |
| | | |_|/ / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #731 from avonian/v2-prototype | Leonid Logvinov | 2018-06-19 | 2 | -4/+9 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix sendRawPaylodAsync for improved JSON-RPC compatibility | ||||
| | * | | | | | | | | | Update default params in sendRawPaylodAsync for improved JSON-RPC compatibility | Ara Kevonian | 2018-06-19 | 2 | -4/+9 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #659 from ↵ | Jacob Evans | 2018-06-19 | 6 | -129/+206 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/contracts/split-proxy-internal-logic Split transfer implementation and AssetProxyMixin | ||||
| | * | | | | | | | | Rebase with latest removing PROXY_ID from transfer | Jacob Evans | 2018-06-18 | 5 | -95/+111 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Split transfer impl and AssetProxyMixin | Jacob Evans | 2018-06-18 | 4 | -95/+156 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
* | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-19 | 73 | -415/+1965 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ... | ||||
| * | | | | | | | | Increase number of columns in relayer grid for small screens | Brandon Millman | 2018-06-19 | 1 | -1/+1 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #716 from ↵ | Amir Bandeali | 2018-06-19 | 9 | -53/+331 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/contracts/publicSignatureValidator Make isValidSignature public | ||||
| | * | | | | | | | Make isValidSignature public | Amir Bandeali | 2018-06-19 | 9 | -53/+331 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #713 from 0xProject/feature/contracts/batchFillReturn | Amir Bandeali | 2018-06-19 | 2 | -10/+28 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Make batchFill methods return FIllResults struct | ||||
| | * | | | | | | | Make batchFill methods return FIllResults struct | Amir Bandeali | 2018-06-19 | 2 | -10/+28 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #722 from 0xProject/improvement/publishing-v2 | Fabio Berger | 2018-06-19 | 9 | -116/+321 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Improvements to pre-publishing checks | ||||
| | * | | | | | | | Remove remove_tags script | Fabio Berger | 2018-06-19 | 1 | -57/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | Small fixes | Fabio Berger | 2018-06-19 | 3 | -10/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Use semver package instead of getNextPatchVersion | Fabio Berger | 2018-06-19 | 2 | -7/+16 |
| | | | | | | | | | |||||
| | * | | | | | | | Use semver library instead of semverUtils | Fabio Berger | 2018-06-19 | 6 | -73/+17 |
| | | | | | | | | | |||||
| | * | | | | | | | small fixes | Fabio Berger | 2018-06-19 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Show all errors of a given kind at once rather then throwing after the first ↵ | Fabio Berger | 2018-06-19 | 1 | -10/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instance is encountered | ||||
| | * | | | | | | | fix package.json | Fabio Berger | 2018-06-19 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Add more prepublish checks | Fabio Berger | 2018-06-19 | 8 | -39/+332 |
| | | | | | | | | | |||||
| | * | | | | | | | remove remove_tags script | Fabio Berger | 2018-06-19 | 2 | -4/+0 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #712 from 0xProject/feature/website/portal-facelift | Brandon Millman | 2018-06-19 | 6 | -42/+68 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Change relayer grid tile to use logos and primary colors | ||||
| | * | | | | | | | Create a shared Image component | Brandon Millman | 2018-06-19 | 2 | -35/+48 |
| | | | | | | | | | |||||
| | * | | | | | | | Update RelayerGridTile render logic to incorportate colors and logos | Brandon Millman | 2018-06-17 | 3 | -14/+24 |
| | | | | | | | | | |||||
| | * | | | | | | | Add max width to top bar | Brandon Millman | 2018-06-17 | 2 | -1/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Set max-width for LargeLayout | Brandon Millman | 2018-06-17 | 1 | -4/+5 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge pull request #704 from 0xProject/bug/website/fix-filling-order | Francesco Agosti | 2018-06-19 | 8 | -4/+21 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix filling orders on Portal | ||||
| | * | | | | | | | Adjust version in changelog | fragosti | 2018-06-19 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Prettier | fragosti | 2018-06-15 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Add to changelog for contract-wrappers | fragosti | 2018-06-15 | 1 | -0/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix typo | fragosti | 2018-06-15 | 1 | -1/+1 |
| | | | | | | | | |