aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | chore: change order of code to be clearerfragosti2018-10-232-1/+3
* | | | | | | Merge pull request #1177 from 0xProject/fix/web3-wrapper-transaction-typeAlex Browne2018-10-242-2/+19
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | chore: Fix linterAlex Browne2018-10-241-1/+1
| * | | | | | chore(web3-wrapper): Update CHANGELOG.jsonAlex Browne2018-10-241-0/+10
| * | | | | | fix(web3-wrapper): Make getTransactionByHashAsync return the correct typeAlex Browne2018-10-241-2/+9
|/ / / / / /
* | | | | | Merge pull request #1147 from 0xProject/feature/asset-buyer/signing-request-e...Brandon Millman2018-10-2410-17/+66
|\ \ \ \ \ \
| * | | | | | feat(contract-wrappers): relax requirement for throwing `ContractWrappersErro...Brandon Millman2018-10-242-2/+2
| * | | | | | feat(asset-buyer): throw SignatureRequestDenied and TransactionValueTooLow er...Brandon Millman2018-10-243-16/+33
| * | | | | | feat(monorepo-scripts): add ForwarderWrapperError to IGNORED_EXCESSIVE_TYPES ...Brandon Millman2018-10-242-0/+5
| * | | | | | feat(contract-wrappers): export ForwarderWrapperError and ContractWrapperErro...Brandon Millman2018-10-235-1/+28
* | | | | | | Merge pull request #1162 from 0xProject/fix/contracts/forwarderRoundingAmir Bandeali2018-10-243-8/+278
|\ \ \ \ \ \ \
| * | | | | | | Run prettier and linterAmir Bandeali2018-10-241-2/+0
| * | | | | | | Round up for Market Buys in Forwarding Contract. Includes new test cases + re...Greg Hysen2018-10-243-8/+280
|/ / / / / / /
* / / / / / / feat(order_utils.py): ERC20 asset data encoding and decodingF. Eugene Aumson2018-10-2423-37/+410
|/ / / / / /
* | / / / / fix(website): asset-buyer usage documentation formattingBrandon Millman2018-10-232-5/+5
| |/ / / / |/| | | |
* | | | | Merge pull request #1173 from 0xProject/fixSchemaBugKadinsky2018-10-2316-52/+130
|\ \ \ \ \
| * | | | | Add wholeNumberSchema testFabio Berger2018-10-221-0/+12
| * | | | | chore: fix file nameFabio Berger2018-10-221-1/+1
| * | | | | chore: Add whole number to next json-schema doc md sectionFabio Berger2018-10-222-5/+53
| * | | | | chore: link to schemas at a particular commit so it doesn't change when they ...Fabio Berger2018-10-221-29/+29
| * | | | | Fix linksFabio Berger2018-10-221-7/+7
| * | | | | revert unrelated changeFabio Berger2018-10-221-2/+2
| * | | | | Add changelogFabio Berger2018-10-221-0/+10
| * | | | | fix: improve schemas by enforcing that amounts that must be whole numbers (e....Fabio Berger2018-10-228-17/+17
| * | | | | chore: add whole number schemaFabio Berger2018-10-223-1/+9
| * | | | | fix: Update address to ZRX token to newly deployed 'mintable' ZRX token on Ko...Fabio Berger2018-10-201-2/+2
* | | | | | Merge pull request #1174 from 0xProject/fix/website/kovanBrandon Millman2018-10-233-9/+53
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix(website): create correct subprovider for metamaskBrandon Millman2018-10-231-1/+1
| * | | | | fix(website): do not fetch balances for empty tokensBrandon Millman2018-10-231-6/+13
| * | | | | Update yarn.lockBrandon Millman2018-10-231-2/+39
|/ / / / /
| | * | | Remove hack fixSteve Klebanoff2018-10-201-4/+2
| | * | | feat(instant): Add failure state and iconSteve Klebanoff2018-10-203-15/+35
| | * | | lintingSteve Klebanoff2018-10-203-4/+0
| | * | | Small refacotor of icons or amounts partSteve Klebanoff2018-10-201-7/+3
| | * | | Render failure iconSteve Klebanoff2018-10-201-2/+23
| | * | | Merge branch 'feature/instant/beta-render-et-al' into feature/instant/failure...Steve Klebanoff2018-10-2052-579/+770
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-2026-369/+357
| |\ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
* | | | Merge pull request #1168 from 0xProject/feature/contracts/updateReadmeAmir Bandeali2018-10-201-14/+8
|\ \ \ \
| * | | | Update links, remove 1.0 from READMEAmir Bandeali2018-10-201-14/+8
|/ / / /
* | | | Merge pull request #1161 from 0xProject/feature/instant/order-details-loading...Steve Klebanoff2018-10-2014-131/+202
|\ \ \ \
| * | | | lintingSteve Klebanoff2018-10-201-2/+2
| * | | | arrow function syntax so no need to bindSteve Klebanoff2018-10-201-8/+6
| * | | | dont export PlainPlaceholderSteve Klebanoff2018-10-201-2/+2
| * | | | Refactor to make placeholder logic more straightforwardSteve Klebanoff2018-10-201-5/+6
| * | | | Getting rid of displayName, and rename usdSection -> _renderUsdSectionSteve Klebanoff2018-10-201-3/+2
| * | | | undefined -> null to follow conventionSteve Klebanoff2018-10-191-2/+2
| * | | | pulsating -> isPulsatingSteve Klebanoff2018-10-193-7/+7
| * | | | Allow more than 1 class per fileSteve Klebanoff2018-10-191-1/+2
| * | | | Move USD section into helper functionSteve Klebanoff2018-10-191-46/+42
| * | | | feat(instant): Indicate that order details section is loading by having pulsi...Steve Klebanoff2018-10-194-16/+47
| * | | | Moved LatestErrorDisplay to types file and gave generic nameSteve Klebanoff2018-10-193-12/+13
| * | | | Rename update function to set function since it doesnt take a parameterSteve Klebanoff2018-10-193-9/+9
| * | | | fix camel casing of updateBuyOrderStateSteve Klebanoff2018-10-193-5/+5
| * | | | Pulsating holder element showing, even if amount is emptySteve Klebanoff2018-10-194-57/+101
| * | | | quoteState -> quoteRequestStateSteve Klebanoff2018-10-195-17/+17
* | | | | Merge pull request #1164 from 0xProject/additionalDevFixesKadinsky2018-10-2011-223/+147
|\ \ \ \ \
| * | | | | Use em for allFabio Berger2018-10-203-3/+3
| * | | | | chore: use TextFabio Berger2018-10-201-2/+2
| * | | | | chore: use `colors` moduleFabio Berger2018-10-201-1/+1
| * | | | | fix: scroll lag on doc reference and wiki pages by using react-scroll `spy` a...Fabio Berger2018-10-207-124/+111
| * | | | | Use media moduleFabio Berger2018-10-201-2/+3
| * | | | | Remove unused listenersFabio Berger2018-10-202-18/+0
| * | | | | chore: fix dropdown bug on Firefox and reduced duplicate codeFabio Berger2018-10-191-24/+22
| * | | | | style: Switch out homepage image with improved one from BenFabio Berger2018-10-191-51/+6
| * | | | | style: make sure sideBar bottom padding is on scrollable content, not containerFabio Berger2018-10-191-2/+3
| | | * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-2025-158/+320
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #1148 from 0xProject/feature/instant/dischargeFrancesco Agosti2018-10-204-3/+129
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-20704-13814/+7099
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1165 from 0xProject/fix/release-notes-versionsLeonid Logvinov2018-10-195-17/+17
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix the package versions in release notesLeonid Logvinov2018-10-195-17/+17
|/ / / / / /
* | | | | | Merge pull request #1163 from 0xProject/devSectionFixesKadinsky2018-10-1916-116/+144
|\ \ \ \ \ \
| * | | | | | Improve sidebar logic to handle MS Edge, Firefox differences between Windows ...Fabio Berger2018-10-193-6/+30
| * | | | | | chore: improve sidebar scrollFabio Berger2018-10-191-1/+1
| * | | | | | chore: Replace state with styled-components for hover detectionFabio Berger2018-10-191-71/+69
| * | | | | | style: accomodate different scrollbar widths on Firefox vs. Chrome/SafariFabio Berger2018-10-191-2/+3
| * | | | | | chore: Fix scroll issue by bumping version and installing from new branchFabio Berger2018-10-194-8/+8
| * | | | | | style: fix doc reference package name capitalizationFabio Berger2018-10-191-2/+2
| * | | | | | Merge branch 'development' into devSectionFixesFabio Berger2018-10-191-23/+31
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1160 from 0xProject/fix/published-packages-listAlex Browne2018-10-191-23/+31
|\ \ \ \ \ \ \
| * | | | | | | chore: Update list of published packages in top-level READMEAlex Browne2018-10-191-23/+31
| | |_|/ / / / | |/| | | | |
| | * | | | | copy: consistently name ERCdEX with correct capitalizationFabio Berger2018-10-191-7/+7
| | * | | | | Switch tutorial descriptionsFabio Berger2018-10-195-10/+10
| | * | | | | copy: Networked liquidity -> shared liquidityFabio Berger2018-10-198-15/+15
| | * | | | | fix: Make sure page scrollable on mobileFabio Berger2018-10-191-2/+3
| | * | | | | Don't show topBar menu items in sidebar on wikiFabio Berger2018-10-191-1/+5
| |/ / / / / |/| | | | |
| | * | | | prettify discharge filefragosti2018-10-181-11/+11
| | * | | | feat: create dogfood url and deployment workflowfragosti2018-10-184-4/+184
| | | * | | chore: run linterfragosti2018-10-201-1/+0
| | | * | | fix: dont force NFTs to uppercase their namefragosti2018-10-191-1/+1
| | | * | | feat: add network to state and use it where relevantfragosti2018-10-195-32/+48
| | | * | | feat: use color from metaData instead of default primaryColorfragosti2018-10-192-3/+35
| | | * | | fix: refactor ZeroExInstant state creation logic and fix bugfragosti2018-10-193-6/+7
| | | | * | Selected Asset buttonSteve Klebanoff2018-10-206-65/+68
| | | | * | WIP: clear buy quote workingSteve Klebanoff2018-10-204-7/+15
| | | | * | wip: retry buttonSteve Klebanoff2018-10-204-30/+98
| | | | * | Icon component for InstantSteve Klebanoff2018-10-201-0/+58
| | | | * | Show order failed messaging when order failsSteve Klebanoff2018-10-192-27/+45
| | | |/ /
| | | * | fix: error test undefined casefragosti2018-10-192-3/+3
| | | * | fix: add error message and move more logic to assetUtilsfragosti2018-10-192-13/+10
| | | * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-19701-13765/+7119
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge pull request #1158 from 0xProject/docSectionFixesKadinsky2018-10-1956-64/+391
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'development' into docSectionFixesFabio Berger2018-10-192-1/+4
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1157 from 0xProject/feature/fix-monorepo-scriptsLeonid Logvinov2018-10-182-1/+4
|\ \ \ \ \
| * | | | | Remove 0x.js -> monorepo-scripts dependencyLeonid Logvinov2018-10-181-1/+0
| * | | | | Don't attempt publishing if no packages need itLeonid Logvinov2018-10-181-0/+4
|/ / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 11:34:35 +0800