Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v2-prototype' into eth-lightwallet-subprovider-final | Jacob Evans | 2018-07-02 | 282 | -8797/+9337 |
|\ | |||||
| * | Update relayer grid tiles to use Text | Brandon Millman | 2018-07-01 | 2 | -50/+17 |
| * | Merge pull request #781 from 0xProject/refactor/contracts/fileStructure | Amir Bandeali | 2018-06-30 | 129 | -260/+256 |
| |\ | |||||
| | * | Fix build | Amir Bandeali | 2018-06-30 | 8 | -32/+32 |
| | * | Update file structure | Amir Bandeali | 2018-06-30 | 126 | -200/+196 |
| |/ | |||||
| * | Merge pull request #770 from 0xProject/feature/migrations/kovan-deploy | Amir Bandeali | 2018-06-30 | 28 | -236/+3815 |
| |\ | |||||
| | * | Update 2.0.0 artifacts | Amir Bandeali | 2018-06-30 | 5 | -149/+99 |
| | * | Move ledgerhq module declarations to typescript-typings | Amir Bandeali | 2018-06-30 | 7 | -79/+59 |
| | * | Export LedgerEthereumClient type in subproviders | Amir Bandeali | 2018-06-30 | 4 | -49/+19 |
| | * | Update artifacts | Amir Bandeali | 2018-06-30 | 4 | -12/+26 |
| | * | Add logging and updated artifacts | Amir Bandeali | 2018-06-30 | 6 | -32/+46 |
| | * | Fix migrations | Amir Bandeali | 2018-06-30 | 8 | -3453/+3405 |
| | * | Run prettier | Amir Bandeali | 2018-06-30 | 4 | -3369/+3442 |
| | * | Add Kovan artifacts | Amir Bandeali | 2018-06-30 | 4 | -0/+3373 |
| | * | Use ledger subprovider | Amir Bandeali | 2018-06-30 | 15 | -52/+165 |
| | * | Add Kovan migrations | Amir Bandeali | 2018-06-30 | 11 | -15/+155 |
| * | | Merge pull request #787 from 0xProject/feature/website/portal-onboarding-polish | Francesco Agosti | 2018-06-30 | 19 | -360/+354 |
| |\ \ | | |/ | |/| | |||||
| | * | Remove state variable from Link component in Portal | fragosti | 2018-06-30 | 1 | -4/+1 |
| | * | Remove extra call to scrollIntoView for wallet in onboarding | fragosti | 2018-06-30 | 1 | -4/+0 |
| | * | Bump automatic show onborading delay by 1000ms | fragosti | 2018-06-30 | 1 | -1/+1 |
| | * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-30 | 61 | -5509/+1798 |
| | |\ | |||||
| | * | | Fix onboarding always starting | fragosti | 2018-06-30 | 1 | -1/+2 |
| | * | | Rename userHasAllowances bool to follow proper convention | fragosti | 2018-06-30 | 2 | -6/+6 |
| | * | | Allow you to continue the onboarding flow once youve installed metamask and r... | fragosti | 2018-06-30 | 5 | -17/+18 |
| | * | | Use Image component where relevant and add back tracked token timestamp logic | fragosti | 2018-06-30 | 3 | -8/+24 |
| | * | | Bold all balances in onboarding | fragosti | 2018-06-29 | 2 | -6/+8 |
| | * | | Customize allowance setting onboarding step if you have your allowances set | fragosti | 2018-06-29 | 2 | -0/+4 |
| | * | | Re-center react-popper on every step | fragosti | 2018-06-29 | 2 | -16/+4 |
| | * | | Fix button hover and active hover state | fragosti | 2018-06-29 | 1 | -1/+1 |
| | * | | Show eth balance in add eth balance onboarding step | fragosti | 2018-06-29 | 3 | -11/+16 |
| | * | | Change onboarding flow to communicate 3 steps | fragosti | 2018-06-29 | 2 | -6/+10 |
| | * | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-29 | 49 | -1013/+2599 |
| | |\ \ | |||||
| | * | | | Scroll to top when going to relayers page from onboarding | fragosti | 2018-06-28 | 1 | -0/+1 |
| | * | | | Bring you directly to relayers page once you finish onboarding | fragosti | 2018-06-28 | 3 | -1/+14 |
| | * | | | Remove period in title from last step | fragosti | 2018-06-28 | 1 | -1/+1 |
| | * | | | Always restart onboarding from 0 and other small improvements | fragosti | 2018-06-28 | 2 | -3/+5 |
| | * | | | Customize flow depending on what steps you've completed | fragosti | 2018-06-28 | 4 | -20/+43 |
| | * | | | Break wrapping ETH into a 3rd step | fragosti | 2018-06-28 | 2 | -5/+24 |
| | * | | | Fix animation when coming from bottom | fragosti | 2018-06-28 | 1 | -0/+6 |
| | * | | | Fix width issue with onboarding card on mobile | fragosti | 2018-06-28 | 2 | -1/+3 |
| | * | | | Clicking overlay closes onboarding | fragosti | 2018-06-28 | 4 | -6/+12 |
| | * | | | Fix z index issue with wrap buttons and onboarding cards | fragosti | 2018-06-28 | 2 | -1/+2 |
| | * | | | Break wrath ETH step into 2 | fragosti | 2018-06-28 | 3 | -70/+72 |
| | * | | | Fix skip button position on first step | fragosti | 2018-06-28 | 1 | -11/+15 |
| | * | | | Make onboarding bounce around less | fragosti | 2018-06-28 | 2 | -13/+5 |
| | * | | | Scroll to wallet when onboarding automatically starts as well | fragosti | 2018-06-28 | 1 | -1/+4 |
| | * | | | Change asset for final onboarding step | fragosti | 2018-06-28 | 1 | -217/+122 |
| * | | | | Merge pull request #797 from 0xProject/refactor/contracts/registerAssetProxy | Amir Bandeali | 2018-06-30 | 12 | -203/+68 |
| |\ \ \ \ | |||||
| | * | | | | Make registerAssetProxy append only | Amir Bandeali | 2018-06-30 | 12 | -203/+68 |
| |/ / / / | |||||
| * | | | | Update staging api link | Brandon Millman | 2018-06-30 | 1 | -1/+1 |
| * | | | | Merge pull request #793 from 0xProject/feature/contracts/transferFromFallback | Amir Bandeali | 2018-06-30 | 12 | -383/+437 |
| |\ \ \ \ | |||||
| | * | | | | Change getTransactionReceipt to awaitTransactionMined | Amir Bandeali | 2018-06-30 | 1 | -1/+1 |
| | * | | | | Merge pull request #796 from 0xProject/fix/contracts/failingTransactionAssert... | Amir Bandeali | 2018-06-30 | 2 | -27/+38 |
| | |\ \ \ \ | |||||
| | | * | | | | Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codes | Alex Browne | 2018-06-30 | 2 | -27/+38 |
| | |/ / / / | |||||
| | * | | | | Fix deployment to geth | Amir Bandeali | 2018-06-30 | 2 | -7/+6 |
| | * | | | | Fix tests | Amir Bandeali | 2018-06-30 | 6 | -79/+146 |
| | * | | | | Remove transferFrom, implement in fallback function | Amir Bandeali | 2018-06-30 | 6 | -290/+267 |
| | | |_|/ | | |/| | | |||||
| * / | | | Move /docs route to the end | Brandon Millman | 2018-06-30 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #792 from 0xProject/feature/website/wallet-polish | Brandon Millman | 2018-06-30 | 24 | -397/+585 |
| |\ \ \ | |||||
| | * | | | Change function to a const | Brandon Millman | 2018-06-30 | 1 | -2/+2 |
| | * | | | Move wallet scrollIntoView into PortalOnboardingFlow | Brandon Millman | 2018-06-30 | 2 | -7/+7 |
| | * | | | Add dollar sign to NullTokenRow | Brandon Millman | 2018-06-29 | 1 | -1/+1 |
| | * | | | Remove unused imports and variables | Brandon Millman | 2018-06-29 | 5 | -20/+1 |
| | * | | | Refactor inline styles out of Wallet | Brandon Millman | 2018-06-29 | 6 | -132/+139 |
| | * | | | Remove some hardcoded MetaMask colors | Brandon Millman | 2018-06-29 | 2 | -3/+5 |
| | * | | | Create AccountConnection component | Brandon Millman | 2018-06-29 | 3 | -31/+61 |
| | * | | | Fix scrollbar bug | Brandon Millman | 2018-06-29 | 1 | -1/+1 |
| | * | | | Start onboarding from relayer index | Brandon Millman | 2018-06-29 | 1 | -6/+20 |
| | * | | | Fix learn how to set up account layout | Brandon Millman | 2018-06-29 | 2 | -11/+13 |
| | * | | | Fix typo | Brandon Millman | 2018-06-29 | 1 | -1/+1 |
| | * | | | Get rid of unused stuff in wallet | Brandon Millman | 2018-06-29 | 1 | -65/+1 |
| | * | | | Fix body overlay on mobile | Brandon Millman | 2018-06-29 | 2 | -3/+3 |
| | * | | | Change learn how to update your account styling | Brandon Millman | 2018-06-29 | 1 | -27/+17 |
| | * | | | Fix key issue and remove WalletDisconnectedItem | Brandon Millman | 2018-06-29 | 2 | -112/+1 |
| | * | | | Implement new locked and uninstalled states | Brandon Millman | 2018-06-29 | 7 | -7/+178 |
| | * | | | Fix off center icon in wallet | Brandon Millman | 2018-06-29 | 1 | -4/+7 |
| | * | | | Change wallet margin based on hover to prevent re-layout | Brandon Millman | 2018-06-29 | 1 | -0/+1 |
| | * | | | Update ProviderDisplay with new design | Brandon Millman | 2018-06-29 | 5 | -37/+118 |
| | * | | | Implement provider name in header | Brandon Millman | 2018-06-29 | 2 | -4/+18 |
| | * | | | Implement loading body rows | Brandon Millman | 2018-06-29 | 4 | -28/+80 |
| | * | | | Added Circle component | Brandon Millman | 2018-06-29 | 3 | -6/+21 |
| * | | | | Merge pull request #774 from 0xProject/style/contracts/abiEncodeAsmComments | Amir Bandeali | 2018-06-30 | 2 | -0/+22 |
| |\ \ \ \ | |||||
| | * | | | | Updated hashing comments as-per PR | Greg Hysen | 2018-06-29 | 1 | -9/+4 |
| | * | | | | Comments for ASM hashing | Greg Hysen | 2018-06-26 | 2 | -0/+27 |
| * | | | | | Merge pull request #794 from 0xProject/fix/devnet-minimum-blocks | Alex Browne | 2018-06-30 | 4 | -24/+42 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add @0xproject/utils as dependency to dev-utils/package.json | Alex Browne | 2018-06-29 | 1 | -0/+1 |
| | * | | | | | Improve reliability of the minimum block number hack for the devnet/geth | Alex Browne | 2018-06-29 | 3 | -24/+41 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge pull request #783 from 0xProject/miscenaleous-fixes | Fabio Berger | 2018-06-29 | 31 | -5088/+1148 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Fix merge | Fabio Berger | 2018-06-29 | 1 | -4/+0 |
| | * | | | | Merge v2-prototype | Fabio Berger | 2018-06-29 | 53 | -1014/+2688 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #791 from 0xProject/bug/website/broken-not-found | Brandon Millman | 2018-06-29 | 3 | -3/+5 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Fix NotFound component and render 0x.js docs for /docs | Brandon Millman | 2018-06-29 | 3 | -3/+5 |
| |/ / / / | |||||
| * | | | | Merge pull request #780 from 0xProject/feature/website/support-new-metamask | Francesco Agosti | 2018-06-29 | 11 | -265/+263 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-29 | 134 | -4139/+4913 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #762 from 0xProject/feature/website/scroll-to-token | Brandon Millman | 2018-06-29 | 12 | -35/+56 |
| |\ \ \ \ \ | |||||
| | * | | | | | Remove isTracked field on token in favor of trackedTimestamp | Brandon Millman | 2018-06-29 | 11 | -26/+31 |
| | * | | | | | Use moment and lodash | Brandon Millman | 2018-06-29 | 2 | -2/+3 |
| | * | | | | | Sort wallet tokens by timestamp added and scroll to newly added token | Brandon Millman | 2018-06-29 | 6 | -11/+26 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #707 from 0xProject/feature/combinatorial-testing | Fabio Berger | 2018-06-28 | 29 | -711/+2276 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Remove unused constants | Fabio Berger | 2018-06-28 | 1 | -2/+0 |
| | * | | | | Reduce the userAddresses to the individual addresses actually used by tests, ... | Fabio Berger | 2018-06-28 | 7 | -19/+32 |
| | * | | | | Add await time constant | Fabio Berger | 2018-06-28 | 1 | -0/+2 |
| | * | | | | Add missing awaitTransactionSuccessAsync calls | Fabio Berger | 2018-06-28 | 1 | -6/+10 |
| | * | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 63 | -3140/+1876 |
| | |\ \ \ \ | |||||
| | * | | | | | Move combinatorial fillOrder tests into the `fill_ordere` test file | Fabio Berger | 2018-06-27 | 2 | -48/+21 |
| | * | | | | | Fix tests | Fabio Berger | 2018-06-27 | 1 | -3/+6 |
| | * | | | | | Fix enum name | Fabio Berger | 2018-06-27 | 1 | -9/+9 |
| | * | | | | | Fix type issue | Fabio Berger | 2018-06-27 | 1 | -2/+2 |
| | * | | | | | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 12 | -88/+92 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Update AbstractAssetWrapper | Fabio Berger | 2018-06-26 | 1 | -1/+1 |
| | * | | | | | | Rename to singular | Fabio Berger | 2018-06-26 | 1 | -9/+9 |
| | * | | | | | | Fix merge issues | Fabio Berger | 2018-06-26 | 5 | -17/+21 |
| | * | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-26 | 36 | -379/+532 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fix inconsistency between contract and reference implementation of order vali... | Fabio Berger | 2018-06-26 | 2 | -0/+5 |
| | * | | | | | | | Prettier fixes | Fabio Berger | 2018-06-26 | 2 | -8/+2 |
| | * | | | | | | | Fix tslint issues | Fabio Berger | 2018-06-26 | 9 | -24/+4 |
| | * | | | | | | | Fix lint errors | Fabio Berger | 2018-06-26 | 3 | -5/+2 |
| | * | | | | | | | Fix revertReason | Fabio Berger | 2018-06-25 | 1 | -1/+1 |
| | * | | | | | | | Update yarn.lock | Fabio Berger | 2018-06-25 | 1 | -0/+43 |
| | * | | | | | | | Remove no longer used method | Fabio Berger | 2018-06-25 | 1 | -16/+0 |
| | * | | | | | | | Check revert reasons in declarative and combinatorial tests | Fabio Berger | 2018-06-25 | 2 | -61/+67 |
| | * | | | | | | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 12 | -66/+58 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Add missing import | Fabio Berger | 2018-06-25 | 1 | -1/+4 |
| | * | | | | | | | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 16 | -129/+236 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-25 | 179 | -1859/+3476 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||||
| | * | | | | | | | | | 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 takerAss... | Fabio Berger | 2018-06-21 | 3 | -11/+18 |
| | * | | | | | | | | | 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" al... | Fabio Berger | 2018-06-20 | 3 | -51/+59 |
| | * | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-19 | 73 | -415/+1965 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-15 | 8 | -23/+132 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Add ability to tweak the relevant balances/allowances for the maker and taker... | Fabio Berger | 2018-06-15 | 4 | -78/+380 |
| | * | | | | | | | | | | | | | - Refactor assetWrapper to contain more of the normalizing logic instead of e... | Fabio Berger | 2018-06-15 | 10 | -84/+341 |
| | * | | | | | | | | | | | | | Rename OrderAmountScenario to OrderAssetAmountScenario and convert generateOr... | Fabio Berger | 2018-06-14 | 5 | -60/+59 |
| | * | | | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-14 | 29 | -38/+814 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Use a defaultFillScenario in fillOrder tests | Fabio Berger | 2018-06-14 | 1 | -36/+39 |
| | * | | | | | | | | | | | | | | Fix incorrect string values in enum | Fabio Berger | 2018-06-14 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | Fix calculation of expFilledTakerAmount and expected values in events emitted | Fabio Berger | 2018-06-14 | 1 | -4/+7 |
| | * | | | | | | | | | | | | | | Replace initial set of legacy manually written fillOrder tests with declarati... | Fabio Berger | 2018-06-14 | 2 | -434/+186 |
| | * | | | | | | | | | | | | | | Add ability to specify takerAssetFillAmount and taker scenarios as part of a ... | Fabio Berger | 2018-06-14 | 4 | -35/+153 |
| | * | | | | | | | | | | | | | | Fix divide by zero bug | Fabio Berger | 2018-06-14 | 1 | -3/+3 |
| | * | | | | | | | | | | | | | | Move orderFill combinatorialTests to exchange folder | Fabio Berger | 2018-06-13 | 1 | -4/+4 |
| | * | | | | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-13 | 64 | -1015/+1931 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Implement initial set of orderFill combinatorial tests | Fabio Berger | 2018-06-13 | 13 | -490/+784 |
| | * | | | | | | | | | | | | | | | Refactor ERC20 and ERC721 wrappers for V2 and introduce the assetWrapper supe... | Fabio Berger | 2018-06-13 | 4 | -9/+95 |
| | * | | | | | | | | | | | | | | | Remaining refactors of order-utils components for V2 | Fabio Berger | 2018-06-13 | 5 | -46/+48 |
| | * | | | | | | | | | | | | | | | For some reason order-watcher tests were timeing out so I increased the timeo... | Fabio Berger | 2018-06-13 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | Remove comment since we have added the tests | Fabio Berger | 2018-06-13 | 1 | -5/+0 |
| | * | | | | | | | | | | | | | | | Variable rename for clarity | Fabio Berger | 2018-06-13 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-12 | 176 | -1101/+3564 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-08 | 45 | -84/+93 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fix/order-utils/remaining-v2-changes' into feature/combinatoria... | Fabio Berger | 2018-06-08 | 7 | -55/+37 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fix/order-utils/remaining-v2-changes' into feature/combinatoria... | Fabio Berger | 2018-06-08 | 5 | -183/+201 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | POC: Generates an order from spec, get's the amount fillable | Fabio Berger | 2018-06-08 | 7 | -32/+462 |
| | * | | | | | | | | | | | | | | | | | | | merge v2-prototype | Fabio Berger | 2018-06-07 | 291 | -2388/+2711 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | Implement initial generateOrder function that given the scenario values for a... | Fabio Berger | 2018-06-07 | 2 | -0/+244 |
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #766 from perissology/feature/solcov-ignore | Fabio Berger | 2018-06-28 | 4 | -2/+104 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | rename function | perissology | 2018-06-27 | 2 | -8/+8 |
| | * | | | | | | | | | | | | | | | | | | | | | add /*solcov ignore next*/ tests | perissology | 2018-06-25 | 2 | -0/+52 |
| | * | | | | | | | | | | | | | | | | | | | | | support ignoring entire contracts | perissology | 2018-06-25 | 1 | -7/+11 |
| | * | | | | | | | | | | | | | | | | | | | | | add ability to ignore covering specific code blocks | perissology | 2018-06-23 | 2 | -2/+48 |
| | | | | | | | | | | | | | | | | | | | | * | | Changing provider to ledger more consistent with previous experience | fragosti | 2018-06-28 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | * | | Fix convention stuff | fragosti | 2018-06-28 | 2 | -20/+20 |
| | | | | | | | | | | | | | | | | | | | | * | | Remove IS_MAINNET_ENABLED config | fragosti | 2018-06-28 | 4 | -74/+49 |
| | | | | | | | | | | | | | | | | | | | | * | | Rename all corresponding bools to shouldUseLedgerProvider | fragosti | 2018-06-28 | 1 | -13/+13 |
| | | | | | | | | | | | | | | | | | | | | * | | Never use trackedTokenState when fetching new token state | fragosti | 2018-06-27 | 1 | -6/+5 |
| | | | | | | | | | | | | | | | | | | | | * | | Fix bug where we are requesting tokens on a different network | fragosti | 2018-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | * | | Remove unused variables | fragosti | 2018-06-27 | 4 | -24/+9 |
| | | | | | | | | | | | | | | | | | | | | * | | Make unsubscribing work | fragosti | 2018-06-27 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | * | | Fix stateful ledger dialog edge state | fragosti | 2018-06-27 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | * | | Get things working with legacy portal | fragosti | 2018-06-27 | 1 | -10/+8 |
| | | | | | | | | | | | | | | | | | | | | * | | Fix subtle issues with ledger config dialog | fragosti | 2018-06-27 | 3 | -11/+13 |
| | | | | | | | | | | | | | | | | | | | | * | | Ledger to metamask to ledger working | fragosti | 2018-06-27 | 3 | -42/+35 |
| | | | | | | | | | | | | | | | | | | | | * | | Have basic network switching working | fragosti | 2018-06-26 | 6 | -120/+158 |
| | | | | | | | | | | | | | | | | | | | | * | | Remove existing networkId watching logic from BlockchainWatcher | fragosti | 2018-06-26 | 2 | -28/+15 |
| | | | | | | | | | | | | | | | | | | | | | * | Merge pull request #795 from 0xProject/miscellaneous-fixes/v2-exchange-regist... | Jacob Evans | 2018-06-29 | 1 | -5/+26 |
| | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | * | Register the asset proxies to exchange | Jacob Evans | 2018-06-29 | 1 | -5/+26 |
| | | | | | | | | | | | | | | | | | | | | | |/ | |||||
| | | | | | | | | | | | | | | | | | | | | | * | Remove network 50 details | Fabio Berger | 2018-06-28 | 6 | -48/+12 |
| | | | | | | | | | | | | | | | | | | | | | * | Re-generate and clean up artifacts for 2.0.0 | Fabio Berger | 2018-06-28 | 23 | -5076/+1144 |
| | | | | | | | | | | | | | | | | | | | | | * | Add missing `AssetProxyOwner` from `compile:v2` command | Fabio Berger | 2018-06-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | * | Improve `ganache-core`'s `GanacheOpts` type and require it instead of `any` | Fabio Berger | 2018-06-28 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | * | Encode ZRX address as needed. | Fabio Berger | 2018-06-28 | 3 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | * | Add optimizer settings to `migrations` `compiler.json` | Fabio Berger | 2018-06-28 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | * | Update ganache-cli to latest | Fabio Berger | 2018-06-28 | 2 | -5/+23 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #763 from prettymuchbryce/invalid-argument-error | Fabio Berger | 2018-06-27 | 9 | -7/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | Fix tslint | Fabio Berger | 2018-06-27 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'v2-prototype' into invalid-argument-error | Fabio Berger | 2018-06-27 | 115 | -4256/+3591 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Improve 'web3-provider-engine' typings | Nikita Galkin | 2018-06-27 | 2 | -1/+18 |
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #773 from 0xProject/feature/contracts/abi-calldata-proxy | Amir Bandeali | 2018-06-27 | 50 | -3094/+1785 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Fix build | Amir Bandeali | 2018-06-27 | 5 | -3/+392 |
| | * | | | | | | | | | | | | | | | | | | | | | Update artifacts | Amir Bandeali | 2018-06-27 | 30 | -2689/+1363 |
| | * | | | | | | | | | | | | | | | | | | | | | Add more revert reasons to tests | Amir Bandeali | 2018-06-27 | 4 | -19/+44 |
| | * | | | | | | | | | | | | | | | | | | | | | Make dispatchTransferFrom revert with reason from AssetProxy on failure | Amir Bandeali | 2018-06-27 | 2 | -7/+6 |
| | * | | | | | | | | | | | | | | | | | | | | | Remove redundant files, hard code function selector in dispatchTransferFrom, ... | Amir Bandeali | 2018-06-27 | 17 | -896/+201 |
| | * | | | | | | | | | | | | | | | | | | | | | Updated offset of receiverData length to reflect new assetData encoding. | Greg Hysen | 2018-06-27 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | | | | | ERC20 Custom storage layout | Remco Bloemen | 2018-06-27 | 2 | -3/+5 |
| | * | | | | | | | | | | | | | | | | | | | | | Golf the authorization check | Remco Bloemen | 2018-06-27 | 2 | -122/+132 |
| | * | | | | | | | | | | | | | | | | | | | | | ERC20 manual memory layout | Remco Bloemen | 2018-06-27 | 1 | -11/+6 |
| | * | | | | | | | | | | | | | | | | | | | | | ERC20 inline return | Remco Bloemen | 2018-06-27 | 1 | -6/+11 |
| | * | | | | | | | | | | | | | | | | | | | | | ERC721 inline return | Remco Bloemen | 2018-06-27 | 1 | -8/+9 |
| | * | | | | | | | | | | | | | | | | | | | | | Golf ERC721 transferFrom | Remco Bloemen | 2018-06-27 | 2 | -3/+166 |
| | * | | | | | | | | | | | | | | | | | | | | | Inline ERC20 tranferFrom selector constant | Remco Bloemen | 2018-06-27 | 1 | -4/+3 |
| | * | | | | | | | | | | | | | | | | | | | | | Optimize ERC20 transferFrom | Remco Bloemen | 2018-06-27 | 1 | -2/+126 |
| |/ / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | Polish asset picker layout | Brandon Millman | 2018-06-27 | 1 | -4/+4 |
| * | | | | | | | | | | | | | | | | | | | | | Update relayer grid fallback icon | Brandon Millman | 2018-06-27 | 2 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #777 from 0xProject/feature/website/browser-detection | Brandon Millman | 2018-06-27 | 6 | -18/+61 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Change metamask install link based on browser | Brandon Millman | 2018-06-26 | 6 | -18/+104 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #776 from 0xProject/ethereum-js-tx-1.3.5 | Alex Browne | 2018-06-27 | 4 | -5/+54 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Use ethereumjs-tx@1.3.5 instead of our fork | Alex Browne | 2018-06-26 | 4 | -5/+54 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #760 from 0xProject/refactor/check-revert-reasons | Fabio Berger | 2018-06-27 | 16 | -140/+255 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Temporarily switch revert reasons to `TransferFailed`. Should be `InvalidAmou... | Fabio Berger | 2018-06-27 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | | | Expect RevertReason be passed in, not string | Fabio Berger | 2018-06-26 | 1 | -1/+5 |
| | * | | | | | | | | | | | | | | | | | | | Rename RevertReasons to RevertReason since singular enum names are more common | Fabio Berger | 2018-06-26 | 11 | -96/+96 |
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-26 | 36 | -364/+521 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #743 from 0xProject/feature/contracts/abi-encoded | Amir Bandeali | 2018-06-26 | 35 | -361/+478 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Don't use variables for revert reasons | Amir Bandeali | 2018-06-26 | 14 | -86/+86 |
| | * | | | | | | | | | | | | | | | | | | Add comments to dispatchTransferFrom | Amir Bandeali | 2018-06-26 | 1 | -30/+56 |
| | * | | | | | | | | | | | | | | | | | | Document IAssetData | Remco Bloemen | 2018-06-26 | 1 | -0/+3 |
| | * | | | | | | | | | | | | | | | | | | Compute bytes4 proxyid constants | Remco Bloemen | 2018-06-26 | 2 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | | Return inplace bytes in LibBytes.readBytesWithLength | Remco Bloemen | 2018-06-26 | 1 | -9/+7 |
| | * | | | | | | | | | | | | | | | | | | Add Greg's documentation to MixinErc721Transfer | Remco Bloemen | 2018-06-26 | 1 | -33/+44 |
| | * | | | | | | | | | | | | | | | | | | Add Greg's documentation to MixinErc20Transfer | Remco Bloemen | 2018-06-26 | 1 | -13/+35 |
| | * | | | | | | | | | | | | | | | | | | Gas golf the transfer success logic | Remco Bloemen | 2018-06-26 | 1 | -11/+10 |
| | * | | | | | | | | | | | | | | | | | | Optimize like in PR #767 | Remco Bloemen | 2018-06-26 | 3 | -34/+157 |
| | * | | | | | | | | | | | | | | | | | | Run prettier and fix linting errors | Amir Bandeali | 2018-06-26 | 3 | -55/+54 |
| | * | | | | | | | | | | | | | | | | | | Fix tests | Amir Bandeali | 2018-06-26 | 5 | -21/+4 |
| | * | | | | | | | | | | | | | | | | | | Update tests | Remco Bloemen | 2018-06-26 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | | Fix AssetProxyUtils | Remco Bloemen | 2018-06-26 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | Update tests | Remco Bloemen | 2018-06-26 | 2 | -33/+20 |
| | * | | | | | | | | | | | | | | | | | | Fix ERC721Proxy TokenId | Remco Bloemen | 2018-06-26 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | Update AssetProxyUtils | Remco Bloemen | 2018-06-26 | 1 | -90/+41 |
| | * | | | | | | | | | | | | | | | | | | Add IAssetData | Remco Bloemen | 2018-06-26 | 2 | -1/+2 |
| | * | | | | | | | | | | | | | | | | | | WIP | Remco Bloemen | 2018-06-26 | 5 | -23/+36 |
| | * | | | | | | | | | | | | | | | | | | ABI encoded asset data | Remco Bloemen | 2018-06-26 | 9 | -29/+51 |
| | * | | | | | | | | | | | | | | | | | | Remove proxyId argument from dispatchTransferFrom | Remco Bloemen | 2018-06-26 | 8 | -41/+20 |
| |/ / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #772 from 0xProject/add-coverage-instructions | Fabio Berger | 2018-06-26 | 1 | -3/+43 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | |