aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-07-0418-246/+312
|\ | | | | | | feature/website/portal-mobile-improvements
| * Merge pull request #811 from 0xProject/feature/website/onboarding-polish-2Francesco Agosti2018-07-049-47/+99
| |\ | | | | | | Add Hotjar, and other small improvements
| | * Persist whether onboarding is open or close across refreshesfragosti2018-07-041-1/+3
| | |
| | * Fix lintingfragosti2018-07-042-3/+2
| | |
| | * Merge branch 'fixed-position-onboarding' into ↵fragosti2018-07-042-33/+67
| | |\ | | | | | | | | | | | | feature/website/onboarding-polish-2
| | | * Implement fixed position onboarding optionfragosti2018-07-032-33/+67
| | | |
| | * | Remove unused importfragosti2018-07-031-1/+0
| | | |
| | * | Add media file and remove stray commentfragosti2018-07-032-2/+15
| | |/
| | * Add media query abstraction around ScreenWidths and stop relayer grid hover ↵fragosti2018-07-034-9/+11
| | | | | | | | | | | | effect on mobile
| | * Remove max-width from onboarding card to support iPadfragosti2018-07-031-1/+1
| | |
| | * Only auto-start onboarding if blockchain is loadedfragosti2018-07-031-2/+5
| | |
| * | Merge pull request #799 from 0xProject/feature/website/wallet-menuBrandon Millman2018-07-049-199/+213
| |\ \ | | | | | | | | Add menu for at the top of wallet and top right component
| | * | Remove InstallPromptBrandon Millman2018-07-042-61/+0
| | | |
| | * | Implement clickaway for wallet menu on mobileBrandon Millman2018-07-042-14/+24
| | | |
| | * | Add optional onClick to Link simple menu itemBrandon Millman2018-07-031-2/+7
| | | |
| | * | Lint fixesBrandon Millman2018-07-024-17/+5
| | | |
| | * | More cleanupBrandon Millman2018-07-022-31/+31
| | | |
| | * | Consolidate logic for common menu itemsBrandon Millman2018-07-023-33/+74
| | | |
| | * | Give connected header accessory more paddingBrandon Millman2018-07-021-9/+13
| | | |
| | * | Implement correct behavior for menu in the walletBrandon Millman2018-07-026-31/+52
| | | |
| | * | Add menu to walletBrandon Millman2018-07-021-8/+32
| | | |
| | * | Implement simple menuBrandon Millman2018-07-025-91/+50
| | | |
| | * | Clean up a bit of the provider display logicBrandon Millman2018-07-023-73/+80
| | | |
| | * | Implement icon buttonBrandon Millman2018-07-022-2/+18
| | | |
* | | | Prompt user to download Toshi or MetaMask in install wallet onboarding stepfragosti2018-07-043-46/+73
| | | |
* | | | Show different download links and icons when on mobilefragosti2018-07-043-20/+47
| | | |
* | | | Rename isMobile utility fn to be more specific and add isMobileOperatingSystemfragosti2018-07-043-5/+8
| | | |
* | | | Add OperatingSystemType and get OS utilfragosti2018-07-042-0/+28
|/ / /
* | | Merge pull request #806 from ↵Brandon Millman2018-07-034-0/+11
|\ \ \ | | | | | | | | | | | | | | | | 0xProject/feature/website/mobile-readable-web3-names Add detection logic for Toshi and Cipher
| * | | Add human readable names for Toshi and CipherBrandon Millman2018-07-034-0/+11
| | | |
* | | | Merge pull request #808 from 0xProject/feature/website/better-balance-formattingBrandon Millman2018-07-033-18/+21
|\ \ \ \ | | | | | | | | | | Add better balance formatting rules for balances and usd values
| * | | | Add better balance formatting rules for balances and usd valuesBrandon Millman2018-07-033-18/+21
| | |_|/ | |/| |
* | | | Merge pull request #810 from 0xProject/feature/wesbite/remove-add-balanceBrandon Millman2018-07-035-42/+2
|\ \ \ \ | | | | | | | | | | Remove increase balance link from balance_bounded_input component
| * | | | Remove increase balance link from balance_bounded_input componentBrandon Millman2018-07-035-42/+2
| | | | |
* | | | | Use new lock svgBrandon Millman2018-07-031-2/+2
|/ / / /
* | / / Always show the wrap ether row in between ETH and WETHBrandon Millman2018-07-032-18/+20
| |/ / |/| |
* | | Update start onboarding copy and relayer grid empty colorBrandon Millman2018-07-032-7/+7
|/ /
* / Add Alex Browne to about pagefragosti2018-07-031-10/+19
|/
* Update relayer grid tiles to use TextBrandon Millman2018-07-012-50/+17
|
* Merge pull request #787 from 0xProject/feature/website/portal-onboarding-polishFrancesco Agosti2018-06-3018-143/+232
|\ | | | | Portal v2 onboarding polish
| * Remove state variable from Link component in Portalfragosti2018-06-301-4/+1
| |
| * Remove extra call to scrollIntoView for wallet in onboardingfragosti2018-06-301-4/+0
| |
| * Bump automatic show onborading delay by 1000msfragosti2018-06-301-1/+1
| |
| * Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-3024-397/+586
| |\ | | | | | | | | | feature/website/portal-onboarding-polish
| * | Fix onboarding always startingfragosti2018-06-301-1/+2
| | |
| * | Rename userHasAllowances bool to follow proper conventionfragosti2018-06-302-6/+6
| | |
| * | Allow you to continue the onboarding flow once youve installed metamask and ↵fragosti2018-06-305-17/+18
| | | | | | | | | | | | refreshed the page
| * | Use Image component where relevant and add back tracked token timestamp logicfragosti2018-06-303-8/+24
| | |
| * | Bold all balances in onboardingfragosti2018-06-292-6/+8
| | |
| * | Customize allowance setting onboarding step if you have your allowances setfragosti2018-06-292-0/+4
| | |
| * | Re-center react-popper on every stepfragosti2018-06-292-16/+4
| | |
| * | Fix button hover and active hover statefragosti2018-06-291-1/+1
| | |
| * | Show eth balance in add eth balance onboarding stepfragosti2018-06-293-11/+16
| | |
| * | Change onboarding flow to communicate 3 stepsfragosti2018-06-292-6/+10
| | |
| * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-2919-301/+304
| |\ \ | | | | | | | | | | | | feature/website/portal-onboarding-polish
| * | | Scroll to top when going to relayers page from onboardingfragosti2018-06-281-0/+1
| | | |
| * | | Bring you directly to relayers page once you finish onboardingfragosti2018-06-283-1/+14
| | | |
| * | | Remove period in title from last stepfragosti2018-06-281-1/+1
| | | |
| * | | Always restart onboarding from 0 and other small improvementsfragosti2018-06-282-3/+5
| | | |
| * | | Customize flow depending on what steps you've completedfragosti2018-06-284-20/+43
| | | |
| * | | Break wrapping ETH into a 3rd stepfragosti2018-06-282-5/+24
| | | |
| * | | Fix animation when coming from bottomfragosti2018-06-281-0/+6
| | | |
| * | | Fix width issue with onboarding card on mobilefragosti2018-06-282-1/+3
| | | |
| * | | Clicking overlay closes onboardingfragosti2018-06-284-6/+12
| | | |
| * | | Fix z index issue with wrap buttons and onboarding cardsfragosti2018-06-282-1/+2
| | | |
| * | | Break wrath ETH step into 2fragosti2018-06-283-70/+72
| | | |
| * | | Fix skip button position on first stepfragosti2018-06-281-11/+15
| | | |
| * | | Make onboarding bounce around lessfragosti2018-06-282-13/+5
| | | |
| * | | Scroll to wallet when onboarding automatically starts as wellfragosti2018-06-281-1/+4
| | | |
* | | | Update staging api linkBrandon Millman2018-06-301-1/+1
| | | |
* | | | Move /docs route to the endBrandon Millman2018-06-301-1/+1
| |_|/ |/| |
* | | Merge pull request #792 from 0xProject/feature/website/wallet-polishBrandon Millman2018-06-3024-397/+585
|\ \ \ | |_|/ |/| | Various wallet polish items
| * | Change function to a constBrandon Millman2018-06-301-2/+2
| | |
| * | Move wallet scrollIntoView into PortalOnboardingFlowBrandon Millman2018-06-302-7/+7
| | |
| * | Add dollar sign to NullTokenRowBrandon Millman2018-06-291-1/+1
| | |
| * | Remove unused imports and variablesBrandon Millman2018-06-295-20/+1
| | |
| * | Refactor inline styles out of WalletBrandon Millman2018-06-296-132/+139
| | |
| * | Remove some hardcoded MetaMask colorsBrandon Millman2018-06-292-3/+5
| | |
| * | Create AccountConnection componentBrandon Millman2018-06-293-31/+61
| | |
| * | Fix scrollbar bugBrandon Millman2018-06-291-1/+1
| | |
| * | Start onboarding from relayer indexBrandon Millman2018-06-291-6/+20
| | |
| * | Fix learn how to set up account layoutBrandon Millman2018-06-292-11/+13
| | |
| * | Fix typoBrandon Millman2018-06-291-1/+1
| | |
| * | Get rid of unused stuff in walletBrandon Millman2018-06-291-65/+1
| | |
| * | Fix body overlay on mobileBrandon Millman2018-06-292-3/+3
| | |
| * | Change learn how to update your account stylingBrandon Millman2018-06-291-27/+17
| | |
| * | Fix key issue and remove WalletDisconnectedItemBrandon Millman2018-06-292-112/+1
| | |
| * | Implement new locked and uninstalled statesBrandon Millman2018-06-297-7/+178
| | |
| * | Fix off center icon in walletBrandon Millman2018-06-291-4/+7
| | |
| * | Change wallet margin based on hover to prevent re-layoutBrandon Millman2018-06-291-0/+1
| | |
| * | Update ProviderDisplay with new designBrandon Millman2018-06-295-37/+118
| | |
| * | Implement provider name in headerBrandon Millman2018-06-292-4/+18
| | |
| * | Implement loading body rowsBrandon Millman2018-06-294-28/+80
| | |
| * | Added Circle componentBrandon Millman2018-06-293-6/+21
| | |
* | | Fix NotFound component and render 0x.js docs for /docsBrandon Millman2018-06-293-3/+5
|/ /
* | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-2916-55/+117
|\ \ | | | | | | | | | feature/website/support-new-metamask
| * | Remove isTracked field on token in favor of trackedTimestampBrandon Millman2018-06-2911-26/+31
| | |
| * | Use moment and lodashBrandon Millman2018-06-292-2/+3
| | |
| * | Sort wallet tokens by timestamp added and scroll to newly added tokenBrandon Millman2018-06-296-11/+26
| |/
| * Polish asset picker layoutBrandon Millman2018-06-271-4/+4
| |
| * Update relayer grid fallback iconBrandon Millman2018-06-271-1/+1
| |
| * Change metamask install link based on browserBrandon Millman2018-06-264-14/+56
| |
* | Changing provider to ledger more consistent with previous experiencefragosti2018-06-282-5/+5
| |
* | Fix convention stufffragosti2018-06-282-20/+20
| |
* | Remove IS_MAINNET_ENABLED configfragosti2018-06-284-74/+49
| |
* | Rename all corresponding bools to shouldUseLedgerProviderfragosti2018-06-281-13/+13
| |
* | Never use trackedTokenState when fetching new token statefragosti2018-06-271-6/+5
| |
* | Fix bug where we are requesting tokens on a different networkfragosti2018-06-271-1/+1
| |
* | Remove unused variablesfragosti2018-06-274-24/+9
| |
* | Make unsubscribing workfragosti2018-06-271-1/+5
| |
* | Fix stateful ledger dialog edge statefragosti2018-06-272-2/+2
| |
* | Get things working with legacy portalfragosti2018-06-271-10/+8
| |
* | Fix subtle issues with ledger config dialogfragosti2018-06-273-11/+13
| |
* | Ledger to metamask to ledger workingfragosti2018-06-273-42/+35
| |
* | Have basic network switching workingfragosti2018-06-266-120/+158
| |
* | Remove existing networkId watching logic from BlockchainWatcherfragosti2018-06-262-28/+15
|/
* Remove extra border from the bottom of the walletBrandon Millman2018-06-231-3/+11
|
* Do not render ZRX or WETH as removable tracked tokensBrandon Millman2018-06-231-1/+4
|
* Center items in portal drawer headerBrandon Millman2018-06-231-1/+1
|
* Fix issue where hovered tiles appear over top barfragosti2018-06-232-5/+10
|
* Merge pull request #746 from 0xProject/feature/website/relayer-grid-polishFrancesco Agosti2018-06-2311-152/+138
|\ | | | | Relayer grid polish
| * Remove unecessary position relative rulesfragosti2018-06-232-2/+4
| |
| * Lint and fix typofragosti2018-06-222-2/+2
| |
| * Fix z-index issuesfragosti2018-06-226-49/+63
| |
| * Fix issues that arose from mergefragosti2018-06-222-4/+8
| |
| * Remove Background componentBrandon Millman2018-06-225-57/+12
| |
| * Padding adjustmentBrandon Millman2018-06-221-1/+2
| |
| * Remove styles from Portal componentBrandon Millman2018-06-221-24/+13
| |
| * Add Background componentBrandon Millman2018-06-223-14/+35
| |
| * Various relayer grid ui polish itemsBrandon Millman2018-06-226-42/+42
| |
* | Fix tslint errorfragosti2018-06-231-10/+10
| |
* | Merge https://github.com/0xProject/0x-monorepo into v2-prototypefragosti2018-06-232-14/+16
|\ \
| * \ Merge pull request #750 from 0xProject/bug/website/fix-add-tokenBrandon Millman2018-06-232-14/+16
| |\ \ | | | | | | | | Various add token flow bugs
| | * | Pulled out reset AssetPicker state into a common variableBrandon Millman2018-06-231-15/+9
| | | |
| | * | Fix state mutation in reducerBrandon Millman2018-06-221-4/+4
| | | |
| | * | Do not add empty token to local storageBrandon Millman2018-06-221-0/+8
| | |/
* | | Remove diverse from about pagefragosti2018-06-231-3/+3
| | |
* | | Use Ops instead of Operations in Mels descriptionfragosti2018-06-231-1/+1
|/ /
* / Comment out Chris, and move Mel up in about pagefragosti2018-06-232-12/+12
|/
* Fix Island componentfragosti2018-06-221-2/+2
|
* Merge pull request #739 from ↵Francesco Agosti2018-06-2212-159/+267
|\ | | | | | | | | 0xProject/feature/website/mobile-friendly-onboarding Add support for mobile-friendly onboarding flows
| * Fix lintingfragosti2018-06-221-2/+2
| |
| * Buttons look hella disabled nowfragosti2018-06-222-9/+17
| |
| * Remove border radius, fix width issue for unlock stepfragosti2018-06-224-5/+12
| |
| * Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-226-12/+13
| |\ | | | | | | | | | feature/website/mobile-friendly-onboarding
| * | Prevent prettier issuefragosti2018-06-211-10/+8
| | |
| * | Support mobile friendly onboarding flowsfragosti2018-06-219-87/+180
| | |
| * | Scroll to wallet for mobile onboardingfragosti2018-06-211-23/+28
| | |
| * | Change Island to use styled-componentsfragosti2018-06-201-15/+8
| | |
| * | Show start onboarding flow button on top of wallet on mobilefragosti2018-06-201-25/+29
| | |
* | | Merge pull request #742 from 0xProject/feature/website/chris-mel-about-pageFrancesco Agosti2018-06-222-2/+21
|\ \ \ | |_|/ |/| | Add Chris and Mel to about page
| * | Add Chris and Mel to about pagefragosti2018-06-222-2/+21
| | |
* | | Merge pull request #734 from 0xProject/feature/website/shadow-stylingBrandon Millman2018-06-224-10/+8
|\ \ \ | |/ / |/| | Update Island shadow styling and use Island in more places
| * | Update Island shadow styling and use Island in more placesBrandon Millman2018-06-204-10/+8
| |/
* | Merge pull request #733 from 0xProject/bug/website/identicon-layoutBrandon Millman2018-06-213-3/+6
|\ \ | |/ |/| Move some layout logic out of the Identicon component
| * Move some layout logic out of the Identicon componentBrandon Millman2018-06-203-3/+6
| |
* | Merge pull request #724 from 0xProject/bug/website/onboarding-improvementsFrancesco Agosti2018-06-204-7/+22
|\ \ | | | | | | Fix Wallet appearing over Drawer, and Onboarding not exiting when changing routes
| * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-2018-111/+206
| |\| | | | | | | | | | bug/website/onboarding-improvements
| * | Fix onboarding persisting when changing routesfragosti2018-06-192-3/+12
| | |
| * | Only elevate wallet zIndex when onboarding is in progressfragosti2018-06-193-4/+10
| | |
* | | Merge pull request #727 from ↵Francesco Agosti2018-06-201-3/+7
|\ \ \ | |_|/ |/| | | | | | | | 0xProject/bug/website/fix-fetching-balances-on-wallet-login Fix bug where we do not fetch balances on wallet login
| * | Fix linting issuefragosti2018-06-191-1/+1
| | |
| * | Fix bug where we do fetch balances on wallet loginfragosti2018-06-191-3/+7
| |/
* | Merge pull request #723 from 0xProject/bug/website/drawer-addressBrandon Millman2018-06-206-48/+82
|\ \ | | | | | | Consolidate account state display message logic
| * | Use Image component instead of img tagBrandon Millman2018-06-203-8/+9
| | |
| * | Consolidate account state messaging logicBrandon Millman2018-06-195-47/+80
| |/
* | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-2027-177/+586
|\ \ | | | | | | | | | feature/website/portal-v2-analytics
| * \ Merge pull request #726 from 0xProject/bug/website/late-eth-balanceBrandon Millman2018-06-202-47/+48
| |\ \ | | | | | | | | Check network state immediately instead of waiting for delay
| | * | Check network state immediately instead of waiting for delayBrandon Millman2018-06-192-47/+48
| | | |
| * | | Add OrderWatcherConfig type to 0x.js docs pageFabio Berger2018-06-191-0/+1
| |/ /
| * / Increase number of columns in relayer grid for small screensBrandon Millman2018-06-191-1/+1
| |/
| * Merge pull request #712 from 0xProject/feature/website/portal-faceliftBrandon Millman2018-06-196-42/+68
| |\ | | | | | | Change relayer grid tile to use logos and primary colors
| | * Create a shared Image componentBrandon Millman2018-06-192-35/+48
| | |
| | * Update RelayerGridTile render logic to incorportate colors and logosBrandon Millman2018-06-173-14/+24
| | |
| | * Add max width to top barBrandon Millman2018-06-172-1/+3
| | |
| | * Set max-width for LargeLayoutBrandon Millman2018-06-171-4/+5
| | |
| * | Merge pull request #704 from 0xProject/bug/website/fix-filling-orderFrancesco Agosti2018-06-191-0/+1
| |\ \ | | | | | | | | Fix filling orders on Portal
| | * | Fix filling orders on Portalfragosti2018-06-151-0/+1
| | | |
| * | | Finish last onboarding stepfragosti2018-06-164-2/+24
| | | |
| * | | Finish set allowance stepfragosti2018-06-162-5/+32
| | | |
| * | | Add all steps to their own filefragosti2018-06-1611-71/+196
| | | |
| * | | Prettify account setup and add eth steps of onboardingfragosti2018-06-163-3/+32
| | | |
| * | | Make metamask part of the fow prettyfragosti2018-06-163-7/+35
| | | |
| * | | Make start onboarding button prettyfragosti2018-06-161-2/+17
| | | |
| * | | Improve styles of onboarding tooltipfragosti2018-06-167-53/+117
| | | |
| * | | Add Pointer componentfragosti2018-06-152-16/+87
| | |/ | |/|
* | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-1529-61/+946
|\| | | | | | | | | | | feature/website/portal-v2-analytics
| * | Merge pull request #695 from ↵Francesco Agosti2018-06-158-23/+132
| |\ \ | | |/ | |/| | | | | | | 0xProject/feature/website/onboarding-flow-allowances Implement allowances and final "congrats" onboarding flow step
| | * Run prettifyfragosti2018-06-151-7/+8
| | |
| | * Implement allowance and final flow stepfragosti2018-06-136-21/+42
| | |
| | * Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-1341-63/+61
| | |\ | | | | | | | | | | | | feature/website/onboarding-flow-allowances
| | * \ Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-0771-251/+312
| | |\ \ | | | | | | | | | | | | | | | feature/website/onboarding-flow-allowances
| | * | | Render TokenAllowancefragosti2018-06-072-5/+20
| | | | |
| | * | | Add utilities for getting tokens from tokensByAddressfragosti2018-06-074-3/+20
| | | | |
| | * | | Wrap AllowanceToggle in redux containerfragosti2018-06-075-11/+66
| | | | |
| * | | | Add back redirector behind feature flagBrandon Millman2018-06-143-1/+19
| | | | |
| * | | | Update minHeight in TextBrandon Millman2018-06-141-1/+1
| | | | |
| * | | | Use Text components in ValuesBrandon Millman2018-06-141-3/+7
| | | | |
| * | | | Use spread operator instead of React.createElementBrandon Millman2018-06-143-7/+7
| | | | |
| * | | | Fix issue with positions hashBrandon Millman2018-06-131-19/+21
| | | | |
| * | | | Revert localhost configBrandon Millman2018-06-131-1/+1
| | | | |
| * | | | Use Text in TeamsBrandon Millman2018-06-131-3/+7
| | | | |
| * | | | Use Text in OpenPositionsBrandon Millman2018-06-133-5/+8
| | | | |
| * | | | Use Text component for HeaderItemBrandon Millman2018-06-132-7/+11
| | | | |
| * | | | Remove FloatingImageBrandon Millman2018-06-133-12/+3
| | | | |
| * | | | Move FilledImage into components/uiBrandon Millman2018-06-133-2/+2
| | | | |
| * | | | Replace FlatButton with Button in RetryBrandon Millman2018-06-131-12/+12
| | | | |
| * | | | Fix incorrect colorsBrandon Millman2018-06-131-2/+2
| | | | |
| * | | | Add font family to Button component and use in Join0x componentBrandon Millman2018-06-132-13/+16
| | | | |
| * | | | Consolidate jobs page grey colors with shared colorsBrandon Millman2018-06-131-2/+2
| | | | |
| * | | | Fix lint errorsBrandon Millman2018-06-1310-15/+12
| | | | |
| * | | | Implement small open positionsBrandon Millman2018-06-138-120/+232
| | | | |
| * | | | Implement large screen open positionsBrandon Millman2018-06-139-104/+187
| | | | |
| * | | | Teams sectionBrandon Millman2018-06-136-75/+70
| | | | |
| * | | | Benefits sectionBrandon Millman2018-06-133-12/+75
| | | | |
| * | | | Refactor into BulletedItemList componentBrandon Millman2018-06-132-24/+33
| | | | |
| * | | | Rework values sectionBrandon Millman2018-06-132-44/+13
| | | | |
| * | | | Polish mission section and photo sectionBrandon Millman2018-06-137-40/+95
| | | | |
| * | | | Add link to open positions sectionBrandon Millman2018-06-133-6/+20
| | | | |
| * | | | Add scroll to top for jobs pageBrandon Millman2018-06-131-21/+28
| | | | |
| * | | | Skeleton for jobs page and initial implementationBrandon Millman2018-06-1313-12/+455
| | |_|/ | |/| |
* | | | Run linterfragosti2018-06-155-8/+21
| | | |
* | | | Add Portal v2 loggingfragosti2018-06-158-15/+62
|/ / /
* | | Fix no-unused-variable tslint rule to include parameters and fix issuesFabio Berger2018-06-1240-54/+52
| | |
* | | Fix linter issueFabio Berger2018-06-081-1/+0
| | |
* | | Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utilsFabio Berger2018-06-081-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix tslint issues Fix tslint failure Pass in fee and assetAmount rather then the whole signedOrder Fix missing paths Revert to returning orderState on invalid order - Refactor remainingFillableCalculator so it can be used for the maker and taker side - Moved the tests over from order-watcher - Did some token -> asset renaming Update naming in orderStateUtils to use asset over token, also removed cancelledAmount since in V2 it's binary. Fixed path Use source-map-support package to include correct line numbers in mocha move generated contract wrappers from `contract_wrappers/generated/` to `generated_contract_wrappers` in package with no non-generated contract wrappers
| * \ \ merge v2-prototypeFabio Berger2018-06-0771-220/+291
| |\ \ \ | | | |/ | | |/|
| * | | move generated contract wrappers from `contract_wrappers/generated/` to ↵Fabio Berger2018-06-061-0/+3
| | | | | | | | | | | | | | | | `generated_contract_wrappers` in package with no non-generated contract wrappers
* | | | Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utilsFabio Berger2018-06-0771-220/+291
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (66 commits) Run prettier Remove unused variable Fix linting issues Change shouldRenderHeader prop to shouldHideHeader Get build and tests to pass typo Apply prettier Update contracts tests after rebase Apply various fixes based on PR feedback Document debug_increaseTime method and fix typo in devnet README Use an enum for ProviderType in contracts/src/utils/web3_wrapper Update contracts package README Update relevant changelogs Remove global gas estimate buffer Add Async suffix to relevant assertions Fix linter errors Update package.json and yarn.lock Update more things to work with both Geth and Ganache Small fixes and cleanup Add additional gas to calls to fillOrderNoThrow ... # Conflicts: # packages/order-watcher/src/order_watcher/order_watcher.ts # packages/react-docs/src/components/type.tsx # packages/website/ts/components/ui/lifecycle_raised_button.tsx # packages/website/ts/components/wallet/wallet.tsx
| * | | Run prettierfragosti2018-06-071-9/+1
| | | |
| * | | Remove unused variablefragosti2018-06-071-1/+0
| | | |
| * | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-079-39/+102
| |\ \ \ | | | | | | | | | | | | | | | feature/improve-linting
| | * \ \ Merge pull request #672 from 0xProject/feature/website/account-management-polishBrandon Millman2018-06-079-39/+102
| | |\ \ \ | | | | | | | | | | | | Account management polish
| | | * | | Change shouldRenderHeader prop to shouldHideHeaderBrandon Millman2018-06-075-13/+13
| | | | | |
| | | * | | Fix undefined ether balanceBrandon Millman2018-06-063-9/+13
| | | | | |
| | | * | | Make scrollability a prop on TradeHistoryBrandon Millman2018-06-062-3/+10
| | | | | |
| | | * | | Fix EthWrappers background colorBrandon Millman2018-06-061-2/+2
| | | | | |
| | | * | | Update GenerateOrderForm and FillOrder componentsBrandon Millman2018-06-064-6/+34
| | | | | |
| | | * | | Update EthWrappers componentBrandon Millman2018-06-062-1/+7
| | | | | |
| | | * | | Update TradeHistory componentBrandon Millman2018-06-062-3/+16
| | | | | |
| | | * | | Hide action column on mainnetBrandon Millman2018-06-061-13/+14
| | | | | |
| | | * | | Fix TokenBalances background colorBrandon Millman2018-06-061-1/+1
| | | | | |
| | | * | | Add isFullWidth prop to TokenBalances componentBrandon Millman2018-06-062-1/+5
| | | | | |
| * | | | | Fix linting issuesfragosti2018-06-071-3/+1
| | | | | |
| * | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-077-10/+167
| |\| | | | | | | | | | | | | | | | | | | | | | feature/improve-linting
| | * | | | Merge pull request #669 from 0xProject/bug/website/fix-balance-renderingBrandon Millman2018-06-071-9/+14
| | |\ \ \ \ | | | | | | | | | | | | | | Update balance amount rendering logic
| | | * | | | Update balance amount rendering logicBrandon Millman2018-06-061-9/+14
| | | |/ / /
| | * | | | Merge pull request #653 from 0xProject/feature/ethereum-types-docsLeonid Logvinov2018-06-076-1/+153
| | |\ \ \ \ | | | |_|/ / | | |/| | | Add a documentation page for ethereum-types package
| | | * | | Add EthereumTypes to _renderDrawerLeonid Logvinov2018-06-071-0/+11
| | | | | |
| | | * | | Add a TODO comment on StructLog type in the docsLeonid Logvinov2018-06-051-1/+1
| | | | | |