Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #712 from 0xProject/feature/website/portal-facelift | Brandon Millman | 2018-06-19 | 6 | -42/+68 |
|\ | |||||
| * | 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 |
|\ \ | |||||
| * | | 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 |
| * | | Fix filling orders on Portal | fragosti | 2018-06-15 | 7 | -4/+13 |
* | | | Merge pull request #711 from 0xProject/website/feature/prettier-onboarding-co... | Francesco Agosti | 2018-06-19 | 25 | -85/+801 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Finish last onboarding step | fragosti | 2018-06-16 | 7 | -2/+277 |
| * | | Finish set allowance step | fragosti | 2018-06-16 | 2 | -5/+32 |
| * | | Add onboarding assets | fragosti | 2018-06-16 | 7 | -0/+82 |
| * | | Add all steps to their own file | fragosti | 2018-06-16 | 11 | -71/+196 |
| * | | Prettify account setup and add eth steps of onboarding | fragosti | 2018-06-16 | 3 | -3/+32 |
| * | | Make metamask part of the fow pretty | fragosti | 2018-06-16 | 3 | -7/+35 |
| * | | Make start onboarding button pretty | fragosti | 2018-06-16 | 1 | -2/+17 |
| * | | Improve styles of onboarding tooltip | fragosti | 2018-06-16 | 7 | -53/+117 |
| * | | Add Pointer component | fragosti | 2018-06-15 | 2 | -16/+87 |
* | | | Merge pull request #700 from 0xProject/fix/contracts/tokenbugs | Remco Bloemen | 2018-06-16 | 1 | -1/+29 |
|\ \ \ | |||||
| * | | | Handle tokens that do not return bool | Remco Bloemen | 2018-06-14 | 1 | -1/+29 |
| | |/ | |/| | |||||
* | | | Merge pull request #705 from 0xProject/feature/revert-trace-subprovider | Alex Browne | 2018-06-15 | 14 | -103/+365 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Change wording of error message when you try to use more than one subprovider | Alex Browne | 2018-06-15 | 1 | -1/+1 |
| * | | Remove redundant check in trace.ts and revert_trace.ts | Alex Browne | 2018-06-15 | 2 | -6/+1 |
| * | | Fix linter errors | Alex Browne | 2018-06-15 | 1 | -0/+1 |
| * | | De-duplicate code by refactoring subprovider classes | Alex Browne | 2018-06-15 | 5 | -204/+89 |
| * | | Fix linter errors and remove coverage.json | Alex Browne | 2018-06-15 | 1 | -2/+1 |
| * | | Remove unused variables and other small fixes | Alex Browne | 2018-06-15 | 4 | -10/+11 |
| * | | Reverse order of stack trace to match behavior of most other language stack t... | Alex Browne | 2018-06-15 | 1 | -1/+1 |
| * | | Fix a bug in revert_trace.ts | Alex Browne | 2018-06-15 | 4 | -40/+55 |
| * | | Introduce subprovider for printing revert stack traces | Alex Browne | 2018-06-15 | 10 | -50/+416 |
* | | | Merge pull request #695 from 0xProject/feature/website/onboarding-flow-allowa... | Francesco Agosti | 2018-06-15 | 8 | -23/+132 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Run prettify | fragosti | 2018-06-15 | 1 | -7/+8 |
| * | | Implement allowance and final flow step | fragosti | 2018-06-13 | 6 | -21/+42 |
| * | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-13 | 225 | -1468/+4849 |
| |\ \ | |||||
| * \ \ | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-07 | 308 | -2450/+2786 |
| |\ \ \ | |||||
| * | | | | Render TokenAllowance | fragosti | 2018-06-07 | 2 | -5/+20 |
| * | | | | Add utilities for getting tokens from tokensByAddress | fragosti | 2018-06-07 | 4 | -3/+20 |
| * | | | | Wrap AllowanceToggle in redux container | fragosti | 2018-06-07 | 5 | -11/+66 |
* | | | | | Merge pull request #685 from 0xProject/feature/website/jobs-page | Brandon Millman | 2018-06-14 | 29 | -38/+814 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Add back redirector behind feature flag | Brandon Millman | 2018-06-14 | 3 | -1/+19 |
| * | | | | Update minHeight in Text | Brandon Millman | 2018-06-14 | 1 | -1/+1 |
| * | | | | Use Text components in Values | Brandon Millman | 2018-06-14 | 1 | -3/+7 |
| * | | | | Use spread operator instead of React.createElement | Brandon Millman | 2018-06-14 | 3 | -7/+7 |
| * | | | | Fix issue with positions hash | Brandon Millman | 2018-06-13 | 1 | -19/+21 |
| * | | | | Revert localhost config | Brandon Millman | 2018-06-13 | 1 | -1/+1 |
| * | | | | Use Text in Teams | Brandon Millman | 2018-06-13 | 1 | -3/+7 |
| * | | | | Use Text in OpenPositions | Brandon Millman | 2018-06-13 | 3 | -5/+8 |
| * | | | | Use Text component for HeaderItem | Brandon Millman | 2018-06-13 | 2 | -7/+11 |
| * | | | | Remove FloatingImage | Brandon Millman | 2018-06-13 | 3 | -12/+3 |
| * | | | | Move FilledImage into components/ui | Brandon Millman | 2018-06-13 | 3 | -2/+2 |
| * | | | | Replace FlatButton with Button in Retry | Brandon Millman | 2018-06-13 | 1 | -12/+12 |
| * | | | | Fix incorrect colors | Brandon Millman | 2018-06-13 | 1 | -2/+2 |
| * | | | | Add font family to Button component and use in Join0x component | Brandon Millman | 2018-06-13 | 2 | -13/+16 |
| * | | | | Consolidate jobs page grey colors with shared colors | Brandon Millman | 2018-06-13 | 1 | -2/+2 |
| * | | | | Fix lint errors | Brandon Millman | 2018-06-13 | 10 | -15/+12 |
| * | | | | Remove extra packages | Brandon Millman | 2018-06-13 | 2 | -2/+0 |
| * | | | | Implement small open positions | Brandon Millman | 2018-06-13 | 8 | -120/+232 |
| * | | | | Implement large screen open positions | Brandon Millman | 2018-06-13 | 9 | -104/+187 |
| * | | | | Teams section | Brandon Millman | 2018-06-13 | 6 | -75/+70 |
| * | | | | Benefits section | Brandon Millman | 2018-06-13 | 3 | -12/+75 |
| * | | | | Refactor into BulletedItemList component | Brandon Millman | 2018-06-13 | 2 | -24/+33 |
| * | | | | Rework values section | Brandon Millman | 2018-06-13 | 2 | -44/+13 |
| * | | | | Polish mission section and photo section | Brandon Millman | 2018-06-13 | 7 | -40/+95 |
| * | | | | Add link to open positions section | Brandon Millman | 2018-06-13 | 3 | -6/+20 |
| * | | | | Add scroll to top for jobs page | Brandon Millman | 2018-06-13 | 1 | -21/+28 |
| * | | | | Skeleton for jobs page and initial implementation | Brandon Millman | 2018-06-13 | 22 | -12/+457 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #694 from 0xProject/refactor-sol-cov | Alex Browne | 2018-06-13 | 5 | -306/+264 |
|\ \ \ \ | |||||
| * | | | | Rename _coverageCollector -> _profilerCollector in TraceCollectionSubprovider | Alex Browne | 2018-06-13 | 1 | -4/+4 |
| * | | | | Refactor sol-cov to de-duplicate code for coverage and profiling | Alex Browne | 2018-06-13 | 5 | -306/+264 |
* | | | | | Merge pull request #682 from 0xProject/feature/contracts/popProxyId | Amir Bandeali | 2018-06-13 | 36 | -532/+710 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Rename popByte and popAddress | Amir Bandeali | 2018-06-13 | 5 | -18/+18 |
| * | | | | Hard code test addresses/bytes32 instead of generating pseudorandom ones | Amir Bandeali | 2018-06-13 | 1 | -19/+16 |
| * | | | | Update artifacts | Amir Bandeali | 2018-06-13 | 9 | -188/+182 |
| * | | | | Unpop byte rather than making deep copy | Amir Bandeali | 2018-06-13 | 4 | -90/+95 |
| * | | | | Pass gas in to marketBuyOrdersNoThrow | Amir Bandeali | 2018-06-13 | 1 | -1/+1 |
| * | | | | Looks up the memory location of makerAssetData/takerAssetData | Greg Hysen | 2018-06-13 | 1 | -0/+2 |
| * | | | | Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATA | Amir Bandeali | 2018-06-13 | 5 | -23/+13 |
| * | | | | Add tests for deepCopyBytes and missing write methods from LibBytes | Amir Bandeali | 2018-06-13 | 3 | -70/+201 |
| * | | | | Pop id from assetData before dispatching to AssetProxies | Amir Bandeali | 2018-06-13 | 20 | -209/+268 |
| |/ / / | |||||
* | | | | Rename computeCoverageAsync -> computeSingleTraceCoverageAsync | Alex Browne | 2018-06-13 | 4 | -4/+4 |
* | | | | Fix linter errors | Alex Browne | 2018-06-13 | 3 | -10/+6 |
* | | | | Refactor sol-cov to avoid keeping traceInfo in memory | Alex Browne | 2018-06-13 | 6 | -211/+76 |
|/ / / | |||||
* | | | Upgrade solidity-parser-entlr 0.2.11 => 0.2.12 | Leonid Logvinov | 2018-06-13 | 1 | -1/+1 |
* | | | Fix import order | Leonid Logvinov | 2018-06-12 | 1 | -1/+1 |
* | | | Merge pull request #689 from 0xProject/geth-increase-startup-tx-delay | Leonid Logvinov | 2018-06-12 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Increase delay when sending transactions during devnet startup | Alex Browne | 2018-06-12 | 1 | -2/+2 |
* | | | | Merge pull request #687 from 0xProject/feature/metacoin-docs | Leonid Logvinov | 2018-06-12 | 6 | -13/+194 |
|\ \ \ \ | |||||
| * | | | | Fix typos | Leonid Logvinov | 2018-06-12 | 4 | -10/+11 |
| * | | | | Fix linter issues | Leonid Logvinov | 2018-06-12 | 2 | -2/+2 |
| * | | | | Add profiler and geth tests to metacoin | Leonid Logvinov | 2018-06-12 | 6 | -14/+194 |
* | | | | | Merge pull request #688 from 0xProject/feature/await-transaction-speedup | Leonid Logvinov | 2018-06-12 | 19 | -150/+874 |
|\ \ \ \ \ | |||||
| * | | | | | Add note to web3-wrapper CHANGELOG.json | Alex Browne | 2018-06-12 | 1 | -0/+5 |
| * | | | | | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts t... | Alex Browne | 2018-06-12 | 18 | -150/+869 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #690 from 0xProject/feature/truffle-sol-cov-fixes | Leonid Logvinov | 2018-06-12 | 4 | -7/+21 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add CHANGELOGs | Leonid Logvinov | 2018-06-12 | 1 | -0/+12 |
| * | | | | Speed-up sol-cov | Leonid Logvinov | 2018-06-12 | 1 | -2/+2 |
| * | | | | Don't throw when no config file is found | Leonid Logvinov | 2018-06-12 | 1 | -4/+6 |
| * | | | | Fix solidityVersion schema regex | Leonid Logvinov | 2018-06-12 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #684 from 0xProject/fix/contract-wrappers/exchangeTransfer... | Fabio Berger | 2018-06-12 | 88 | -155/+977 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Stop exporting ArtifactWriter | Fabio Berger | 2018-06-12 | 2 | -5/+0 |
| * | | | Fix no-unused-variable tslint rule to include parameters and fix issues | Fabio Berger | 2018-06-12 | 66 | -113/+104 |
| * | | | Fix linter exclude rule | Fabio Berger | 2018-06-12 | 1 | -1/+1 |
| * | | | Validate all signature types rather then only ECSignatures | Fabio Berger | 2018-06-12 | 1 | -4/+12 |
| * | | | Store the instantiated OrderValidationUtils | Fabio Berger | 2018-06-12 | 1 | -2/+2 |
| * | | | Remove global hooks from tests and deploy contracts from within the specific ... | Fabio Berger | 2018-06-12 | 2 | -54/+32 |
| * | | | Merge branch 'v2-prototype' into fix/contract-wrappers/exchangeTransferSimulator | Fabio Berger | 2018-06-12 | 44 | -481/+869 |
| |\ \ \ | |||||
| * | | | | Fix tslint issues | Fabio Berger | 2018-06-12 | 5 | -8/+5 |
| * | | | | Add back artifacts file | Fabio Berger | 2018-06-12 | 1 | -0/+13 |
| * | | | | Move OrderValidationUtils (+ tests) and ExchangeTransferSimulator to order-utils | Fabio Berger | 2018-06-12 | 16 | -18/+786 |
| * | | | | export parseECSignature method | Fabio Berger | 2018-06-12 | 2 | -0/+8 |
| * | | | | Export ArtifactWriter from migrations package | Fabio Berger | 2018-06-12 | 2 | -0/+9 |
| * | | | | Remove unused artifact file | Fabio Berger | 2018-06-12 | 1 | -13/+0 |
| * | | | | Pass in generated contract wrapper to orderValidationUtils at instantiation | Fabio Berger | 2018-06-11 | 1 | -10/+25 |
| * | | | | Refactor orderValidationUtils to use the generated contract wrapper instead o... | Fabio Berger | 2018-06-11 | 1 | -7/+11 |
| * | | | | Refactor ExchangeTransferSimulator public interface to accet an AbstractBalan... | Fabio Berger | 2018-06-11 | 6 | -19/+71 |
* | | | | | Add EmitStatement to ASTVisitor | Leonid Logvinov | 2018-06-12 | 1 | -0/+3 |
| |/ / / |/| | | | |||||
* | | | | Fix a bug in SolCompilerArtifacts adapter config overriding | Leonid Logvinov | 2018-06-12 | 1 | -2/+2 |
* | | | | Increase timeout for contract migrations | Leonid Logvinov | 2018-06-09 | 2 | -2/+2 |
* | | | | Remove some copy-paste code | Leonid Logvinov | 2018-06-09 | 1 | -36/+6 |
* | | | | Await transactions in migrations | Leonid Logvinov | 2018-06-09 | 1 | -35/+46 |
* | | | | Fix typos | Leonid Logvinov | 2018-06-09 | 5 | -7/+23 |
* | | | | Await transactions in migrations | Leonid Logvinov | 2018-06-09 | 1 | -4/+12 |
* | | | | Await fake transactions | Leonid Logvinov | 2018-06-09 | 1 | -4/+4 |
* | | | | Fix a typo | Leonid Logvinov | 2018-06-09 | 1 | -1/+1 |
* | | | | Implement SolidityProfiler & adapt sol-cov to work with Geth | Leonid Logvinov | 2018-06-09 | 40 | -439/+825 |
|/ / / | |||||
* | | | Merge pull request #627 from 0xProject/feature/contracts/erc721SafeTransferFrom | Greg Hysen | 2018-06-09 | 45 | -429/+1641 |
|\ \ \ | |||||
| * | | | Linter changes to contracts | Greg Hysen | 2018-06-09 | 4 | -21/+6 |
| * | | | Fixed assetProxyUtils for linter | Greg Hysen | 2018-06-09 | 1 | -2/+2 |
| * | | | Updated LibBytes error messages | Greg Hysen | 2018-06-08 | 3 | -28/+36 |
| * | | | Cleanup after last rebase | Greg Hysen | 2018-06-08 | 5 | -8/+7 |
| * | | | Updated tests to use new revert handler | Greg Hysen | 2018-06-08 | 2 | -13/+13 |
| * | | | Minor fixes after rebase | Greg Hysen | 2018-06-08 | 3 | -753/+11 |
| * | | | Camelcase in memCopy | Greg Hysen | 2018-06-08 | 5 | -25/+25 |
| * | | | Moved some constants to global scope in assetProxyUtils | Greg Hysen | 2018-06-08 | 1 | -18/+26 |
| * | | | Style updates to contracts | Greg Hysen | 2018-06-08 | 7 | -28/+23 |
| * | | | Union types for generalized decodeAssetData | Greg Hysen | 2018-06-08 | 3 | -21/+6 |
| * | | | Fixed a styling throughout contracts. Moved closing parenthesis for long list... | Greg Hysen | 2018-06-08 | 8 | -31/+62 |
| * | | | Removed setting makerAssetData/takerAssetData from tests where values are sam... | Greg Hysen | 2018-06-08 | 1 | -34/+0 |
| * | | | Fixed merge error when rebasing wrt length variable in asset data decoders | Greg Hysen | 2018-06-08 | 2 | -4/+4 |
| * | | | Style updates to ERC721 onReceiver | Greg Hysen | 2018-06-08 | 7 | -16/+27 |
| * | | | Fixed after rebase | Greg Hysen | 2018-06-08 | 3 | -5/+5 |
| * | | | Fixes after rebasing | Greg Hysen | 2018-06-08 | 6 | -49/+54 |
| * | | | updated migrations artifacts | Greg Hysen | 2018-06-08 | 1 | -1/+735 |
| * | | | Fixed up after rebasing. Contracts build and tests pass | Greg Hysen | 2018-06-08 | 8 | -53/+34 |
| * | | | Style audit for proxies + libmem + libbytes | Greg Hysen | 2018-06-08 | 8 | -50/+72 |
| * | | | Style audit proxies | Greg Hysen | 2018-06-08 | 3 | -20/+64 |
| * | | | Call safeTransferFrom only when there is receiver data present | Greg Hysen | 2018-06-08 | 3 | -13/+20 |
| * | | | Fixed formatting in memory layout | Greg Hysen | 2018-06-08 | 1 | -6/+6 |
| * | | | Resolved edge case in Memcpy where where send would eventually turn "negative... | Greg Hysen | 2018-06-08 | 2 | -144/+154 |
| * | | | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. T... | Greg Hysen | 2018-06-08 | 9 | -95/+64 |
| * | | | Converged on naming scheme for asset data: renamed all instances of assetMeta... | Greg Hysen | 2018-06-08 | 23 | -323/+290 |
| * | | | proxyData -> assetData | Greg Hysen | 2018-06-08 | 2 | -12/+12 |
| * | | | Implement memcpy using masking and end-aligned words | Remco Bloemen | 2018-06-08 | 1 | -59/+85 |
| * | | | Add tests for word loop iteration | Remco Bloemen | 2018-06-08 | 1 | -2/+6 |
| * | | | Add test for zero-size overlap | Remco Bloemen | 2018-06-08 | 1 | -1/+3 |
| * | | | Add test cases | Remco Bloemen | 2018-06-08 | 1 | -17/+133 |
| * | | | Cleanup test script | Remco Bloemen | 2018-06-08 | 1 | -16/+1 |
| * | | | Convert Solidity tests to vectors | Remco Bloemen | 2018-06-08 | 2 | -232/+6 |
| * | | | Generate tests from vectors | Remco Bloemen | 2018-06-08 | 2 | -5/+64 |
| * | | | Tests for writing bytes to nested bytes | Greg Hysen | 2018-06-08 | 1 | -9/+91 |
| * | | | Fixed up wording in memcpy | Greg Hysen | 2018-06-08 | 1 | -3/+3 |
| * | | | Tons of tests around nested byte arrays and ERC721 receiver | Greg Hysen | 2018-06-08 | 6 | -32/+223 |
| * | | | Test for onReceived erc721 callback | Greg Hysen | 2018-06-08 | 6 | -5/+126 |
| * | | | LibAssetProxyDecoder tests | Greg Hysen | 2018-06-08 | 3 | -35/+70 |
| * | | | Foundation for TestLibAssetProxyDecoder | Greg Hysen | 2018-06-08 | 8 | -2/+216 |
| * | | | Tests for libMem | Greg Hysen | 2018-06-08 | 5 | -16/+80 |
| * | | | LibMem + TestLibMem + LibAssetProxyDecoder + DummyERC721Receiver | Greg Hysen | 2018-06-08 | 8 | -27/+581 |
* | | | | Run contracts tests against Geth in CI | Alex Browne | 2018-06-08 | 1 | -0/+2 |
|/ / / | |||||
* | | | Add missing awaitTransactionSuccessAsync calls | Alex Browne | 2018-06-08 | 2 | -23/+53 |
* | | | Fix linter issue | Fabio Berger | 2018-06-08 | 1 | -1/+0 |
* | | | Fix linter issue | Fabio Berger | 2018-06-08 | 1 | -1/+0 |
* | | | Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils | Fabio Berger | 2018-06-08 | 45 | -285/+288 |
|\ \ \ | |||||
| * \ \ | Merge pull request #678 from 0xProject/fix/order-utils/remaining-v2-changes | Fabio Berger | 2018-06-08 | 7 | -206/+206 |
| |\ \ \ | |||||
| | * | | | Fix tslint failure | Fabio Berger | 2018-06-08 | 5 | -10/+11 |
| | * | | | Pass in fee and assetAmount rather then the whole signedOrder | Fabio Berger | 2018-06-08 | 3 | -45/+26 |
| | * | | | Revert to returning orderState on invalid order | Fabio Berger | 2018-06-08 | 1 | -1/+6 |
| | * | | | - Refactor remainingFillableCalculator so it can be used for the maker and ta... | Fabio Berger | 2018-06-08 | 2 | -141/+162 |
| | * | | | Update naming in orderStateUtils to use asset over token, also removed cancel... | Fabio Berger | 2018-06-08 | 3 | -48/+40 |
| * | | | | Merge pull request #670 from 0xProject/fix/generated-nesting | Fabio Berger | 2018-06-08 | 25 | -62/+65 |
| |\ \ \ \ | |||||
| | * | | | | Fix tslint issues | Fabio Berger | 2018-06-08 | 2 | -2/+2 |
| | * | | | | Fix missing paths | Fabio Berger | 2018-06-08 | 2 | -5/+5 |
| | * | | | | Fixed path | Fabio Berger | 2018-06-07 | 4 | -12/+12 |
| | * | | | | merge v2-prototype | Fabio Berger | 2018-06-07 | 287 | -2364/+2701 |
| | |\| | | | |||||
| | * | | | | move generated contract wrappers from `contract_wrappers/generated/` to `gene... | Fabio Berger | 2018-06-06 | 26 | -65/+68 |
| * | | | | | Merge pull request #676 from 0xProject/feature/mocha-source-maps | Alex Browne | 2018-06-08 | 16 | -17/+17 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Use source-map-support package to include correct line numbers in mocha | Alex Browne | 2018-06-07 | 16 | -17/+17 |
* | | | | | | Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils | Fabio Berger | 2018-06-07 | 286 | -2348/+2687 |
|\| | | | | | |||||
| * | | | | | Merge pull request #673 from mohoff/patch-1 | Fabio Berger | 2018-06-07 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | typo | mohoff | 2018-06-07 | 1 | -1/+1 |
| * | | | | | Run prettier | fragosti | 2018-06-07 | 8 | -27/+13 |
| * | | | | | Remove unused variable | fragosti | 2018-06-07 | 1 | -1/+0 |
| * | | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-07 | 9 | -39/+102 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge pull request #672 from 0xProject/feature/website/account-management-polish | Brandon Millman | 2018-06-07 | 9 | -39/+102 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | Change shouldRenderHeader prop to shouldHideHeader | Brandon Millman | 2018-06-07 | 5 | -13/+13 |
| | | * | | | Fix undefined ether balance | Brandon Millman | 2018-06-06 | 3 | -9/+13 |
| | | * | | | Make scrollability a prop on TradeHistory | Brandon Millman | 2018-06-06 | 2 | -3/+10 |
| | | * | | | Fix EthWrappers background color | Brandon Millman | 2018-06-06 | 1 | -2/+2 |
| | | * | | | Update GenerateOrderForm and FillOrder components | Brandon Millman | 2018-06-06 | 4 | -6/+34 |
| | | * | | | Update EthWrappers component | Brandon Millman | 2018-06-06 | 2 | -1/+7 |
| | | * | | | Update TradeHistory component | Brandon Millman | 2018-06-06 | 2 | -3/+16 |
| | | * | | | Hide action column on mainnet | Brandon Millman | 2018-06-06 | 1 | -13/+14 |
| | | * | | | Fix TokenBalances background color | Brandon Millman | 2018-06-06 | 1 | -1/+1 |
| | | * | | | Add isFullWidth prop to TokenBalances component | Brandon Millman | 2018-06-06 | 2 | -1/+5 |
| * | | | | | Fix linting issues | fragosti | 2018-06-07 | 4 | -6/+3 |
| * | | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-07 | 59 | -255/+1016 |
| |\| | | | | |||||
| | * | | | | Apply prettier | Alex Browne | 2018-06-07 | 2 | -3/+10 |
| | * | | | | Update contracts tests after rebase | Alex Browne | 2018-06-07 | 2 | -14/+14 |
| | * | | | | Apply various fixes based on PR feedback | Alex Browne | 2018-06-07 | 5 | -20/+79 |
| | * | | | | Document debug_increaseTime method and fix typo in devnet README | Alex Browne | 2018-06-07 | 1 | -1/+36 |
| | * | | | | Use an enum for ProviderType in contracts/src/utils/web3_wrapper | Alex Browne | 2018-06-07 | 1 | -4/+21 |
| | * | | | | Update contracts package README | Alex Browne | 2018-06-07 | 1 | -0/+9 |
| | * | | | | Update relevant changelogs | Alex Browne | 2018-06-07 | 2 | -0/+30 |
| | * | | | | Remove global gas estimate buffer | Alex Browne | 2018-06-07 | 1 | -5/+1 |
| | * | | | | Add Async suffix to relevant assertions | Alex Browne | 2018-06-07 | 14 | -112/+112 |
| | * | | | | Fix linter errors | Alex Browne | 2018-06-07 | 3 | -8/+38 |
| | * | | | | Update more things to work with both Geth and Ganache | Alex Browne | 2018-06-07 | 6 | -50/+64 |
| | * | | | | Small fixes and cleanup | Alex Browne | 2018-06-07 | 6 | -55/+5 |
| | * | | | | Add additional gas to calls to fillOrderNoThrow | Alex Browne | 2018-06-07 | 3 | -152/+55 |
| | * | | | | Remove extra logs and other small fixes | Alex Browne | 2018-06-07 | 4 | -19/+14 |
| | * | | | | Throw in web3-wrapper when rawCallResult is '0x' | Alex Browne | 2018-06-07 | 4 | -6/+20 |
| | * | | | | Remove outdated todo | Alex Browne | 2018-06-07 | 1 | -4/+0 |
| | * | | | | Fix some more test cases, especially those that call increaseTime | Alex Browne | 2018-06-07 | 4 | -55/+84 |
| | * | | | | Add support for TEST_PROVIDER env var | Alex Browne | 2018-06-07 | 2 | -5/+6 |
| | * | | | | Update more tests to pass on Geth | Alex Browne | 2018-06-07 | 4 | -21/+29 |
| | * | | | | Get LibBytes tests working on both Ganache and Geth | Alex Browne | 2018-06-07 | 3 | -25/+34 |
| | * | | | | Add ability to quickly switch between Geth and Ganache by changing a const | Alex Browne | 2018-06-07 | 2 | -4/+23 |
| | * | | | | Update exchange/transactions tests for Geth error messages | Alex Browne | 2018-06-07 | 1 | -4/+4 |
| | * | | | | Update some tests after rebase | Alex Browne | 2018-06-07 | 3 | -20/+29 |
| | * | | | | Add more transactions to Geth on init. Skip tests that are failing. | Alex Browne | 2018-06-07 | 16 | -645/+771 |
| | * | | | | Increase gas limit to account for bigger ExchangeContract | Alex Browne | 2018-06-07 | 2 | -2/+2 |
| | * | | | | Replace constant.REVERT test assertions with expectRevertOrAlwaysFailingTrans... | Alex Browne | 2018-06-07 | 12 | -170/+143 |
| | * | | | | Update code after rebase | Alex Browne | 2018-06-07 | 3 | -3/+8 |
| | * | | | | Use Geth for contract tests | Alex Browne | 2018-06-07 | 22 | -11/+337 |
| | * | | | | Merge pull request #669 from 0xProject/bug/website/fix-balance-rendering | Brandon Millman | 2018-06-07 | 1 | -9/+14 |
| | |\ \ \ \ | |||||
| | | * | | | | Update balance amount rendering logic | Brandon Millman | 2018-06-06 | 1 | -9/+14 |
| | | |/ / / | |||||
| | * | | | | Merge pull request #653 from 0xProject/feature/ethereum-types-docs | Leonid Logvinov | 2018-06-07 | 15 | -2/+190 |
| | |\ \ \ \ | |||||
| | | * | | | | Add EthereumTypes to _renderDrawer | Leonid Logvinov | 2018-06-07 | 1 | -0/+11 |
| | | * | | | | Add a TODO comment on StructLog type in the docs | Leonid Logvinov | 2018-06-05 | 1 | -1/+1 |
| | | * | | | | Add a documentation page for ethereum types | Leonid Logvinov | 2018-06-05 | 15 | -2/+179 |
| * | | | | | | Get build and tests to pass | fragosti | 2018-06-07 | 33 | -1524/+1440 |
| * | | | | | | Fix merge conflict | fragosti | 2018-06-07 | 1 | -14/+0 |
| * | | | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-07 | 11 | -16/+12 |
| |\| | | | | | |||||
| | * | | | | | Fix linter issues in generated contract wrappers | Leonid Logvinov | 2018-06-07 | 3 | -4/+4 |
| | * | | | | | Stop running prettier on generated files | Leonid Logvinov | 2018-06-07 | 8 | -13/+9 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Use CLI for exclude | fragosti | 2018-06-07 | 6 | -14/+5 |
| * | | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-07 | 31 | -52/+62 |
| |\| | | | | |||||
| * | | | | | Add missing import | Fabio Berger | 2018-06-06 | 1 | -1/+1 |