aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' into fix/instant/decimal-fields-scaling-amount-inp...Steve Klebanoff2018-11-038-34/+46
|\
| * Merge pull request #1209 from 0xProject/feature/instant/optional-providerBrandon Millman2018-11-038-34/+46
| |\
| | * feat(instant): pass in provider through props, fallback to injected providerBrandon Millman2018-11-038-34/+46
* | | Use generic MaybeSteve Klebanoff2018-11-033-8/+9
* | | lintingSteve Klebanoff2018-11-032-2/+2
* | | Merge branch 'development' into fix/instant/decimal-fields-scaling-amount-inp...Steve Klebanoff2018-11-0323-59/+515
|\| |
| * | Merge pull request #1208 from 0xProject/fix/instant/zero-NaNSteve Klebanoff2018-11-031-1/+1
| |\ \ | | |/ | |/|
| | * fix(instant): dont get buy quote for zero valueSteve Klebanoff2018-11-031-1/+1
| * | Merge pull request #1207 from 0xProject/feature/instant/affiliate-feeBrandon Millman2018-11-0313-28/+103
| |\ \ | | |/ | |/|
| | * feat(instant): add affiliateInfo overrides to dev urlBrandon Millman2018-11-031-0/+10
| | * feat(instant): implement affiliateFeeInfo propBrandon Millman2018-11-039-15/+61
| | * fix(asset-buyer): fix default values being overriden and incorrect fee roundingBrandon Millman2018-11-033-13/+32
| |/
| * Merge branch 'development' into feature/instant/simulated-progress-barSteve Klebanoff2018-11-0320-147/+426
| |\
| * \ Merge branch 'development' into feature/instant/simulated-progress-barSteve Klebanoff2018-11-0227-248/+485
| |\ \
| * | | linting: moving order of importsSteve Klebanoff2018-11-021-1/+1
| * | | Better styling of estimated timeSteve Klebanoff2018-11-021-2/+15
| * | | removing unused importsSteve Klebanoff2018-11-022-2/+2
| * | | Move file to new file to reflect the new export nameSteve Klebanoff2018-11-022-3/+1
| * | | Rename exportSteve Klebanoff2018-11-022-3/+3
| * | | Move BuyOrderProgress to its own componentSteve Klebanoff2018-11-022-38/+39
| * | | Remove old TODOSteve Klebanoff2018-11-021-1/+1
| * | | Use new constantsSteve Klebanoff2018-11-022-3/+6
| * | | Use primary color instead of blackSteve Klebanoff2018-11-021-1/+1
| * | | maxWidth -> toWidth, and make from and to width consistent unitsSteve Klebanoff2018-11-022-11/+11
| * | | Getting rid of TimedProgress stateSteve Klebanoff2018-11-021-47/+23
| * | | Minor cleanupSteve Klebanoff2018-11-021-2/+2
| * | | Take out old ended variableSteve Klebanoff2018-11-021-14/+6
| * | | Fix test nameSteve Klebanoff2018-11-021-1/+1
| * | | ended -> hasEndedSteve Klebanoff2018-11-023-9/+9
| * | | Rename to SelectedAssetProgressSteve Klebanoff2018-11-012-4/+4
| * | | Removing old extra paramSteve Klebanoff2018-11-011-1/+0
| * | | Removing old simulated progress bar, and adding documentation to TimedProgres...Steve Klebanoff2018-11-014-201/+5
| * | | WIP of new timedprogressbar using CSS animationsSteve Klebanoff2018-11-015-7/+180
| * | | Revert "Remove default in state reducer"Steve Klebanoff2018-11-012-2/+3
| * | | Merge branch 'development' into feature/instant/simulated-progress-barSteve Klebanoff2018-11-010-0/+0
| |\ \ \
| * | | | Remove default in state reducerSteve Klebanoff2018-11-012-3/+2
| * | | | Explicit actions for setting different order statesSteve Klebanoff2018-11-016-51/+88
| * | | | Remove unused importSteve Klebanoff2018-10-311-1/+0
| * | | | Tick less often, and let CSS style the transitionSteve Klebanoff2018-10-312-4/+24
| * | | | Nice formatting of displayed timeSteve Klebanoff2018-10-313-6/+90
| * | | | Takeout unneeded divSteve Klebanoff2018-10-311-12/+10
| * | | | Get rid of old demoSteve Klebanoff2018-10-315-45/+0
| * | | | Use simulated progress bar for txnSteve Klebanoff2018-10-316-45/+108
| * | | | Always return estimated time, just use default if not knownSteve Klebanoff2018-10-311-3/+14
| * | | | Showing timeSteve Klebanoff2018-10-311-1/+9
| * | | | Show estimated timeSteve Klebanoff2018-10-311-0/+9
| * | | | Remove old filesSteve Klebanoff2018-10-317-200/+0
| * | | | Simulated Progress component workingSteve Klebanoff2018-10-316-6/+102
| * | | | WIP: beginning of simulated progress bar componentSteve Klebanoff2018-10-312-1/+137
| * | | | Placeholder for estimated timeSteve Klebanoff2018-10-312-2/+15
| * | | | Making prettierSteve Klebanoff2018-10-311-4/+8
| * | | | Dispatching progressSteve Klebanoff2018-10-317-4/+84
| * | | | Remove old TODOSteve Klebanoff2018-10-311-1/+0
| * | | | Rename functions and get rid of old unused functionSteve Klebanoff2018-10-311-12/+4
| * | | | Stall at 95 percentSteve Klebanoff2018-10-312-27/+46
| * | | | WIP: Progress ticker with finishingSteve Klebanoff2018-10-312-0/+90
| * | | | store estimated time in Ms on stateSteve Klebanoff2018-10-302-5/+5
| * | | | return estimated stateSteve Klebanoff2018-10-304-9/+17
* | | | | onChange -> onAmountChangeSteve Klebanoff2018-11-032-5/+5
* | | | | Move MaybeBigNumber functions into helperSteve Klebanoff2018-11-032-17/+29
* | | | | Have ScalingAmountInput trigger onChange with MaybeBigNumber and keep string ...Steve Klebanoff2018-11-022-12/+54
* | | | | Getting rid of BigNumberInput in favor of BigNumberSteve Klebanoff2018-11-027-56/+17
| |_|_|/ |/| | |
* | | | Merge pull request #1205 from 0xProject/feature/instant/render-overlayBrandon Millman2018-11-0211-137/+268
|\ \ \ \
| * | | | Remove alternate hover styling from button and move into icon componentBrandon Millman2018-11-025-54/+54
| * | | | feat(instant): add interactive overlay presentation to umd bundleBrandon Millman2018-11-0212-120/+251
| | |_|/ | |/| |
* | | | Merge pull request #1203 from 0xProject/feature/instant/token-selection-panelFrancesco Agosti2018-11-029-10/+158
|\ \ \ \ | |/ / / |/| | |
| * | | fix: make maxPerPage for the SRA getAvailableMakerAssetDatasAsync call a loca...fragosti2018-11-022-3/+3
| * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-028-106/+118
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1201 from 0xProject/feature/instant/basic-token-modalFrancesco Agosti2018-11-0219-142/+367
|\ \ \ \
* \ \ \ \ Merge pull request #1197 from 0xProject/feature/instant/add-new-order-and-repFrancesco Agosti2018-11-016-37/+51
|\ \ \ \ \
| * | | | | chore: remove unused importfragosti2018-11-011-1/+1
| * | | | | chore: remove unused importfragosti2018-11-011-1/+0
| * | | | | fix: address PR commentsfragosti2018-11-016-33/+90
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | chore: add changelogfragosti2018-10-301-0/+4
| * | | | | feat: remove isValidProvided orders validationfragosti2018-10-303-33/+35
| * | | | | chore: remove console logfragosti2018-10-301-1/+0
| * | | | | feat(instant): add default gasPrice of 6 gwei to transactionsBrandon Millman2018-10-302-2/+5
| * | | | | feat: add augur provided orderfragosti2018-10-304-18/+26
* | | | | | Merge pull request #1199 from 0xProject/feature/website/metmask-breaking-changeBrandon Millman2018-11-012-69/+66
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | fix(website): prepare website for breaking MetaMask change for eip 1102Brandon Millman2018-10-312-69/+66
| | | | * | chore: add to changelogfragosti2018-11-011-0/+5
| | | | * | feat: expose new `getAvailableAssetDatasAsync` APIfragosti2018-11-016-10/+54
| | | | * | feat: add more asestMetaDatasfragosti2018-11-012-0/+98
| | | |/ /
| | | * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-015-6/+61
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge pull request #1198 from 0xProject/feature/instant/gas-estimateSteve Klebanoff2018-10-315-6/+61
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Move tslint disable lineSteve Klebanoff2018-10-301-1/+3
| * | | Add comment and use constantSteve Klebanoff2018-10-301-2/+3
| * | | Use polyfilled fetch from utilsSteve Klebanoff2018-10-301-2/+2
| * | | async suffix and use polyfill fetch utilSteve Klebanoff2018-10-301-4/+4
| * | | Introduce constants for eth gas station and coinbaseSteve Klebanoff2018-10-303-7/+9
| * | | Comment for warming up cacheSteve Klebanoff2018-10-301-0/+2
| * | | lintingSteve Klebanoff2018-10-302-1/+2
| * | | Use constant that exists nowSteve Klebanoff2018-10-301-5/+4
| * | | gas price estimatorSteve Klebanoff2018-10-303-2/+50
|/ / /
| | * chore: address PR feedbackfragosti2018-11-0113-43/+45
| | * feat: implement sliding panelfragosti2018-10-319-79/+138
| | * feat: allow for flexible position in position animation componentfragosti2018-10-313-13/+23
| | * feat: refactor animation codefragosti2018-10-3110-74/+130
| | * feat: add 'Select Token' UI to asset amount inputfragosti2018-10-304-17/+61
| | * feat: add chevron icon and add it to asset amount inputfragosti2018-10-302-6/+27
| | * feat: add basic panel component and other small improvementsfragosti2018-10-305-7/+40
| |/ |/|
* | Merge pull request #1196 from 0xProject/feature/instant/default-gas-priceBrandon Millman2018-10-302-2/+5
|\ \ | |/ |/|
| * feat(instant): add default gasPrice of 6 gwei to transactionsBrandon Millman2018-10-302-2/+5
|/
* Merge pull request #1187 from 0xProject/feature/instant/fixed-orders-in-rende...Brandon Millman2018-10-3023-241/+263
|\
| * fix(instant): fix spelling error and BigNumber gte operationBrandon Millman2018-10-302-4/+4
| * Merge branch 'development' into feature/instant/fixed-orders-in-render-methodBrandon Millman2018-10-3011-69/+79
| |\ | |/ |/|
* | Merge pull request #1193 from 0xProject/feature/not-enough-ethSteve Klebanoff2018-10-3012-32/+116
|\ \
| * | Has Sufficient Funds/Balance -> Has Sufficient ETHSteve Klebanoff2018-10-304-6/+6
| * | When transaction too low, treat as validation error. also modify callback: er...Steve Klebanoff2018-10-303-8/+13
| * | onPendingValidation -> onValidationPendingSteve Klebanoff2018-10-293-8/+8
| * | lintingSteve Klebanoff2018-10-273-11/+1
| * | Simpler way of validaitng has enough ethSteve Klebanoff2018-10-276-56/+37
| * | questionmark syntax instead of '| undefined'Steve Klebanoff2018-10-271-1/+1
| * | Validate enough ETH when user clicks buySteve Klebanoff2018-10-273-1/+16
| * | Merge branch 'development' into feature/not-enough-ethSteve Klebanoff2018-10-2756-212/+224
| |\ \
| * | | acccount for no addressSteve Klebanoff2018-10-273-11/+19
| * | | move funct into utilSteve Klebanoff2018-10-272-5/+32
| * | | move importsSteve Klebanoff2018-10-271-4/+2
| * | | yarn.lock changesSteve Klebanoff2018-10-271-2/+39
| * | | Merge branch 'development' into feature/not-enough-ethSteve Klebanoff2018-10-2741-632/+1228
| |\ \ \
| * | | | feat(instant): Show message if user doesn't have enough ETHSteve Klebanoff2018-10-274-2/+24
| * | | | ethDecimals -> ETH_DECIMALSSteve Klebanoff2018-10-274-9/+11
| | | | * Merge branch 'development' into feature/instant/fixed-orders-in-render-methodBrandon Millman2018-10-2966-223/+398
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Merge pull request #1194 from 0xProject/feature/instant/input-to-fixedSteve Klebanoff2018-10-274-2/+21
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fix(instant): refactor some props to use isDisabled instead of disabledBrandon Millman2018-10-274-16/+16
| * | | | feat(instant): Disable input when processingSteve Klebanoff2018-10-274-2/+21
| | |/ / | |/| |
* | | | Merge pull request #1189 from 0xProject/feature/instant/txn-failureSteve Klebanoff2018-10-2711-144/+105
|\ \ \ \
| * | | | linting importsSteve Klebanoff2018-10-271-2/+2
| * | | | selected asset buy order state button -> selected asset buy order state buttonsSteve Klebanoff2018-10-272-6/+9
| * | | | buy order state button -> buy order state buttonsSteve Klebanoff2018-10-272-3/+3
| * | | | tsx -> tsSteve Klebanoff2018-10-271-0/+0
| * | | | Get BuyOrderState one big connected component, and let user view failureSteve Klebanoff2018-10-269-157/+96
| * | | | Show View Transaction button on failure, and allow setting of width for Try A...Steve Klebanoff2018-10-266-13/+32
| * | | | Merge branch 'feature/instant/view-processings-txn' into feature/instant/txn-...Steve Klebanoff2018-10-262-10/+5
| |\ \ \ \
| * | | | | Added string to constantsSteve Klebanoff2018-10-262-1/+3
* | | | | | Merge pull request #1178 from 0xProject/fix/linter-improvementsAlex Browne2018-10-2744-62/+78
|\ \ \ \ \ \
| * | | | | | Add note about tslint false positiveAlex Browne2018-10-272-0/+4
| * | | | | | chore: Update contract-wrappers CHANGELOG.jsonAlex Browne2018-10-241-0/+9
| * | | | | | fix(contract-wrappers): Fix tslint errors that were lingering due to misconfi...Alex Browne2018-10-249-28/+31
| * | | | | | chore: Add --format stylish to tslintAlex Browne2018-10-2434-34/+34
* | | | | | | Merge pull request #1188 from 0xProject/fix/instant/quote-race-conditionsBrandon Millman2018-10-271-6/+41
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add back debounceBrandon Millman2018-10-271-1/+3
| * | | | | | Make doesBuyQuoteMatchState in reducer less strictBrandon Millman2018-10-271-7/+12
| * | | | | | fix(instant): prevent outdated quote requests from overriding the correct quoteBrandon Millman2018-10-272-9/+37
|/ / / / / /
* | | | | | feat(order_utils.py): ERC721 asset data codec (#1186)F. Eugene Aumson2018-10-276-9/+153
| | | | | * Refactor error handling such that errorMessage lives on the top level stateBrandon Millman2018-10-2710-158/+71
| | | | | * fix: init BigNumberInput not BigNumber when initializing statefragosti2018-10-273-10/+52
| | | | | * Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-2738-659/+1078
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | fix(order_utils.py): tweaks for first publish (#1185)F. Eugene Aumson2018-10-2711-17/+137
* | | | | | Merge pull request #1175 from 0xProject/feature/instant/input-fees-roundingFrancesco Agosti2018-10-2722-157/+473
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-2621-152/+283
| |\ \ \ \ \ \
| * | | | | | | chore: dont override toString of BigNumber and other PR feedbackfragosti2018-10-2610-41/+53
| * | | | | | | chore: update commentsfragosti2018-10-251-2/+2
| * | | | | | | chore: use alternate syntax for styledfragosti2018-10-254-4/+16
| * | | | | | | fix: weird linting error that depends on typesfragosti2018-10-252-2/+39
| * | | | | | | feat: change to increasing input width by a constant amount per additional ch...fragosti2018-10-252-51/+6
| * | | | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-2519-44/+215
| |\ \ \ \ \ \ \
| * | | | | | | | chore: run linterfragosti2018-10-253-3/+3
| * | | | | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-2597-533/+1556
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fix: address PR feedbackfragosti2018-10-252-6/+6
| * | | | | | | | | feat: cover more token symbol edge casesfragosti2018-10-246-12/+27
| * | | | | | | | | feat: add title attribute to labelfragosti2018-10-241-2/+2
| * | | | | | | | | feat: add formatted symbol for asset uitlfragosti2018-10-241-1/+11
| * | | | | | | | | feat: support half-written decimal numbers in BigNumberInputfragosti2018-10-242-1/+31
| * | | | | | | | | fix: remove unused callback infofragosti2018-10-241-3/+3
| * | | | | | | | | polish: improve scaling significantlyfragosti2018-10-243-28/+50
| * | | | | | | | | fix: remove the concept of initial with from scaling input and remove phasefragosti2018-10-242-27/+21
| * | | | | | | | | fix: dont allow heading to change height when input size changesfragosti2018-10-243-3/+7
| * | | | | | | | | chore: run linterfragosti2018-10-234-11/+2
| * | | | | | | | | chore: final adjustmentsfragosti2018-10-232-3/+3
| * | | | | | | | | chore: refactor ScalingInputfragosti2018-10-231-9/+18
| * | | | | | | | | feature: reduce font size by a percentage instead of a constantfragosti2018-10-233-39/+57
| * | | | | | | | | feat: have basic scaling amount input workingfragosti2018-10-235-52/+131
| * | | | | | | | | feat: add scaling input componentfragosti2018-10-202-4/+88
| * | | | | | | | | fix: animation component typingfragosti2018-10-201-4/+1
| * | | | | | | | | feat: user better syntax for defining ui componentsfragosti2018-10-204-18/+4
| * | | | | | | | | feat: upgrade to styled-components v4fragosti2018-10-205-20/+74
* | | | | | | | | | Merge pull request #1192 from 0xProject/feature/contract-addresses/updateForw...Amir Bandeali2018-10-274-447/+464
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Update CHANGELOGsAmir Bandeali2018-10-272-0/+18
| * | | | | | | | | feat: update addresses for ForwarderAmir Bandeali2018-10-271-3/+3
| * | | | | | | | | feat: update artifact for ForwarderAmir Bandeali2018-10-271-444/+443
|/ / / / / / / / /
* | | | | | | | | Merge branch 'development' of github.com:0xProject/0x-monorepo into developmentFabio Berger2018-10-261-1/+4
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #1190 from 0xProject/fix/website/fill-order-roundingKadinsky2018-10-262-46/+5
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | fix(website): round makerAssetToken amount in FillOrder componentBrandon Millman2018-10-262-46/+5
| |/ / / / / / / /
* / / / / / / / / Update yarn.lockFabio Berger2018-10-261-45/+1
|/ / / / / / / /
| | | | | | | * fix: justify error message leftfragosti2018-10-271-1/+1
| | | | | | | * feat: add assertions to render methodfragosti2018-10-274-1/+60
| | | | | | | * Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-2621-152/+283
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #1184 from 0xProject/feature/instant/view-processings-txnSteve Klebanoff2018-10-2611-53/+101
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | cleanup codeSteve Klebanoff2018-10-261-7/+2
| * | | | | | | Added string to constantsSteve Klebanoff2018-10-262-1/+3
| * | | | | | | better type namesSteve Klebanoff2018-10-261-3/+3
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Rework OrderState to have more simple definitionSteve Klebanoff2018-10-261-12/+4
| * | | | | | Making failure txHash requiredSteve Klebanoff2018-10-263-4/+5
| * | | | | | txnHash -> txHashSteve Klebanoff2018-10-265-22/+22
| * | | | | | new try/catch pattern and new prop names per code review feedbackSteve Klebanoff2018-10-262-13/+28
| * | | | | | take out unused importsSteve Klebanoff2018-10-262-2/+2
| * | | | | | Take out old TODOSteve Klebanoff2018-10-261-1/+0
| * | | | | | feat(instant): Be able to view transaction when transaction is in progressSteve Klebanoff2018-10-253-4/+13
| * | | | | | Associate txnhash with processing stateSteve Klebanoff2018-10-253-12/+28
| * | | | | | Introduce new OrderProcessStateSteve Klebanoff2018-10-258-26/+45
* | | | | | | Merge pull request #1151 from 0xProject/fix-update-migrations-readmeAlex Browne2018-10-251-25/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix prettierLeonid Logvinov2018-10-181-1/+0
| * | | | | | | fix(migrations): Update README.md.Alex Browne2018-10-181-24/+2
* | | | | | | | Merge pull request #1182 from 0xProject/albrow-codeownersAlex Browne2018-10-251-7/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Add albrow to CODEOWNERSAlex Browne2018-10-251-7/+13
* | | | | | | | | Merge pull request #1176 from 0xProject/fix/asset-buyer/rounding-errorsBrandon Millman2018-10-257-69/+155
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | chore(asset-buyer): fix lint errorsBrandon Millman2018-10-241-3/+3
| * | | | | | | | feat(asset-buyer): update buyQuoteCalculator to match rounding behavior in co...Brandon Millman2018-10-247-69/+155
* | | | | | | | | Merge pull request #1180 from 0xProject/feature/instant/metamask-denialSteve Klebanoff2018-10-253-2/+16
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | feat: Message when denying signing transactionSteve Klebanoff2018-10-251-1/+1
| * | | | | | | | Message when signature deniedSteve Klebanoff2018-10-253-2/+16
| | | | | | | | * feat: change network to networkIdfragosti2018-10-263-7/+44
| | | | | | | | * chore: add to asset-buyer changelog.jsonfragosti2018-10-262-2/+12
| | | | | | | | * revert: change to contract-addressesfragosti2018-10-261-1/+1
| | | | | | | | * fix: dont fail for mainnet assetData and non-mainnet networkfragosti2018-10-262-3/+6
| | | | | | | | * feat: support defaultAssetBuyAmount settingfragosti2018-10-262-7/+8
| | | | | | | | * chore: use parseInt instead of +fragosti2018-10-261-1/+1
| | | | | | | | * chore: remove console logfragosti2018-10-261-1/+0
| | | | | | | | * feat: flash an error if the wrong network is detectedfragosti2018-10-263-8/+31
| | | | | | | | * feat: supply render options from URLfragosti2018-10-265-55/+60
| | | | | | | | * feat: no longer require separate `orders` and `feeOrders` args in `getAssetBu...fragosti2018-10-251-4/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #1179 from 0xProject/feature/instant/processing-stateSteve Klebanoff2018-10-2520-45/+216
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Get rid of react-shared as a dependency, write own etherscanUtilSteve Klebanoff2018-10-254-5/+27
| |/ / / / / /
| * | | | | | bumping up max bundle size for now (introducing react-shared added a lot), wi...Steve Klebanoff2018-10-251-1/+1
| * | | | | | Get rid of unused importSteve Klebanoff2018-10-251-1/+1
| * | | | | | Revert "commiting addtl changes to yarn.lock from running yarn"Steve Klebanoff2018-10-241-1/+45
| * | | | | | commiting addtl changes to yarn.lock from running yarnSteve Klebanoff2018-10-241-45/+1
| * | | | | | Merge branch 'development' into feature/instant/processing-stateSteve Klebanoff2018-10-2471-180/+1028
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | feat(instant): Procesing and Success statesSteve Klebanoff2018-10-2413-36/+116
| * | | | | | Make icon a bit betterSteve Klebanoff2018-10-231-1/+1
| * | | | | | Placing order buttonSteve Klebanoff2018-10-231-2/+4
| * | | | | | Spinner: change prop names and fix svg propsSteve Klebanoff2018-10-231-9/+9
| * | | | | | Making SecondaryButton accept children instead of text propSteve Klebanoff2018-10-233-5/+22
| * | | | | | Spinner no longer wobblySteve Klebanoff2018-10-232-6/+15
| * | | | | | WIP: spinnerSteve Klebanoff2018-10-232-0/+45
* | | | | | | Merge pull request #1181 from snario/patch-1Alex Browne2018-10-251-0/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Update README.mdLiam Horne2018-10-251-0/+4
|/ / / / / /
* | | | | | Merge pull request #1170 from 0xProject/feature/instant/failure-stateSteve Klebanoff2018-10-2413-31/+218
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | rename containerSteve Klebanoff2018-10-242-5/+5
| * | | | | rename action to resetAmountSteve Klebanoff2018-10-242-3/+3
| * | | | | null -> undefinedSteve Klebanoff2018-10-241-2/+2
| * | | | | move buy order state to its own componentSteve Klebanoff2018-10-242-18/+26
| * | | | | Merge branch 'development' into feature/instant/failure-stateSteve Klebanoff2018-10-2464-134/+978
| |\ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
* | | | | Merge pull request #1159 from 0xProject/feature/instant/beta-render-et-alFrancesco Agosti2018-10-2426-135/+379
|\ \ \ \ \
| * | | | | chore: incorportate pr feedbackfragosti2018-10-245-7/+46
| * | | | | chore: run linterfragosti2018-10-231-1/+1
| * | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-2319-97/+145
| |\ \ \ \ \
| * | | | | | feat: add tests for assetUtilsfragosti2018-10-232-9/+30
| * | | | | | feat: add asset testsfragosti2018-10-231-0/+25
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 18:51:12 +0800