| Commit message (Expand) | Author | Age | Files | Lines |
* | Move BuyOrderProgress to its own component | Steve Klebanoff | 2018-11-02 | 2 | -38/+39 |
* | Remove old TODO | Steve Klebanoff | 2018-11-02 | 1 | -1/+1 |
* | Use new constants | Steve Klebanoff | 2018-11-02 | 2 | -3/+6 |
* | Use primary color instead of black | Steve Klebanoff | 2018-11-02 | 1 | -1/+1 |
* | maxWidth -> toWidth, and make from and to width consistent units | Steve Klebanoff | 2018-11-02 | 2 | -11/+11 |
* | Getting rid of TimedProgress state | Steve Klebanoff | 2018-11-02 | 1 | -47/+23 |
* | Minor cleanup | Steve Klebanoff | 2018-11-02 | 1 | -2/+2 |
* | Take out old ended variable | Steve Klebanoff | 2018-11-02 | 1 | -14/+6 |
* | Fix test name | Steve Klebanoff | 2018-11-02 | 1 | -1/+1 |
* | ended -> hasEnded | Steve Klebanoff | 2018-11-02 | 3 | -9/+9 |
* | Rename to SelectedAssetProgress | Steve Klebanoff | 2018-11-01 | 2 | -4/+4 |
* | Removing old extra param | Steve Klebanoff | 2018-11-01 | 1 | -1/+0 |
* | Removing old simulated progress bar, and adding documentation to TimedProgres... | Steve Klebanoff | 2018-11-01 | 4 | -201/+5 |
* | WIP of new timedprogressbar using CSS animations | Steve Klebanoff | 2018-11-01 | 5 | -7/+180 |
* | Revert "Remove default in state reducer" | Steve Klebanoff | 2018-11-01 | 2 | -2/+3 |
* | Merge branch 'development' into feature/instant/simulated-progress-bar | Steve Klebanoff | 2018-11-01 | 0 | -0/+0 |
|\ |
|
| * | Merge pull request #1198 from 0xProject/feature/instant/gas-estimate | Steve Klebanoff | 2018-10-31 | 5 | -6/+61 |
| |\ |
|
* | | | Remove default in state reducer | Steve Klebanoff | 2018-11-01 | 2 | -3/+2 |
* | | | Explicit actions for setting different order states | Steve Klebanoff | 2018-11-01 | 6 | -51/+88 |
* | | | Remove unused import | Steve Klebanoff | 2018-10-31 | 1 | -1/+0 |
* | | | Tick less often, and let CSS style the transition | Steve Klebanoff | 2018-10-31 | 2 | -4/+24 |
* | | | Nice formatting of displayed time | Steve Klebanoff | 2018-10-31 | 3 | -6/+90 |
* | | | Takeout unneeded div | Steve Klebanoff | 2018-10-31 | 1 | -12/+10 |
* | | | Get rid of old demo | Steve Klebanoff | 2018-10-31 | 5 | -45/+0 |
* | | | Use simulated progress bar for txn | Steve Klebanoff | 2018-10-31 | 6 | -45/+108 |
* | | | Always return estimated time, just use default if not known | Steve Klebanoff | 2018-10-31 | 1 | -3/+14 |
* | | | Showing time | Steve Klebanoff | 2018-10-31 | 1 | -1/+9 |
* | | | Show estimated time | Steve Klebanoff | 2018-10-31 | 1 | -0/+9 |
* | | | Remove old files | Steve Klebanoff | 2018-10-31 | 7 | -200/+0 |
* | | | Simulated Progress component working | Steve Klebanoff | 2018-10-31 | 6 | -6/+102 |
* | | | WIP: beginning of simulated progress bar component | Steve Klebanoff | 2018-10-31 | 2 | -1/+137 |
* | | | Placeholder for estimated time | Steve Klebanoff | 2018-10-31 | 2 | -2/+15 |
* | | | Making prettier | Steve Klebanoff | 2018-10-31 | 1 | -4/+8 |
* | | | Dispatching progress | Steve Klebanoff | 2018-10-31 | 7 | -4/+84 |
* | | | Remove old TODO | Steve Klebanoff | 2018-10-31 | 1 | -1/+0 |
* | | | Rename functions and get rid of old unused function | Steve Klebanoff | 2018-10-31 | 1 | -12/+4 |
* | | | Stall at 95 percent | Steve Klebanoff | 2018-10-31 | 2 | -27/+46 |
* | | | WIP: Progress ticker with finishing | Steve Klebanoff | 2018-10-31 | 2 | -0/+90 |
* | | | store estimated time in Ms on state | Steve Klebanoff | 2018-10-30 | 2 | -5/+5 |
* | | | return estimated state | Steve Klebanoff | 2018-10-30 | 4 | -9/+17 |
| |/
|/| |
|
* | | Move tslint disable line | Steve Klebanoff | 2018-10-30 | 1 | -1/+3 |
* | | Add comment and use constant | Steve Klebanoff | 2018-10-30 | 1 | -2/+3 |
* | | Use polyfilled fetch from utils | Steve Klebanoff | 2018-10-30 | 1 | -2/+2 |
* | | async suffix and use polyfill fetch util | Steve Klebanoff | 2018-10-30 | 1 | -4/+4 |
* | | Introduce constants for eth gas station and coinbase | Steve Klebanoff | 2018-10-30 | 3 | -7/+9 |
* | | Comment for warming up cache | Steve Klebanoff | 2018-10-30 | 1 | -0/+2 |
* | | linting | Steve Klebanoff | 2018-10-30 | 2 | -1/+2 |
* | | Use constant that exists now | Steve Klebanoff | 2018-10-30 | 1 | -5/+4 |
* | | gas price estimator | Steve Klebanoff | 2018-10-30 | 3 | -2/+50 |
|/ |
|
* | Merge pull request #1196 from 0xProject/feature/instant/default-gas-price | Brandon Millman | 2018-10-30 | 2 | -2/+5 |
|\ |
|
| * | feat(instant): add default gasPrice of 6 gwei to transactions | Brandon Millman | 2018-10-30 | 2 | -2/+5 |
|/ |
|
* | Merge pull request #1187 from 0xProject/feature/instant/fixed-orders-in-rende... | Brandon Millman | 2018-10-30 | 23 | -241/+263 |
|\ |
|
| * | fix(instant): fix spelling error and BigNumber gte operation | Brandon Millman | 2018-10-30 | 2 | -4/+4 |
| * | Merge branch 'development' into feature/instant/fixed-orders-in-render-method | Brandon Millman | 2018-10-30 | 11 | -69/+79 |
| |\
| |/
|/| |
|
* | | Merge pull request #1193 from 0xProject/feature/not-enough-eth | Steve Klebanoff | 2018-10-30 | 12 | -32/+116 |
|\ \ |
|
| * | | Has Sufficient Funds/Balance -> Has Sufficient ETH | Steve Klebanoff | 2018-10-30 | 4 | -6/+6 |
| * | | When transaction too low, treat as validation error. also modify callback: er... | Steve Klebanoff | 2018-10-30 | 3 | -8/+13 |
| * | | onPendingValidation -> onValidationPending | Steve Klebanoff | 2018-10-29 | 3 | -8/+8 |
| * | | linting | Steve Klebanoff | 2018-10-27 | 3 | -11/+1 |
| * | | Simpler way of validaitng has enough eth | Steve Klebanoff | 2018-10-27 | 6 | -56/+37 |
| * | | questionmark syntax instead of '| undefined' | Steve Klebanoff | 2018-10-27 | 1 | -1/+1 |
| * | | Validate enough ETH when user clicks buy | Steve Klebanoff | 2018-10-27 | 3 | -1/+16 |
| * | | Merge branch 'development' into feature/not-enough-eth | Steve Klebanoff | 2018-10-27 | 56 | -212/+224 |
| |\ \ |
|
| * | | | acccount for no address | Steve Klebanoff | 2018-10-27 | 3 | -11/+19 |
| * | | | move funct into util | Steve Klebanoff | 2018-10-27 | 2 | -5/+32 |
| * | | | move imports | Steve Klebanoff | 2018-10-27 | 1 | -4/+2 |
| * | | | yarn.lock changes | Steve Klebanoff | 2018-10-27 | 1 | -2/+39 |
| * | | | Merge branch 'development' into feature/not-enough-eth | Steve Klebanoff | 2018-10-27 | 41 | -632/+1228 |
| |\ \ \ |
|
| * | | | | feat(instant): Show message if user doesn't have enough ETH | Steve Klebanoff | 2018-10-27 | 4 | -2/+24 |
| * | | | | ethDecimals -> ETH_DECIMALS | Steve Klebanoff | 2018-10-27 | 4 | -9/+11 |
| | | | * | Merge branch 'development' into feature/instant/fixed-orders-in-render-method | Brandon Millman | 2018-10-29 | 66 | -223/+398 |
| | | | |\
| |_|_|_|/
|/| | | | |
|
* | | | | | Merge pull request #1194 from 0xProject/feature/instant/input-to-fixed | Steve Klebanoff | 2018-10-27 | 4 | -2/+21 |
|\ \ \ \ \
| |_|_|/ /
|/| | | | |
|
| * | | | | fix(instant): refactor some props to use isDisabled instead of disabled | Brandon Millman | 2018-10-27 | 4 | -16/+16 |
| * | | | | feat(instant): Disable input when processing | Steve Klebanoff | 2018-10-27 | 4 | -2/+21 |
| | |/ /
| |/| | |
|
* | | | | Merge pull request #1189 from 0xProject/feature/instant/txn-failure | Steve Klebanoff | 2018-10-27 | 11 | -144/+105 |
|\ \ \ \ |
|
| * | | | | linting imports | Steve Klebanoff | 2018-10-27 | 1 | -2/+2 |
| * | | | | selected asset buy order state button -> selected asset buy order state buttons | Steve Klebanoff | 2018-10-27 | 2 | -6/+9 |
| * | | | | buy order state button -> buy order state buttons | Steve Klebanoff | 2018-10-27 | 2 | -3/+3 |
| * | | | | tsx -> ts | Steve Klebanoff | 2018-10-27 | 1 | -0/+0 |
| * | | | | Get BuyOrderState one big connected component, and let user view failure | Steve Klebanoff | 2018-10-26 | 9 | -157/+96 |
| * | | | | Show View Transaction button on failure, and allow setting of width for Try A... | Steve Klebanoff | 2018-10-26 | 6 | -13/+32 |
| * | | | | Merge branch 'feature/instant/view-processings-txn' into feature/instant/txn-... | Steve Klebanoff | 2018-10-26 | 2 | -10/+5 |
| |\ \ \ \ |
|
| * | | | | | Added string to constants | Steve Klebanoff | 2018-10-26 | 2 | -1/+3 |
* | | | | | | Merge pull request #1178 from 0xProject/fix/linter-improvements | Alex Browne | 2018-10-27 | 44 | -62/+78 |
|\ \ \ \ \ \ |
|
| * | | | | | | Add note about tslint false positive | Alex Browne | 2018-10-27 | 2 | -0/+4 |
| * | | | | | | chore: Update contract-wrappers CHANGELOG.json | Alex Browne | 2018-10-24 | 1 | -0/+9 |
| * | | | | | | fix(contract-wrappers): Fix tslint errors that were lingering due to misconfi... | Alex Browne | 2018-10-24 | 9 | -28/+31 |
| * | | | | | | chore: Add --format stylish to tslint | Alex Browne | 2018-10-24 | 34 | -34/+34 |
* | | | | | | | Merge pull request #1188 from 0xProject/fix/instant/quote-race-conditions | Brandon Millman | 2018-10-27 | 1 | -6/+41 |
|\ \ \ \ \ \ \
| |_|_|_|/ / /
|/| | | | | | |
|
| * | | | | | | Add back debounce | Brandon Millman | 2018-10-27 | 1 | -1/+3 |
| * | | | | | | Make doesBuyQuoteMatchState in reducer less strict | Brandon Millman | 2018-10-27 | 1 | -7/+12 |
| * | | | | | | fix(instant): prevent outdated quote requests from overriding the correct quote | Brandon Millman | 2018-10-27 | 2 | -9/+37 |
|/ / / / / / |
|
* | | | | | | feat(order_utils.py): ERC721 asset data codec (#1186) | F. Eugene Aumson | 2018-10-27 | 6 | -9/+153 |
| | | | | * | Refactor error handling such that errorMessage lives on the top level state | Brandon Millman | 2018-10-27 | 10 | -158/+71 |
| | | | | * | fix: init BigNumberInput not BigNumber when initializing state | fragosti | 2018-10-27 | 3 | -10/+52 |
| | | | | * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-10-27 | 38 | -659/+1078 |
| | | | | |\
| |_|_|_|_|/
|/| | | | | |
|
* | | | | | | fix(order_utils.py): tweaks for first publish (#1185) | F. Eugene Aumson | 2018-10-27 | 11 | -17/+137 |
* | | | | | | Merge pull request #1175 from 0xProject/feature/instant/input-fees-rounding | Francesco Agosti | 2018-10-27 | 22 | -157/+473 |
|\ \ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-10-26 | 21 | -152/+283 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | chore: dont override toString of BigNumber and other PR feedback | fragosti | 2018-10-26 | 10 | -41/+53 |
| * | | | | | | | chore: update comments | fragosti | 2018-10-25 | 1 | -2/+2 |
| * | | | | | | | chore: use alternate syntax for styled | fragosti | 2018-10-25 | 4 | -4/+16 |
| * | | | | | | | fix: weird linting error that depends on types | fragosti | 2018-10-25 | 2 | -2/+39 |
| * | | | | | | | feat: change to increasing input width by a constant amount per additional ch... | fragosti | 2018-10-25 | 2 | -51/+6 |
| * | | | | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-10-25 | 19 | -44/+215 |
| |\ \ \ \ \ \ \ |
|
| * | | | | | | | | chore: run linter | fragosti | 2018-10-25 | 3 | -3/+3 |
| * | | | | | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-10-25 | 97 | -533/+1556 |
| |\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | fix: address PR feedback | fragosti | 2018-10-25 | 2 | -6/+6 |
| * | | | | | | | | | feat: cover more token symbol edge cases | fragosti | 2018-10-24 | 6 | -12/+27 |
| * | | | | | | | | | feat: add title attribute to label | fragosti | 2018-10-24 | 1 | -2/+2 |
| * | | | | | | | | | feat: add formatted symbol for asset uitl | fragosti | 2018-10-24 | 1 | -1/+11 |
| * | | | | | | | | | feat: support half-written decimal numbers in BigNumberInput | fragosti | 2018-10-24 | 2 | -1/+31 |
| * | | | | | | | | | fix: remove unused callback info | fragosti | 2018-10-24 | 1 | -3/+3 |
| * | | | | | | | | | polish: improve scaling significantly | fragosti | 2018-10-24 | 3 | -28/+50 |
| * | | | | | | | | | fix: remove the concept of initial with from scaling input and remove phase | fragosti | 2018-10-24 | 2 | -27/+21 |
| * | | | | | | | | | fix: dont allow heading to change height when input size changes | fragosti | 2018-10-24 | 3 | -3/+7 |
| * | | | | | | | | | chore: run linter | fragosti | 2018-10-23 | 4 | -11/+2 |
| * | | | | | | | | | chore: final adjustments | fragosti | 2018-10-23 | 2 | -3/+3 |
| * | | | | | | | | | chore: refactor ScalingInput | fragosti | 2018-10-23 | 1 | -9/+18 |
| * | | | | | | | | | feature: reduce font size by a percentage instead of a constant | fragosti | 2018-10-23 | 3 | -39/+57 |
| * | | | | | | | | | feat: have basic scaling amount input working | fragosti | 2018-10-23 | 5 | -52/+131 |
| * | | | | | | | | | feat: add scaling input component | fragosti | 2018-10-20 | 2 | -4/+88 |
| * | | | | | | | | | fix: animation component typing | fragosti | 2018-10-20 | 1 | -4/+1 |
| * | | | | | | | | | feat: user better syntax for defining ui components | fragosti | 2018-10-20 | 4 | -18/+4 |
| * | | | | | | | | | feat: upgrade to styled-components v4 | fragosti | 2018-10-20 | 5 | -20/+74 |
* | | | | | | | | | | Merge pull request #1192 from 0xProject/feature/contract-addresses/updateForw... | Amir Bandeali | 2018-10-27 | 4 | -447/+464 |
|\ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|/ /
|/| | | | | | | | | |
|
| * | | | | | | | | | Update CHANGELOGs | Amir Bandeali | 2018-10-27 | 2 | -0/+18 |
| * | | | | | | | | | feat: update addresses for Forwarder | Amir Bandeali | 2018-10-27 | 1 | -3/+3 |
| * | | | | | | | | | feat: update artifact for Forwarder | Amir Bandeali | 2018-10-27 | 1 | -444/+443 |
|/ / / / / / / / / |
|
* | | | | | | | | | Merge branch 'development' of github.com:0xProject/0x-monorepo into development | Fabio Berger | 2018-10-26 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ | Merge pull request #1190 from 0xProject/fix/website/fill-order-rounding | Kadinsky | 2018-10-26 | 2 | -46/+5 |
| |\ \ \ \ \ \ \ \ \
| | |_|_|_|/ / / / /
| |/| | | | | | | | |
|
| | * | | | | | | | | fix(website): round makerAssetToken amount in FillOrder component | Brandon Millman | 2018-10-26 | 2 | -46/+5 |
| |/ / / / / / / / |
|
* / / / / / / / / | Update yarn.lock | Fabio Berger | 2018-10-26 | 1 | -45/+1 |
|/ / / / / / / / |
|
| | | | | | | * | fix: justify error message left | fragosti | 2018-10-27 | 1 | -1/+1 |
| | | | | | | * | feat: add assertions to render method | fragosti | 2018-10-27 | 4 | -1/+60 |
| | | | | | | * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-10-26 | 21 | -152/+283 |
| | | | | | | |\
| |_|_|_|_|_|_|/
|/| | | | | | | |
|
* | | | | | | | | Merge pull request #1184 from 0xProject/feature/instant/view-processings-txn | Steve Klebanoff | 2018-10-26 | 11 | -53/+101 |
|\ \ \ \ \ \ \ \
| | |_|_|_|_|/ /
| |/| | | | | | |
|
| * | | | | | | | cleanup code | Steve Klebanoff | 2018-10-26 | 1 | -7/+2 |
| * | | | | | | | Added string to constants | Steve Klebanoff | 2018-10-26 | 2 | -1/+3 |
| * | | | | | | | better type names | Steve Klebanoff | 2018-10-26 | 1 | -3/+3 |
| | |_|_|_|/ /
| |/| | | | | |
|
| * | | | | | | Rework OrderState to have more simple definition | Steve Klebanoff | 2018-10-26 | 1 | -12/+4 |
| * | | | | | | Making failure txHash required | Steve Klebanoff | 2018-10-26 | 3 | -4/+5 |
| * | | | | | | txnHash -> txHash | Steve Klebanoff | 2018-10-26 | 5 | -22/+22 |
| * | | | | | | new try/catch pattern and new prop names per code review feedback | Steve Klebanoff | 2018-10-26 | 2 | -13/+28 |
| * | | | | | | take out unused imports | Steve Klebanoff | 2018-10-26 | 2 | -2/+2 |
| * | | | | | | Take out old TODO | Steve Klebanoff | 2018-10-26 | 1 | -1/+0 |
| * | | | | | | feat(instant): Be able to view transaction when transaction is in progress | Steve Klebanoff | 2018-10-25 | 3 | -4/+13 |
| * | | | | | | Associate txnhash with processing state | Steve Klebanoff | 2018-10-25 | 3 | -12/+28 |
| * | | | | | | Introduce new OrderProcessState | Steve Klebanoff | 2018-10-25 | 8 | -26/+45 |
* | | | | | | | Merge pull request #1151 from 0xProject/fix-update-migrations-readme | Alex Browne | 2018-10-25 | 1 | -25/+2 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Fix prettier | Leonid Logvinov | 2018-10-18 | 1 | -1/+0 |
| * | | | | | | | fix(migrations): Update README.md. | Alex Browne | 2018-10-18 | 1 | -24/+2 |
* | | | | | | | | Merge pull request #1182 from 0xProject/albrow-codeowners | Alex Browne | 2018-10-25 | 1 | -7/+13 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Add albrow to CODEOWNERS | Alex Browne | 2018-10-25 | 1 | -7/+13 |
* | | | | | | | | | Merge pull request #1176 from 0xProject/fix/asset-buyer/rounding-errors | Brandon Millman | 2018-10-25 | 7 | -69/+155 |
|\ \ \ \ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | | |
|
| * | | | | | | | | chore(asset-buyer): fix lint errors | Brandon Millman | 2018-10-24 | 1 | -3/+3 |
| * | | | | | | | | feat(asset-buyer): update buyQuoteCalculator to match rounding behavior in co... | Brandon Millman | 2018-10-24 | 7 | -69/+155 |
* | | | | | | | | | Merge pull request #1180 from 0xProject/feature/instant/metamask-denial | Steve Klebanoff | 2018-10-25 | 3 | -2/+16 |
|\ \ \ \ \ \ \ \ \
| |_|_|_|_|_|/ / /
|/| | | | | | | | |
|
| * | | | | | | | | feat: Message when denying signing transaction | Steve Klebanoff | 2018-10-25 | 1 | -1/+1 |
| * | | | | | | | | Message when signature denied | Steve Klebanoff | 2018-10-25 | 3 | -2/+16 |
| | | | | | | | * | feat: change network to networkId | fragosti | 2018-10-26 | 3 | -7/+44 |
| | | | | | | | * | chore: add to asset-buyer changelog.json | fragosti | 2018-10-26 | 2 | -2/+12 |
| | | | | | | | * | revert: change to contract-addresses | fragosti | 2018-10-26 | 1 | -1/+1 |
| | | | | | | | * | fix: dont fail for mainnet assetData and non-mainnet network | fragosti | 2018-10-26 | 2 | -3/+6 |
| | | | | | | | * | feat: support defaultAssetBuyAmount setting | fragosti | 2018-10-26 | 2 | -7/+8 |
| | | | | | | | * | chore: use parseInt instead of + | fragosti | 2018-10-26 | 1 | -1/+1 |
| | | | | | | | * | chore: remove console log | fragosti | 2018-10-26 | 1 | -1/+0 |
| | | | | | | | * | feat: flash an error if the wrong network is detected | fragosti | 2018-10-26 | 3 | -8/+31 |
| | | | | | | | * | feat: supply render options from URL | fragosti | 2018-10-26 | 5 | -55/+60 |
| | | | | | | | * | feat: no longer require separate `orders` and `feeOrders` args in `getAssetBu... | fragosti | 2018-10-25 | 1 | -4/+1 |
| |_|_|_|_|_|_|/
|/| | | | | | | |
|
* | | | | | | | | Merge pull request #1179 from 0xProject/feature/instant/processing-state | Steve Klebanoff | 2018-10-25 | 20 | -45/+216 |
|\ \ \ \ \ \ \ \
| |_|_|_|_|_|/ /
|/| | | | | | | |
|
| * | | | | | | | Get rid of react-shared as a dependency, write own etherscanUtil | Steve Klebanoff | 2018-10-25 | 4 | -5/+27 |
| |/ / / / / / |
|
| * | | | | | | bumping up max bundle size for now (introducing react-shared added a lot), wi... | Steve Klebanoff | 2018-10-25 | 1 | -1/+1 |
| * | | | | | | Get rid of unused import | Steve Klebanoff | 2018-10-25 | 1 | -1/+1 |
| * | | | | | | Revert "commiting addtl changes to yarn.lock from running yarn" | Steve Klebanoff | 2018-10-24 | 1 | -1/+45 |
| * | | | | | | commiting addtl changes to yarn.lock from running yarn | Steve Klebanoff | 2018-10-24 | 1 | -45/+1 |
| * | | | | | | Merge branch 'development' into feature/instant/processing-state | Steve Klebanoff | 2018-10-24 | 71 | -180/+1028 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| * | | | | | | feat(instant): Procesing and Success states | Steve Klebanoff | 2018-10-24 | 13 | -36/+116 |
| * | | | | | | Make icon a bit better | Steve Klebanoff | 2018-10-23 | 1 | -1/+1 |
| * | | | | | | Placing order button | Steve Klebanoff | 2018-10-23 | 1 | -2/+4 |
| * | | | | | | Spinner: change prop names and fix svg props | Steve Klebanoff | 2018-10-23 | 1 | -9/+9 |
| * | | | | | | Making SecondaryButton accept children instead of text prop | Steve Klebanoff | 2018-10-23 | 3 | -5/+22 |
| * | | | | | | Spinner no longer wobbly | Steve Klebanoff | 2018-10-23 | 2 | -6/+15 |
| * | | | | | | WIP: spinner | Steve Klebanoff | 2018-10-23 | 2 | -0/+45 |
* | | | | | | | Merge pull request #1181 from snario/patch-1 | Alex Browne | 2018-10-25 | 1 | -0/+4 |
|\ \ \ \ \ \ \
| |_|/ / / / /
|/| | | | | | |
|
| * | | | | | | Update README.md | Liam Horne | 2018-10-25 | 1 | -0/+4 |
|/ / / / / / |
|
* | | | | | | Merge pull request #1170 from 0xProject/feature/instant/failure-state | Steve Klebanoff | 2018-10-24 | 13 | -31/+218 |
|\ \ \ \ \ \
| |_|_|_|_|/
|/| | | | | |
|
| * | | | | | rename container | Steve Klebanoff | 2018-10-24 | 2 | -5/+5 |
| * | | | | | rename action to resetAmount | Steve Klebanoff | 2018-10-24 | 2 | -3/+3 |
| * | | | | | null -> undefined | Steve Klebanoff | 2018-10-24 | 1 | -2/+2 |
| * | | | | | move buy order state to its own component | Steve Klebanoff | 2018-10-24 | 2 | -18/+26 |
| * | | | | | Merge branch 'development' into feature/instant/failure-state | Steve Klebanoff | 2018-10-24 | 64 | -134/+978 |
| |\ \ \ \ \
| |/ / / / /
|/| / / / /
| |/ / / / |
|
* | | | | | Merge pull request #1159 from 0xProject/feature/instant/beta-render-et-al | Francesco Agosti | 2018-10-24 | 26 | -135/+379 |
|\ \ \ \ \ |
|
| * | | | | | chore: incorportate pr feedback | fragosti | 2018-10-24 | 5 | -7/+46 |
| * | | | | | chore: run linter | fragosti | 2018-10-23 | 1 | -1/+1 |
| * | | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-10-23 | 19 | -97/+145 |
| |\ \ \ \ \ |
|
| * | | | | | | feat: add tests for assetUtils | fragosti | 2018-10-23 | 2 | -9/+30 |
| * | | | | | | feat: add asset tests | fragosti | 2018-10-23 | 1 | -0/+25 |
| * | | | | | | chore: change order of code to be clearer | fragosti | 2018-10-23 | 2 | -1/+3 |
* | | | | | | | Merge pull request #1177 from 0xProject/fix/web3-wrapper-transaction-type | Alex Browne | 2018-10-24 | 2 | -2/+19 |
|\ \ \ \ \ \ \
| |_|_|_|/ / /
|/| | | | | | |
|
| * | | | | | | chore: Fix linter | Alex Browne | 2018-10-24 | 1 | -1/+1 |
| * | | | | | | chore(web3-wrapper): Update CHANGELOG.json | Alex Browne | 2018-10-24 | 1 | -0/+10 |
| * | | | | | | fix(web3-wrapper): Make getTransactionByHashAsync return the correct type | Alex Browne | 2018-10-24 | 1 | -2/+9 |
|/ / / / / / |
|
* | | | | | | Merge pull request #1147 from 0xProject/feature/asset-buyer/signing-request-e... | Brandon Millman | 2018-10-24 | 10 | -17/+66 |
|\ \ \ \ \ \ |
|
| * | | | | | | feat(contract-wrappers): relax requirement for throwing `ContractWrappersErro... | Brandon Millman | 2018-10-24 | 2 | -2/+2 |
| * | | | | | | feat(asset-buyer): throw SignatureRequestDenied and TransactionValueTooLow er... | Brandon Millman | 2018-10-24 | 3 | -16/+33 |
| * | | | | | | feat(monorepo-scripts): add ForwarderWrapperError to IGNORED_EXCESSIVE_TYPES ... | Brandon Millman | 2018-10-24 | 2 | -0/+5 |
| * | | | | | | feat(contract-wrappers): export ForwarderWrapperError and ContractWrapperErro... | Brandon Millman | 2018-10-23 | 5 | -1/+28 |
* | | | | | | | Merge pull request #1162 from 0xProject/fix/contracts/forwarderRounding | Amir Bandeali | 2018-10-24 | 3 | -8/+278 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Run prettier and linter | Amir Bandeali | 2018-10-24 | 1 | -2/+0 |
| * | | | | | | | Round up for Market Buys in Forwarding Contract. Includes new test cases + re... | Greg Hysen | 2018-10-24 | 3 | -8/+280 |
|/ / / / / / / |
|
* / / / / / / | feat(order_utils.py): ERC20 asset data encoding and decoding | F. Eugene Aumson | 2018-10-24 | 23 | -37/+410 |
|/ / / / / / |
|
* | / / / / | fix(website): asset-buyer usage documentation formatting | Brandon Millman | 2018-10-23 | 2 | -5/+5 |
| |/ / / /
|/| | | | |
|
* | | | | | Merge pull request #1173 from 0xProject/fixSchemaBug | Kadinsky | 2018-10-23 | 16 | -52/+130 |
|\ \ \ \ \ |
|
| * | | | | | Add wholeNumberSchema test | Fabio Berger | 2018-10-22 | 1 | -0/+12 |
| * | | | | | chore: fix file name | Fabio Berger | 2018-10-22 | 1 | -1/+1 |
| * | | | | | chore: Add whole number to next json-schema doc md section | Fabio Berger | 2018-10-22 | 2 | -5/+53 |
| * | | | | | chore: link to schemas at a particular commit so it doesn't change when they ... | Fabio Berger | 2018-10-22 | 1 | -29/+29 |
| * | | | | | Fix links | Fabio Berger | 2018-10-22 | 1 | -7/+7 |
| * | | | | | revert unrelated change | Fabio Berger | 2018-10-22 | 1 | -2/+2 |
| * | | | | | Add changelog | Fabio Berger | 2018-10-22 | 1 | -0/+10 |
| * | | | | | fix: improve schemas by enforcing that amounts that must be whole numbers (e.... | Fabio Berger | 2018-10-22 | 8 | -17/+17 |
| * | | | | | chore: add whole number schema | Fabio Berger | 2018-10-22 | 3 | -1/+9 |
| * | | | | | fix: Update address to ZRX token to newly deployed 'mintable' ZRX token on Ko... | Fabio Berger | 2018-10-20 | 1 | -2/+2 |
* | | | | | | Merge pull request #1174 from 0xProject/fix/website/kovan | Brandon Millman | 2018-10-23 | 3 | -9/+53 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | fix(website): create correct subprovider for metamask | Brandon Millman | 2018-10-23 | 1 | -1/+1 |
| * | | | | | fix(website): do not fetch balances for empty tokens | Brandon Millman | 2018-10-23 | 1 | -6/+13 |
| * | | | | | Update yarn.lock | Brandon Millman | 2018-10-23 | 1 | -2/+39 |
|/ / / / / |
|
| | * | | | Remove hack fix | Steve Klebanoff | 2018-10-20 | 1 | -4/+2 |
| | * | | | feat(instant): Add failure state and icon | Steve Klebanoff | 2018-10-20 | 3 | -15/+35 |
| | * | | | linting | Steve Klebanoff | 2018-10-20 | 3 | -4/+0 |
| | * | | | Small refacotor of icons or amounts part | Steve Klebanoff | 2018-10-20 | 1 | -7/+3 |
| | * | | | Render failure icon | Steve Klebanoff | 2018-10-20 | 1 | -2/+23 |
| | * | | | Merge branch 'feature/instant/beta-render-et-al' into feature/instant/failure... | Steve Klebanoff | 2018-10-20 | 52 | -579/+770 |
| | |\ \ \
| | |/ / /
| |/| | | |
|
| * | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-10-20 | 26 | -369/+357 |
| |\ \ \ \
| |/ / / /
|/| | | /
| | |_|/
| |/| | |
|
* | | | | Merge pull request #1168 from 0xProject/feature/contracts/updateReadme | Amir Bandeali | 2018-10-20 | 1 | -14/+8 |
|\ \ \ \ |
|
| * | | | | Update links, remove 1.0 from README | Amir Bandeali | 2018-10-20 | 1 | -14/+8 |
|/ / / / |
|
* | | | | Merge pull request #1161 from 0xProject/feature/instant/order-details-loading... | Steve Klebanoff | 2018-10-20 | 14 | -131/+202 |
|\ \ \ \ |
|
| * | | | | linting | Steve Klebanoff | 2018-10-20 | 1 | -2/+2 |
| * | | | | arrow function syntax so no need to bind | Steve Klebanoff | 2018-10-20 | 1 | -8/+6 |
| * | | | | dont export PlainPlaceholder | Steve Klebanoff | 2018-10-20 | 1 | -2/+2 |
| * | | | | Refactor to make placeholder logic more straightforward | Steve Klebanoff | 2018-10-20 | 1 | -5/+6 |
| * | | | | Getting rid of displayName, and rename usdSection -> _renderUsdSection | Steve Klebanoff | 2018-10-20 | 1 | -3/+2 |
| * | | | | undefined -> null to follow convention | Steve Klebanoff | 2018-10-19 | 1 | -2/+2 |
| * | | | | pulsating -> isPulsating | Steve Klebanoff | 2018-10-19 | 3 | -7/+7 |
| * | | | | Allow more than 1 class per file | Steve Klebanoff | 2018-10-19 | 1 | -1/+2 |
| * | | | | Move USD section into helper function | Steve Klebanoff | 2018-10-19 | 1 | -46/+42 |
| * | | | | feat(instant): Indicate that order details section is loading by having pulsi... | Steve Klebanoff | 2018-10-19 | 4 | -16/+47 |
| * | | | | Moved LatestErrorDisplay to types file and gave generic name | Steve Klebanoff | 2018-10-19 | 3 | -12/+13 |
| * | | | | Rename update function to set function since it doesnt take a parameter | Steve Klebanoff | 2018-10-19 | 3 | -9/+9 |