| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| | * | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
|/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Document all the contract test options in README | Fabio Berger | 2018-06-25 | 1 | -3/+43 |
| |/ / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | Move RevertReasons to @0xproject/types package | Fabio Berger | 2018-06-25 | 12 | -66/+58 |
| | * | | | | | | | | | | | | | | | | Add missing import | Fabio Berger | 2018-06-25 | 1 | -1/+4 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-25 | 46 | -908/+1178 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge pull request #735 from feuGeneA/metacoin-independence | Leonid Logvinov | 2018-06-25 | 2 | -3/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | 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 | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | 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 | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | 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 | 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 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | 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 ch... | Fabio Berger | 2018-06-22 | 3 | -21/+31 |
| | | | | * | | | | | | | | | | | | | | | 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 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | 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 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | 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 |
| | | | | | | | * | | | | | | | | | | | | | Run prettier | Bryce | 2018-06-26 | 2 | -11/+11 |
| | | | | | | | * | | | | | | | | | | | | | CHANGELOG spacing | Bryce Neal | 2018-06-23 | 1 | -1/+1 |
| | | | | | | | * | | | | | | | | | | | | | Typings and comment | Bryce | 2018-06-23 | 4 | -2/+16 |
| | | | | | | | * | | | | | | | | | | | | | Update at abi_decoder | Bryce | 2018-06-23 | 6 | -16/+22 |
| | | | | | | | * | | | | | | | | | | | | | CHANGELOG spacing | Bryce Neal | 2018-06-23 | 1 | -1/+1 |
| | | | | | | | * | | | | | | | | | | | | | Fix CHANGELOG spacing. | Bryce Neal | 2018-06-23 | 1 | -1/+1 |
| | | | | | | | * | | | | | | | | | | | | | Fix spacing | Bryce | 2018-06-23 | 1 | -1/+1 |
| | | | | | | | * | | | | | | | | | | | | | Add CHANGELOG entry | Bryce | 2018-06-23 | 1 | -0/+10 |
| | | | | | | | * | | | | | | | | | | | | | Remove package-lock | Bryce | 2018-06-23 | 1 | -8674/+0 |
| | | | | | | | * | | | | | | | | | | | | | Re-throw if not INVALID_ARGUMENT | Bryce | 2018-06-23 | 1 | -0/+1 |
| | | | | | | | * | | | | | | | | | | | | | Address INVALID_ARGUMENT issue | Bryce | 2018-06-23 | 5 | -3/+8688 |
| | |_|_|_|_|_|/ / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | | | 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 | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|/ / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | 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 | 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 | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | Add event to setSignatureValidatorApproval, rename signer => signerAddress ac... | Amir Bandeali | 2018-06-22 | 15 | -70/+144 |
| | * | | | | | | | | | | | | | | | | | 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 | 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 | Austin Roberts | 2018-06-22 | 1 | -4/+0 |
| * | | | | | | | | | | | | | | | | | 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 0xProject/feature/website/mobile-friendly-onboar... | Francesco Agosti | 2018-06-22 | 12 | -159/+267 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | 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 |
| | |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | 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 |
