Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-07-04 | 18 | -246/+312 |
|\ | | | | | | | feature/website/portal-mobile-improvements | ||||
| * | Merge pull request #811 from 0xProject/feature/website/onboarding-polish-2 | Francesco Agosti | 2018-07-04 | 9 | -47/+99 |
| |\ | | | | | | | Add Hotjar, and other small improvements | ||||
| | * | Persist whether onboarding is open or close across refreshes | fragosti | 2018-07-04 | 1 | -1/+3 |
| | | | |||||
| | * | Fix linting | fragosti | 2018-07-04 | 2 | -3/+2 |
| | | | |||||
| | * | Merge branch 'fixed-position-onboarding' into ↵ | fragosti | 2018-07-04 | 2 | -33/+67 |
| | |\ | | | | | | | | | | | | | feature/website/onboarding-polish-2 | ||||
| | | * | Implement fixed position onboarding option | fragosti | 2018-07-03 | 2 | -33/+67 |
| | | | | |||||
| | * | | Remove unused import | fragosti | 2018-07-03 | 1 | -1/+0 |
| | | | | |||||
| | * | | Add media file and remove stray comment | fragosti | 2018-07-03 | 2 | -2/+15 |
| | |/ | |||||
| | * | Add media query abstraction around ScreenWidths and stop relayer grid hover ↵ | fragosti | 2018-07-03 | 4 | -9/+11 |
| | | | | | | | | | | | | effect on mobile | ||||
| | * | Remove max-width from onboarding card to support iPad | fragosti | 2018-07-03 | 1 | -1/+1 |
| | | | |||||
| | * | Only auto-start onboarding if blockchain is loaded | fragosti | 2018-07-03 | 1 | -2/+5 |
| | | | |||||
| * | | Merge pull request #799 from 0xProject/feature/website/wallet-menu | Brandon Millman | 2018-07-04 | 9 | -199/+213 |
| |\ \ | | | | | | | | | Add menu for at the top of wallet and top right component | ||||
| | * | | Remove InstallPrompt | Brandon Millman | 2018-07-04 | 2 | -61/+0 |
| | | | | |||||
| | * | | Implement clickaway for wallet menu on mobile | Brandon Millman | 2018-07-04 | 2 | -14/+24 |
| | | | | |||||
| | * | | Add optional onClick to Link simple menu item | Brandon Millman | 2018-07-03 | 1 | -2/+7 |
| | | | | |||||
| | * | | Lint fixes | Brandon Millman | 2018-07-02 | 4 | -17/+5 |
| | | | | |||||
| | * | | More cleanup | Brandon Millman | 2018-07-02 | 2 | -31/+31 |
| | | | | |||||
| | * | | Consolidate logic for common menu items | Brandon Millman | 2018-07-02 | 3 | -33/+74 |
| | | | | |||||
| | * | | Give connected header accessory more padding | Brandon Millman | 2018-07-02 | 1 | -9/+13 |
| | | | | |||||
| | * | | Implement correct behavior for menu in the wallet | Brandon Millman | 2018-07-02 | 6 | -31/+52 |
| | | | | |||||
| | * | | Add menu to wallet | Brandon Millman | 2018-07-02 | 1 | -8/+32 |
| | | | | |||||
| | * | | Implement simple menu | Brandon Millman | 2018-07-02 | 5 | -91/+50 |
| | | | | |||||
| | * | | Clean up a bit of the provider display logic | Brandon Millman | 2018-07-02 | 3 | -73/+80 |
| | | | | |||||
| | * | | Implement icon button | Brandon Millman | 2018-07-02 | 2 | -2/+18 |
| | | | | |||||
* | | | | Prompt user to download Toshi or MetaMask in install wallet onboarding step | fragosti | 2018-07-04 | 3 | -46/+73 |
| | | | | |||||
* | | | | Show different download links and icons when on mobile | fragosti | 2018-07-04 | 3 | -20/+47 |
| | | | | |||||
* | | | | Rename isMobile utility fn to be more specific and add isMobileOperatingSystem | fragosti | 2018-07-04 | 3 | -5/+8 |
| | | | | |||||
* | | | | Add OperatingSystemType and get OS util | fragosti | 2018-07-04 | 2 | -0/+28 |
|/ / / | |||||
* | | | Merge pull request #806 from ↵ | Brandon Millman | 2018-07-03 | 4 | -0/+11 |
|\ \ \ | | | | | | | | | | | | | | | | | 0xProject/feature/website/mobile-readable-web3-names Add detection logic for Toshi and Cipher | ||||
| * | | | Add human readable names for Toshi and Cipher | Brandon Millman | 2018-07-03 | 4 | -0/+11 |
| | | | | |||||
* | | | | Merge pull request #808 from 0xProject/feature/website/better-balance-formatting | Brandon Millman | 2018-07-03 | 3 | -18/+21 |
|\ \ \ \ | | | | | | | | | | | Add better balance formatting rules for balances and usd values | ||||
| * | | | | Add better balance formatting rules for balances and usd values | Brandon Millman | 2018-07-03 | 3 | -18/+21 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #810 from 0xProject/feature/wesbite/remove-add-balance | Brandon Millman | 2018-07-03 | 5 | -42/+2 |
|\ \ \ \ | | | | | | | | | | | Remove increase balance link from balance_bounded_input component | ||||
| * | | | | Remove increase balance link from balance_bounded_input component | Brandon Millman | 2018-07-03 | 5 | -42/+2 |
| | | | | | |||||
* | | | | | Use new lock svg | Brandon Millman | 2018-07-03 | 1 | -2/+2 |
|/ / / / | |||||
* | / / | Always show the wrap ether row in between ETH and WETH | Brandon Millman | 2018-07-03 | 2 | -18/+20 |
| |/ / |/| | | |||||
* | | | Update start onboarding copy and relayer grid empty color | Brandon Millman | 2018-07-03 | 2 | -7/+7 |
|/ / | |||||
* / | Add Alex Browne to about page | fragosti | 2018-07-03 | 1 | -10/+19 |
|/ | |||||
* | Update relayer grid tiles to use Text | Brandon Millman | 2018-07-01 | 2 | -50/+17 |
| | |||||
* | Merge pull request #787 from 0xProject/feature/website/portal-onboarding-polish | Francesco Agosti | 2018-06-30 | 18 | -143/+232 |
|\ | | | | | Portal v2 onboarding polish | ||||
| * | Remove state variable from Link component in Portal | fragosti | 2018-06-30 | 1 | -4/+1 |
| | | |||||
| * | Remove extra call to scrollIntoView for wallet in onboarding | fragosti | 2018-06-30 | 1 | -4/+0 |
| | | |||||
| * | Bump automatic show onborading delay by 1000ms | fragosti | 2018-06-30 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-30 | 24 | -397/+586 |
| |\ | | | | | | | | | | feature/website/portal-onboarding-polish | ||||
| * | | Fix onboarding always starting | fragosti | 2018-06-30 | 1 | -1/+2 |
| | | | |||||
| * | | Rename userHasAllowances bool to follow proper convention | fragosti | 2018-06-30 | 2 | -6/+6 |
| | | | |||||
| * | | Allow you to continue the onboarding flow once youve installed metamask and ↵ | fragosti | 2018-06-30 | 5 | -17/+18 |
| | | | | | | | | | | | | refreshed the page | ||||
| * | | Use Image component where relevant and add back tracked token timestamp logic | fragosti | 2018-06-30 | 3 | -8/+24 |
| | | | |||||
| * | | Bold all balances in onboarding | fragosti | 2018-06-29 | 2 | -6/+8 |
| | | | |||||
| * | | Customize allowance setting onboarding step if you have your allowances set | fragosti | 2018-06-29 | 2 | -0/+4 |
| | | | |||||
| * | | Re-center react-popper on every step | fragosti | 2018-06-29 | 2 | -16/+4 |
| | | | |||||
| * | | Fix button hover and active hover state | fragosti | 2018-06-29 | 1 | -1/+1 |
| | | | |||||
| * | | Show eth balance in add eth balance onboarding step | fragosti | 2018-06-29 | 3 | -11/+16 |
| | | | |||||
| * | | Change onboarding flow to communicate 3 steps | fragosti | 2018-06-29 | 2 | -6/+10 |
| | | | |||||
| * | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-29 | 19 | -301/+304 |
| |\ \ | | | | | | | | | | | | | feature/website/portal-onboarding-polish | ||||
| * | | | Scroll to top when going to relayers page from onboarding | fragosti | 2018-06-28 | 1 | -0/+1 |
| | | | | |||||
| * | | | Bring you directly to relayers page once you finish onboarding | fragosti | 2018-06-28 | 3 | -1/+14 |
| | | | | |||||
| * | | | Remove period in title from last step | fragosti | 2018-06-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | Always restart onboarding from 0 and other small improvements | fragosti | 2018-06-28 | 2 | -3/+5 |
| | | | | |||||
| * | | | Customize flow depending on what steps you've completed | fragosti | 2018-06-28 | 4 | -20/+43 |
| | | | | |||||
| * | | | Break wrapping ETH into a 3rd step | fragosti | 2018-06-28 | 2 | -5/+24 |
| | | | | |||||
| * | | | Fix animation when coming from bottom | fragosti | 2018-06-28 | 1 | -0/+6 |
| | | | | |||||
| * | | | Fix width issue with onboarding card on mobile | fragosti | 2018-06-28 | 2 | -1/+3 |
| | | | | |||||
| * | | | Clicking overlay closes onboarding | fragosti | 2018-06-28 | 4 | -6/+12 |
| | | | | |||||
| * | | | Fix z index issue with wrap buttons and onboarding cards | fragosti | 2018-06-28 | 2 | -1/+2 |
| | | | | |||||
| * | | | Break wrath ETH step into 2 | fragosti | 2018-06-28 | 3 | -70/+72 |
| | | | | |||||
| * | | | Fix skip button position on first step | fragosti | 2018-06-28 | 1 | -11/+15 |
| | | | | |||||
| * | | | Make onboarding bounce around less | fragosti | 2018-06-28 | 2 | -13/+5 |
| | | | | |||||
| * | | | Scroll to wallet when onboarding automatically starts as well | fragosti | 2018-06-28 | 1 | -1/+4 |
| | | | | |||||
* | | | | Update staging api link | Brandon Millman | 2018-06-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Move /docs route to the end | Brandon Millman | 2018-06-30 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merge pull request #792 from 0xProject/feature/website/wallet-polish | Brandon Millman | 2018-06-30 | 24 | -397/+585 |
|\ \ \ | |_|/ |/| | | Various wallet polish items | ||||
| * | | Change function to a const | Brandon Millman | 2018-06-30 | 1 | -2/+2 |
| | | | |||||
| * | | Move wallet scrollIntoView into PortalOnboardingFlow | Brandon Millman | 2018-06-30 | 2 | -7/+7 |
| | | | |||||
| * | | Add dollar sign to NullTokenRow | Brandon Millman | 2018-06-29 | 1 | -1/+1 |
| | | | |||||
| * | | Remove unused imports and variables | Brandon Millman | 2018-06-29 | 5 | -20/+1 |
| | | | |||||
| * | | Refactor inline styles out of Wallet | Brandon Millman | 2018-06-29 | 6 | -132/+139 |
| | | | |||||
| * | | Remove some hardcoded MetaMask colors | Brandon Millman | 2018-06-29 | 2 | -3/+5 |
| | | | |||||
| * | | Create AccountConnection component | Brandon Millman | 2018-06-29 | 3 | -31/+61 |
| | | | |||||
| * | | Fix scrollbar bug | Brandon Millman | 2018-06-29 | 1 | -1/+1 |
| | | | |||||
| * | | Start onboarding from relayer index | Brandon Millman | 2018-06-29 | 1 | -6/+20 |
| | | | |||||
| * | | Fix learn how to set up account layout | Brandon Millman | 2018-06-29 | 2 | -11/+13 |
| | | | |||||
| * | | Fix typo | Brandon Millman | 2018-06-29 | 1 | -1/+1 |
| | | | |||||
| * | | Get rid of unused stuff in wallet | Brandon Millman | 2018-06-29 | 1 | -65/+1 |
| | | | |||||
| * | | Fix body overlay on mobile | Brandon Millman | 2018-06-29 | 2 | -3/+3 |
| | | | |||||
| * | | Change learn how to update your account styling | Brandon Millman | 2018-06-29 | 1 | -27/+17 |
| | | | |||||
| * | | Fix key issue and remove WalletDisconnectedItem | Brandon Millman | 2018-06-29 | 2 | -112/+1 |
| | | | |||||
| * | | Implement new locked and uninstalled states | Brandon Millman | 2018-06-29 | 7 | -7/+178 |
| | | | |||||
| * | | Fix off center icon in wallet | Brandon Millman | 2018-06-29 | 1 | -4/+7 |
| | | | |||||
| * | | Change wallet margin based on hover to prevent re-layout | Brandon Millman | 2018-06-29 | 1 | -0/+1 |
| | | | |||||
| * | | Update ProviderDisplay with new design | Brandon Millman | 2018-06-29 | 5 | -37/+118 |
| | | | |||||
| * | | Implement provider name in header | Brandon Millman | 2018-06-29 | 2 | -4/+18 |
| | | | |||||
| * | | Implement loading body rows | Brandon Millman | 2018-06-29 | 4 | -28/+80 |
| | | | |||||
| * | | Added Circle component | Brandon Millman | 2018-06-29 | 3 | -6/+21 |
| | | | |||||
* | | | Fix NotFound component and render 0x.js docs for /docs | Brandon Millman | 2018-06-29 | 3 | -3/+5 |
|/ / | |||||
* | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-29 | 16 | -55/+117 |
|\ \ | | | | | | | | | | feature/website/support-new-metamask | ||||
| * | | Remove isTracked field on token in favor of trackedTimestamp | Brandon Millman | 2018-06-29 | 11 | -26/+31 |
| | | | |||||
| * | | Use moment and lodash | Brandon Millman | 2018-06-29 | 2 | -2/+3 |
| | | | |||||
| * | | Sort wallet tokens by timestamp added and scroll to newly added token | Brandon Millman | 2018-06-29 | 6 | -11/+26 |
| |/ | |||||
| * | Polish asset picker layout | Brandon Millman | 2018-06-27 | 1 | -4/+4 |
| | | |||||
| * | Update relayer grid fallback icon | Brandon Millman | 2018-06-27 | 1 | -1/+1 |
| | | |||||
| * | Change metamask install link based on browser | Brandon Millman | 2018-06-26 | 4 | -14/+56 |
| | | |||||
* | | Changing provider to ledger more consistent with previous experience | fragosti | 2018-06-28 | 2 | -5/+5 |
| | | |||||
* | | Fix convention stuff | fragosti | 2018-06-28 | 2 | -20/+20 |
| | | |||||
* | | Remove IS_MAINNET_ENABLED config | fragosti | 2018-06-28 | 4 | -74/+49 |
| | | |||||
* | | Rename all corresponding bools to shouldUseLedgerProvider | fragosti | 2018-06-28 | 1 | -13/+13 |
| | | |||||
* | | Never use trackedTokenState when fetching new token state | fragosti | 2018-06-27 | 1 | -6/+5 |
| | | |||||
* | | Fix bug where we are requesting tokens on a different network | fragosti | 2018-06-27 | 1 | -1/+1 |
| | | |||||
* | | Remove unused variables | fragosti | 2018-06-27 | 4 | -24/+9 |
| | | |||||
* | | Make unsubscribing work | fragosti | 2018-06-27 | 1 | -1/+5 |
| | | |||||
* | | Fix stateful ledger dialog edge state | fragosti | 2018-06-27 | 2 | -2/+2 |
| | | |||||
* | | Get things working with legacy portal | fragosti | 2018-06-27 | 1 | -10/+8 |
| | | |||||
* | | Fix subtle issues with ledger config dialog | fragosti | 2018-06-27 | 3 | -11/+13 |
| | | |||||
* | | Ledger to metamask to ledger working | fragosti | 2018-06-27 | 3 | -42/+35 |
| | | |||||
* | | Have basic network switching working | fragosti | 2018-06-26 | 6 | -120/+158 |
| | | |||||
* | | Remove existing networkId watching logic from BlockchainWatcher | fragosti | 2018-06-26 | 2 | -28/+15 |
|/ | |||||
* | Remove extra border from the bottom of the wallet | Brandon Millman | 2018-06-23 | 1 | -3/+11 |
| | |||||
* | Do not render ZRX or WETH as removable tracked tokens | Brandon Millman | 2018-06-23 | 1 | -1/+4 |
| | |||||
* | Center items in portal drawer header | Brandon Millman | 2018-06-23 | 1 | -1/+1 |
| | |||||
* | Fix issue where hovered tiles appear over top bar | fragosti | 2018-06-23 | 2 | -5/+10 |
| | |||||
* | Merge pull request #746 from 0xProject/feature/website/relayer-grid-polish | Francesco Agosti | 2018-06-23 | 11 | -152/+138 |
|\ | | | | | Relayer grid polish | ||||
| * | Remove unecessary position relative rules | fragosti | 2018-06-23 | 2 | -2/+4 |
| | | |||||
| * | Lint and fix typo | fragosti | 2018-06-22 | 2 | -2/+2 |
| | | |||||
| * | Fix z-index issues | fragosti | 2018-06-22 | 6 | -49/+63 |
| | | |||||
| * | Fix issues that arose from merge | fragosti | 2018-06-22 | 2 | -4/+8 |
| | | |||||
| * | Remove Background component | Brandon Millman | 2018-06-22 | 5 | -57/+12 |
| | | |||||
| * | Padding adjustment | Brandon Millman | 2018-06-22 | 1 | -1/+2 |
| | | |||||
| * | Remove styles from Portal component | Brandon Millman | 2018-06-22 | 1 | -24/+13 |
| | | |||||
| * | Add Background component | Brandon Millman | 2018-06-22 | 3 | -14/+35 |
| | | |||||
| * | Various relayer grid ui polish items | Brandon Millman | 2018-06-22 | 6 | -42/+42 |
| | | |||||
* | | Fix tslint error | fragosti | 2018-06-23 | 1 | -10/+10 |
| | | |||||
* | | Merge https://github.com/0xProject/0x-monorepo into v2-prototype | fragosti | 2018-06-23 | 2 | -14/+16 |
|\ \ | |||||
| * \ | Merge pull request #750 from 0xProject/bug/website/fix-add-token | Brandon Millman | 2018-06-23 | 2 | -14/+16 |
| |\ \ | | | | | | | | | Various add token flow bugs | ||||
| | * | | Pulled out reset AssetPicker state into a common variable | Brandon Millman | 2018-06-23 | 1 | -15/+9 |
| | | | | |||||
| | * | | Fix state mutation in reducer | Brandon Millman | 2018-06-22 | 1 | -4/+4 |
| | | | | |||||
| | * | | Do not add empty token to local storage | Brandon Millman | 2018-06-22 | 1 | -0/+8 |
| | |/ | |||||
* | | | Remove diverse from about page | fragosti | 2018-06-23 | 1 | -3/+3 |
| | | | |||||
* | | | Use Ops instead of Operations in Mels description | fragosti | 2018-06-23 | 1 | -1/+1 |
|/ / | |||||
* / | Comment out Chris, and move Mel up in about page | fragosti | 2018-06-23 | 2 | -12/+12 |
|/ | |||||
* | Fix Island component | fragosti | 2018-06-22 | 1 | -2/+2 |
| | |||||
* | Merge pull request #739 from ↵ | Francesco Agosti | 2018-06-22 | 12 | -159/+267 |
|\ | | | | | | | | | 0xProject/feature/website/mobile-friendly-onboarding Add support for mobile-friendly onboarding flows | ||||
| * | Fix linting | fragosti | 2018-06-22 | 1 | -2/+2 |
| | | |||||
| * | Buttons look hella disabled now | fragosti | 2018-06-22 | 2 | -9/+17 |
| | | |||||
| * | Remove border radius, fix width issue for unlock step | fragosti | 2018-06-22 | 4 | -5/+12 |
| | | |||||
| * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-22 | 6 | -12/+13 |
| |\ | | | | | | | | | | feature/website/mobile-friendly-onboarding | ||||
| * | | Prevent prettier issue | fragosti | 2018-06-21 | 1 | -10/+8 |
| | | | |||||
| * | | Support mobile friendly onboarding flows | fragosti | 2018-06-21 | 9 | -87/+180 |
| | | | |||||
| * | | Scroll to wallet for mobile onboarding | fragosti | 2018-06-21 | 1 | -23/+28 |
| | | | |||||
| * | | Change Island to use styled-components | fragosti | 2018-06-20 | 1 | -15/+8 |
| | | | |||||
| * | | Show start onboarding flow button on top of wallet on mobile | fragosti | 2018-06-20 | 1 | -25/+29 |
| | | | |||||
* | | | Merge pull request #742 from 0xProject/feature/website/chris-mel-about-page | Francesco Agosti | 2018-06-22 | 2 | -2/+21 |
|\ \ \ | |_|/ |/| | | Add Chris and Mel to about page | ||||
| * | | Add Chris and Mel to about page | fragosti | 2018-06-22 | 2 | -2/+21 |
| | | | |||||
* | | | Merge pull request #734 from 0xProject/feature/website/shadow-styling | Brandon Millman | 2018-06-22 | 4 | -10/+8 |
|\ \ \ | |/ / |/| | | Update Island shadow styling and use Island in more places | ||||
| * | | Update Island shadow styling and use Island in more places | Brandon Millman | 2018-06-20 | 4 | -10/+8 |
| |/ | |||||
* | | Merge pull request #733 from 0xProject/bug/website/identicon-layout | Brandon Millman | 2018-06-21 | 3 | -3/+6 |
|\ \ | |/ |/| | Move some layout logic out of the Identicon component | ||||
| * | Move some layout logic out of the Identicon component | Brandon Millman | 2018-06-20 | 3 | -3/+6 |
| | | |||||
* | | Merge pull request #724 from 0xProject/bug/website/onboarding-improvements | Francesco Agosti | 2018-06-20 | 4 | -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 ↵ | fragosti | 2018-06-20 | 18 | -111/+206 |
| |\| | | | | | | | | | | bug/website/onboarding-improvements | ||||
| * | | Fix onboarding persisting when changing routes | fragosti | 2018-06-19 | 2 | -3/+12 |
| | | | |||||
| * | | Only elevate wallet zIndex when onboarding is in progress | fragosti | 2018-06-19 | 3 | -4/+10 |
| | | | |||||
* | | | Merge pull request #727 from ↵ | Francesco Agosti | 2018-06-20 | 1 | -3/+7 |
|\ \ \ | |_|/ |/| | | | | | | | | 0xProject/bug/website/fix-fetching-balances-on-wallet-login Fix bug where we do not fetch balances on wallet login | ||||
| * | | Fix linting issue | fragosti | 2018-06-19 | 1 | -1/+1 |
| | | | |||||
| * | | Fix bug where we do fetch balances on wallet login | fragosti | 2018-06-19 | 1 | -3/+7 |
| |/ | |||||
* | | Merge pull request #723 from 0xProject/bug/website/drawer-address | Brandon Millman | 2018-06-20 | 6 | -48/+82 |
|\ \ | | | | | | | Consolidate account state display message logic | ||||
| * | | Use Image component instead of img tag | Brandon Millman | 2018-06-20 | 3 | -8/+9 |
| | | | |||||
| * | | Consolidate account state messaging logic | Brandon Millman | 2018-06-19 | 5 | -47/+80 |
| |/ | |||||
* | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-20 | 27 | -177/+586 |
|\ \ | | | | | | | | | | feature/website/portal-v2-analytics | ||||
| * \ | Merge pull request #726 from 0xProject/bug/website/late-eth-balance | Brandon Millman | 2018-06-20 | 2 | -47/+48 |
| |\ \ | | | | | | | | | Check network state immediately instead of waiting for delay | ||||
| | * | | Check network state immediately instead of waiting for delay | Brandon Millman | 2018-06-19 | 2 | -47/+48 |
| | | | | |||||
| * | | | Add OrderWatcherConfig type to 0x.js docs page | Fabio Berger | 2018-06-19 | 1 | -0/+1 |
| |/ / | |||||
| * / | Increase number of columns in relayer grid for small screens | Brandon Millman | 2018-06-19 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #712 from 0xProject/feature/website/portal-facelift | Brandon Millman | 2018-06-19 | 6 | -42/+68 |
| |\ | | | | | | | Change relayer grid tile to use logos and primary colors | ||||
| | * | Create a shared Image component | Brandon Millman | 2018-06-19 | 2 | -35/+48 |
| | | | |||||
| | * | Update RelayerGridTile render logic to incorportate colors and logos | Brandon Millman | 2018-06-17 | 3 | -14/+24 |
| | | | |||||
| | * | Add max width to top bar | Brandon Millman | 2018-06-17 | 2 | -1/+3 |
| | | | |||||
| | * | Set max-width for LargeLayout | Brandon Millman | 2018-06-17 | 1 | -4/+5 |
| | | | |||||
| * | | Merge pull request #704 from 0xProject/bug/website/fix-filling-order | Francesco Agosti | 2018-06-19 | 1 | -0/+1 |
| |\ \ | | | | | | | | | Fix filling orders on Portal | ||||
| | * | | Fix filling orders on Portal | fragosti | 2018-06-15 | 1 | -0/+1 |
| | | | | |||||
| * | | | Finish last onboarding step | fragosti | 2018-06-16 | 4 | -2/+24 |
| | | | | |||||
| * | | | Finish set allowance step | fragosti | 2018-06-16 | 2 | -5/+32 |
| | | | | |||||
| * | | | Add all steps to their own file | fragosti | 2018-06-16 | 11 | -71/+196 |
| | | | | |||||
| * | | | Prettify account setup and add eth steps of onboarding | fragosti | 2018-06-16 | 3 | -3/+32 |
| | | | | |||||
| * | | | Make metamask part of the fow pretty | fragosti | 2018-06-16 | 3 | -7/+35 |
| | | | | |||||
| * | | | Make start onboarding button pretty | fragosti | 2018-06-16 | 1 | -2/+17 |
| | | | | |||||
| * | | | Improve styles of onboarding tooltip | fragosti | 2018-06-16 | 7 | -53/+117 |
| | | | | |||||
| * | | | Add Pointer component | fragosti | 2018-06-15 | 2 | -16/+87 |
| | |/ | |/| | |||||
* | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-15 | 29 | -61/+946 |
|\| | | | | | | | | | | | feature/website/portal-v2-analytics | ||||
| * | | Merge pull request #695 from ↵ | Francesco Agosti | 2018-06-15 | 8 | -23/+132 |
| |\ \ | | |/ | |/| | | | | | | | 0xProject/feature/website/onboarding-flow-allowances Implement allowances and final "congrats" onboarding flow step | ||||
| | * | Run prettify | fragosti | 2018-06-15 | 1 | -7/+8 |
| | | | |||||
| | * | Implement allowance and final flow step | fragosti | 2018-06-13 | 6 | -21/+42 |
| | | | |||||
| | * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-13 | 41 | -63/+61 |
| | |\ | | | | | | | | | | | | | feature/website/onboarding-flow-allowances | ||||
| | * \ | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 71 | -251/+312 |
| | |\ \ | | | | | | | | | | | | | | | | feature/website/onboarding-flow-allowances | ||||
| | * | | | Render TokenAllowance | fragosti | 2018-06-07 | 2 | -5/+20 |
| | | | | | |||||
| | * | | | Add utilities for getting tokens from tokensByAddress | fragosti | 2018-06-07 | 4 | -3/+20 |
| | | | | | |||||
| | * | | | Wrap AllowanceToggle in redux container | fragosti | 2018-06-07 | 5 | -11/+66 |
| | | | | | |||||
| * | | | | Add back redirector behind feature flag | Brandon Millman | 2018-06-14 | 3 | -1/+19 |
| | | | | | |||||
| * | | | | Update minHeight in Text | Brandon Millman | 2018-06-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Use Text components in Values | Brandon Millman | 2018-06-14 | 1 | -3/+7 |
| | | | | | |||||
| * | | | | Use spread operator instead of React.createElement | Brandon Millman | 2018-06-14 | 3 | -7/+7 |
| | | | | | |||||
| * | | | | Fix issue with positions hash | Brandon Millman | 2018-06-13 | 1 | -19/+21 |
| | | | | | |||||
| * | | | | Revert localhost config | Brandon Millman | 2018-06-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Use Text in Teams | Brandon Millman | 2018-06-13 | 1 | -3/+7 |
| | | | | | |||||
| * | | | | Use Text in OpenPositions | Brandon Millman | 2018-06-13 | 3 | -5/+8 |
| | | | | | |||||
| * | | | | Use Text component for HeaderItem | Brandon Millman | 2018-06-13 | 2 | -7/+11 |
| | | | | | |||||
| * | | | | Remove FloatingImage | Brandon Millman | 2018-06-13 | 3 | -12/+3 |
| | | | | | |||||
| * | | | | Move FilledImage into components/ui | Brandon Millman | 2018-06-13 | 3 | -2/+2 |
| | | | | | |||||
| * | | | | Replace FlatButton with Button in Retry | Brandon Millman | 2018-06-13 | 1 | -12/+12 |
| | | | | | |||||
| * | | | | Fix incorrect colors | Brandon Millman | 2018-06-13 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Add font family to Button component and use in Join0x component | Brandon Millman | 2018-06-13 | 2 | -13/+16 |
| | | | | | |||||
| * | | | | Consolidate jobs page grey colors with shared colors | Brandon Millman | 2018-06-13 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fix lint errors | Brandon Millman | 2018-06-13 | 10 | -15/+12 |
| | | | | | |||||
| * | | | | Implement small open positions | Brandon Millman | 2018-06-13 | 8 | -120/+232 |
| | | | | | |||||
| * | | | | Implement large screen open positions | Brandon Millman | 2018-06-13 | 9 | -104/+187 |
| | | | | | |||||
| * | | | | Teams section | Brandon Millman | 2018-06-13 | 6 | -75/+70 |
| | | | | | |||||
| * | | | | Benefits section | Brandon Millman | 2018-06-13 | 3 | -12/+75 |
| | | | | | |||||
| * | | | | Refactor into BulletedItemList component | Brandon Millman | 2018-06-13 | 2 | -24/+33 |
| | | | | | |||||
| * | | | | Rework values section | Brandon Millman | 2018-06-13 | 2 | -44/+13 |
| | | | | | |||||
| * | | | | Polish mission section and photo section | Brandon Millman | 2018-06-13 | 7 | -40/+95 |
| | | | | | |||||
| * | | | | Add link to open positions section | Brandon Millman | 2018-06-13 | 3 | -6/+20 |
| | | | | | |||||
| * | | | | Add scroll to top for jobs page | Brandon Millman | 2018-06-13 | 1 | -21/+28 |
| | | | | | |||||
| * | | | | Skeleton for jobs page and initial implementation | Brandon Millman | 2018-06-13 | 13 | -12/+455 |
| | |_|/ | |/| | | |||||
* | | | | Run linter | fragosti | 2018-06-15 | 5 | -8/+21 |
| | | | | |||||
* | | | | Add Portal v2 logging | fragosti | 2018-06-15 | 8 | -15/+62 |
|/ / / | |||||
* | | | Fix no-unused-variable tslint rule to include parameters and fix issues | Fabio Berger | 2018-06-12 | 40 | -54/+52 |
| | | | |||||
* | | | Fix linter issue | Fabio Berger | 2018-06-08 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils | Fabio Berger | 2018-06-08 | 1 | -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-prototype | Fabio Berger | 2018-06-07 | 71 | -220/+291 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | move generated contract wrappers from `contract_wrappers/generated/` to ↵ | Fabio Berger | 2018-06-06 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | `generated_contract_wrappers` in package with no non-generated contract wrappers | ||||
* | | | | Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils | Fabio Berger | 2018-06-07 | 71 | -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 prettier | fragosti | 2018-06-07 | 1 | -9/+1 |
| | | | | |||||
| * | | | Remove unused variable | fragosti | 2018-06-07 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 9 | -39/+102 |
| |\ \ \ | | | | | | | | | | | | | | | | feature/improve-linting | ||||
| | * \ \ | Merge pull request #672 from 0xProject/feature/website/account-management-polish | Brandon Millman | 2018-06-07 | 9 | -39/+102 |
| | |\ \ \ | | | | | | | | | | | | | Account management polish | ||||
| | | * | | | Change shouldRenderHeader prop to shouldHideHeader | Brandon Millman | 2018-06-07 | 5 | -13/+13 |
| | | | | | | |||||
| | | * | | | Fix undefined ether balance | Brandon Millman | 2018-06-06 | 3 | -9/+13 |
| | | | | | | |||||
| | | * | | | Make scrollability a prop on TradeHistory | Brandon Millman | 2018-06-06 | 2 | -3/+10 |
| | | | | | | |||||
| | | * | | | Fix EthWrappers background color | Brandon Millman | 2018-06-06 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | Update GenerateOrderForm and FillOrder components | Brandon Millman | 2018-06-06 | 4 | -6/+34 |
| | | | | | | |||||
| | | * | | | Update EthWrappers component | Brandon Millman | 2018-06-06 | 2 | -1/+7 |
| | | | | | | |||||
| | | * | | | Update TradeHistory component | Brandon Millman | 2018-06-06 | 2 | -3/+16 |
| | | | | | | |||||
| | | * | | | Hide action column on mainnet | Brandon Millman | 2018-06-06 | 1 | -13/+14 |
| | | | | | | |||||
| | | * | | | Fix TokenBalances background color | Brandon Millman | 2018-06-06 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Add isFullWidth prop to TokenBalances component | Brandon Millman | 2018-06-06 | 2 | -1/+5 |
| | | | | | | |||||
| * | | | | | Fix linting issues | fragosti | 2018-06-07 | 1 | -3/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 7 | -10/+167 |
| |\| | | | | | | | | | | | | | | | | | | | | | | feature/improve-linting | ||||
| | * | | | | Merge pull request #669 from 0xProject/bug/website/fix-balance-rendering | Brandon Millman | 2018-06-07 | 1 | -9/+14 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Update balance amount rendering logic | ||||
| | | * | | | | Update balance amount rendering logic | Brandon Millman | 2018-06-06 | 1 | -9/+14 |
| | | |/ / / | |||||
| | * | | | | Merge pull request #653 from 0xProject/feature/ethereum-types-docs | Leonid Logvinov | 2018-06-07 | 6 | -1/+153 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | Add a documentation page for ethereum-types package | ||||
| | | * | | | Add EthereumTypes to _renderDrawer | Leonid Logvinov | 2018-06-07 | 1 | -0/+11 |
| | | | | | | |||||
| | | * | | | Add a TODO comment on StructLog type in the docs | Leonid Logvinov | 2018-06-05 | 1 | -1/+1 |
| | | | | | |