Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | 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 | |
| * | | | | | | Fix remaining tslint issues | Fabio Berger | 2018-06-06 | 5 | -26/+2 | |
| * | | | | | | merge v2-prototype | Fabio Berger | 2018-06-06 | 69 | -3860/+1198 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Exclude generate contract wrappers from tslint | Fabio Berger | 2018-06-06 | 6 | -6/+6 | |
| * | | | | | | | remove unused imports from 0x.js test | Fabio Berger | 2018-06-06 | 1 | -1/+1 | |
| * | | | | | | | Remove unused imports from contract handlebar template | Fabio Berger | 2018-06-06 | 1 | -2/+2 | |
| * | | | | | | | Some cleanup | fragosti | 2018-06-06 | 1 | -11/+3 | |
| * | | | | | | | Linter now passes | fragosti | 2018-06-06 | 37 | -110/+48 | |
| * | | | | | | | Try enabling no-unused-variable... | fragosti | 2018-06-05 | 180 | -420/+110 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Move spawnSwitchErr to @0xproject/utils | Fabio Berger | 2018-06-06 | 15 | -25/+24 | |
| |_|/ / / / |/| | | | | | ||||||
* | | | | | | Add missing `yarn` | Fabio Berger | 2018-06-06 | 1 | -1/+1 | |
* | | | | | | Add missing build:all command | Fabio Berger | 2018-06-06 | 1 | -0/+1 | |
* | | | | | | Merge v2-prototype | Fabio Berger | 2018-06-06 | 48 | -127/+457 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge branch 'v2-prototype' into fixes/misc-small-fixes | Fabio Berger | 2018-06-06 | 31 | -109/+436 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| | * | | | | Remove TranslatedText | fragosti | 2018-06-06 | 1 | -15/+0 | |
| | * | | | | Fix prettier | Brandon Millman | 2018-06-06 | 1 | -1/+1 | |
| | * | | | | Merge pull request #668 from 0xProject/feature/website/move-disclaimer | Brandon Millman | 2018-06-06 | 1 | -16/+18 | |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | | * | | | Move portal disclaimer to the account management section | Brandon Millman | 2018-06-06 | 1 | -16/+18 | |
| | * | | | | Add back UMD bundles for 0x.js | Leonid Logvinov | 2018-06-06 | 1 | -1/+3 | |
| | * | | | | Move prices into portal | Brandon Millman | 2018-06-06 | 2 | -30/+32 | |
| | |/ / / | ||||||
| | * | | | Merge pull request #652 from 0xProject/feature/website/landing-subscribe-butt... | Francesco Agosti | 2018-06-06 | 29 | -62/+398 | |
| | |\ \ \ | ||||||
| | | * | | | Use stricter check for subscribe input text | fragosti | 2018-06-06 | 1 | -1/+2 | |
| | | * | | | Make buttons stack on mobile | fragosti | 2018-06-05 | 2 | -5/+6 | |
| | | * | | | Do not show subscribe form if language is not english | fragosti | 2018-06-05 | 1 | -1/+1 | |
| | | * | | | Address PR feedback | fragosti | 2018-06-05 | 8 | -40/+46 | |
| | | * | | | Lint and cleanup | fragosti | 2018-06-02 | 4 | -7/+7 | |
| | | * | | | Merge branch 'feature/website/landing-subscribe-button' into feature/website/... | fragosti | 2018-06-02 | 29 | -50/+378 | |
| | | |\ \ \ | ||||||
| | | | * | | | Implement subscription form | fragosti | 2018-06-02 | 7 | -68/+288 | |
| | | | * | | | Add styled-components and polished | fragosti | 2018-06-02 | 20 | -19/+36 | |
| | | | * | | | Have basic newsletter subscribe form working | fragosti | 2018-06-02 | 6 | -2/+93 | |
| * | | | | | | Mention the gasLimit until in the doc comment | Fabio Berger | 2018-06-05 | 1 | -1/+1 | |
| * | | | | | | Merge branch 'v2-prototype' into fixes/misc-small-fixes | Fabio Berger | 2018-06-05 | 1 | -2/+2 | |
| |\| | | | | | ||||||
| * | | | | | | Replace `-` with `_` in yarn script name so that we are consistent across yar... | Fabio Berger | 2018-06-05 | 15 | -15/+15 | |
| * | | | | | | Add `switch-default` tslint rule and add missing default statement | Fabio Berger | 2018-06-05 | 2 | -0/+4 | |
| * | | | | | | Remove outdated link in ABI-gen README | Fabio Berger | 2018-06-05 | 1 | -2/+1 | |
* | | | | | | | - Rename watch to watch_without_deps in sub-packages, so dev's don't confuse ... | Fabio Berger | 2018-06-05 | 31 | -53/+61 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #661 from feuGeneA/patch-1 | Fabio Berger | 2018-06-05 | 1 | -2/+2 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Fix broken link to `contract_templates` | F. Eugene Aumson | 2018-06-05 | 1 | -2/+2 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #656 from 0xProject/refactor/fill-scenarios/for-v2 | Fabio Berger | 2018-06-05 | 22 | -3764/+715 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use _.omit for conciseness | Fabio Berger | 2018-06-05 | 1 | -15/+5 | |
| * | | | | | revert multisig change | Fabio Berger | 2018-06-05 | 1 | -1/+1 | |
| * | | | | | reset multisign | Fabio Berger | 2018-06-05 | 1 | -1/+1 | |
| * | | | | | Add PR to changelog | Fabio Berger | 2018-06-05 | 1 | -1/+2 | |
| * | | | | | Update fill-scenarios for V2 and add CHANGELOG entry | Fabio Berger | 2018-06-05 | 2 | -64/+91 | |
| * | | | | | Remove unused compact artifacts from order-utils | Fabio Berger | 2018-06-05 | 7 | -1845/+0 | |
| * | | | | | Add missing exports to order-utils and add CHANGELOG entry | Fabio Berger | 2018-06-05 | 2 | -1/+18 | |
| * | | | | | Add new 2.0 artifacts to migrations | Fabio Berger | 2018-06-05 | 2 | -0/+601 | |
| * | | | | | Remove compact_artifacts and replace with updated artifacts | Fabio Berger | 2018-06-05 | 9 | -1852/+12 | |
| * | | | | | Update fill-scenarios to depend on v2 updated order-utils and types. Needed t... | Fabio Berger | 2018-06-05 | 1 | -2/+2 | |
* | | | | | | Merge pull request #658 from 0xProject/dont-automatically-rebuild-for-tests | Alex Browne | 2018-06-05 | 15 | -19/+31 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Remove duplicate cleans in package.json when clean is called in prebuild | Alex Browne | 2018-06-05 | 4 | -4/+4 | |
| * | | | | | Remove common-js/umd differentiation from 0x.js/package.json | Alex Browne | 2018-06-05 | 1 | -6/+3 | |
| * | | | | | Don't automatically rebuild when running yarn test | Alex Browne | 2018-06-05 | 15 | -15/+30 | |
* | | | | | | rename GT to GREATER_THAN | Jacob Evans | 2018-06-05 | 3 | -3/+3 | |
* | | | | | | Rebase from v2-prototype | Jacob Evans | 2018-06-05 | 2 | -38/+2 | |
* | | | | | | Update Exchange statuses, revert instead of emmitting event on fill/cancel fa... | Amir Bandeali | 2018-06-05 | 30 | -702/+491 | |
|/ / / / / | ||||||
* / / / / | Update artifacts in migrations | Alex Browne | 2018-06-05 | 8 | -51/+79 | |
|/ / / / | ||||||
* | | | | Address feedback | fragosti | 2018-06-05 | 4 | -14/+20 | |
* | | | | Implement WETH step logic for continue | fragosti | 2018-06-05 | 3 | -7/+14 | |
* | | | | Move trackedTokenStateByAddress logic into portal | fragosti | 2018-06-05 | 2 | -83/+100 | |
| |_|/ |/| | | ||||||
* | | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 15 | -175/+215 | |
|\| | | ||||||
| * | | Set contract expiration time to a constant 10 minutes | Alex Browne | 2018-06-02 | 1 | -1/+2 | |
| * | | Remove unused promises array | Alex Browne | 2018-06-02 | 2 | -6/+0 | |
| * | | Make erc20_wrapper and erc721_wrapper serial | Alex Browne | 2018-06-02 | 2 | -48/+50 | |
| * | | Merge pull request #650 from 0xProject/feature/publishing | Leonid Logvinov | 2018-06-02 | 12 | -120/+163 | |
| |\ \ | ||||||
| | * | | Rename changelogs to changelog | Leonid Logvinov | 2018-06-02 | 1 | -8/+8 | |
| | * | | Add CHANGELOG entry | Leonid Logvinov | 2018-06-02 | 1 | -0/+9 | |
| | * | | Check that git branch is up to date before publishing | Leonid Logvinov | 2018-06-02 | 1 | -1/+17 | |
| | * | | Move prepublish checks before building packages for publishing | Leonid Logvinov | 2018-06-02 | 3 | -53/+56 | |
| | * | | Refactor changelog utils to a separate module | Leonid Logvinov | 2018-06-02 | 9 | -63/+78 | |
* | | | | Improve comments and remove unused imports | Fabio Berger | 2018-06-02 | 4 | -4/+7 | |
* | | | | Fix tslint issues | Fabio Berger | 2018-06-02 | 3 | -5/+3 | |
* | | | | Add comment to exported method | Fabio Berger | 2018-06-02 | 1 | -0/+7 | |
* | | | | Add missing dep | Fabio Berger | 2018-06-02 | 1 | -0/+1 | |
* | | | | Fix types version | Fabio Berger | 2018-06-02 | 1 | -1/+1 | |
* | | | | Remove usage of `prebuild` since it doesn't run on `watch` | Fabio Berger | 2018-06-02 | 1 | -2/+3 | |
* | | | | remove artifactsDir and contracts from compiler.json | Fabio Berger | 2018-06-02 | 1 | -13/+0 | |
* | | | | Fix type imports | Fabio Berger | 2018-06-02 | 5 | -5/+8 | |
* | | | | Remove ISigner artifact | Fabio Berger | 2018-06-02 | 1 | -76/+0 | |
* | | | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 3 | -17/+18 | |
|\| | | | ||||||
| * | | | Update v2 artifacts | Fabio Berger | 2018-06-02 | 17 | -4493/+4727 | |
| * | | | Add IWallet and IValidator to compiled contracts | Fabio Berger | 2018-06-02 | 1 | -2/+2 | |
| * | | | Split migrations compile command into one for V1 and another for V2 | Fabio Berger | 2018-06-02 | 1 | -3/+4 | |
* | | | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 127 | -953/+961 | |
|\| | | | ||||||
| * | | | Merge pull request #648 from 0xProject/feature/website/fill-order | Brandon Millman | 2018-06-02 | 4 | -34/+75 | |
| |\ \ \ | ||||||
| | * | | | Remove old parse code | Brandon Millman | 2018-06-02 | 1 | -26/+0 | |
| | * | | | Refactor order parser and add shared order support to new portal | Brandon Millman | 2018-06-02 | 3 | -3/+43 | |
| | * | | | Add generate and fill order routes | Brandon Millman | 2018-06-02 | 2 | -7/+34 |