Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 Island component | fragosti | 2018-06-22 | 1 | -2/+2 |
* | Merge pull request #739 from 0xProject/feature/website/mobile-friendly-onboar... | Francesco Agosti | 2018-06-22 | 12 | -159/+267 |
|\ | |||||
| * | 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 |
| |\ | |||||
| * | | 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 | 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 | 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 | 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 |
|\ \ | |||||
| * | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-20 | 18 | -111/+206 |
| |\| | |||||
| * | | 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 0xProject/bug/website/fix-fetching-balances-on-w... | Francesco Agosti | 2018-06-20 | 1 | -3/+7 |
|\ \ \ | |_|/ |/| | | |||||
| * | | 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 |
|\ \ | |||||
| * | | 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 |
|\ \ | |||||
| * \ | 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 | 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 |
| |\ | |||||
| | * | 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 | 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 |
|\| | | |||||
| * | | Merge pull request #695 from 0xProject/feature/website/onboarding-flow-allowa... | Francesco Agosti | 2018-06-15 | 8 | -23/+132 |
| |\ \ | | |/ | |/| | |||||
| | * | 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 |
| | |\ | |||||
| | * \ | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-07 | 71 | -251/+312 |
| | |\ \ | |||||
| | * | | | 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 |
|\ \ \ | |||||
| * \ \ | merge v2-prototype | Fabio Berger | 2018-06-07 | 71 | -220/+291 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | move generated contract wrappers from `contract_wrappers/generated/` to `gene... | Fabio Berger | 2018-06-06 | 1 | -0/+3 |
* | | | | Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils | Fabio Berger | 2018-06-07 | 71 | -220/+291 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | 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 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #672 from 0xProject/feature/website/account-management-polish | Brandon Millman | 2018-06-07 | 9 | -39/+102 |
| | |\ \ \ | |||||
| | | * | | | 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 |
| |\| | | | | |||||
| | * | | | | Merge pull request #669 from 0xProject/bug/website/fix-balance-rendering | Brandon Millman | 2018-06-07 | 1 | -9/+14 |
| | |\ \ \ \ | |||||
| | | * | | | | 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 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 |
| | | * | | | Add a documentation page for ethereum types | Leonid Logvinov | 2018-06-05 | 6 | -1/+142 |
| * | | | | | Get build and tests to pass | fragosti | 2018-06-07 | 1 | -1/+1 |
| * | | | | | Fix merge conflict | fragosti | 2018-06-07 | 1 | -14/+0 |
| * | | | | | Fix remaining tslint issues | Fabio Berger | 2018-06-06 | 5 | -26/+2 |
| * | | | | | merge v2-prototype | Fabio Berger | 2018-06-06 | 27 | -75/+447 |
| |\| | | | | |||||
| * | | | | | Try enabling no-unused-variable... | fragosti | 2018-06-05 | 61 | -167/+22 |
* | | | | | | Move spawnSwitchErr to @0xproject/utils | Fabio Berger | 2018-06-06 | 4 | -8/+6 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge branch 'v2-prototype' into fixes/misc-small-fixes | Fabio Berger | 2018-06-06 | 28 | -107/+431 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Remove TranslatedText | fragosti | 2018-06-06 | 1 | -15/+0 |
| * | | | | Fix prettier | Brandon Millman | 2018-06-06 | 1 | -1/+1 |
| * | | | | Merge pull request #668 from 0xProject/feature/website/move-disclaimer | Brandon Millman | 2018-06-06 | 1 | -16/+18 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Move portal disclaimer to the account management section | Brandon Millman | 2018-06-06 | 1 | -16/+18 |
| * | | | | Move prices into portal | Brandon Millman | 2018-06-06 | 2 | -30/+32 |
| |/ / / | |||||
| * | | | Merge pull request #652 from 0xProject/feature/website/landing-subscribe-butt... | Francesco Agosti | 2018-06-06 | 27 | -61/+396 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Use stricter check for subscribe input text | fragosti | 2018-06-06 | 1 | -1/+2 |
| | * | | Make buttons stack on mobile | fragosti | 2018-06-05 | 2 | -5/+6 |
| | * | | Do not show subscribe form if language is not english | fragosti | 2018-06-05 | 1 | -1/+1 |
| | * | | Address PR feedback | fragosti | 2018-06-05 | 7 | -39/+46 |
| | * | | Lint and cleanup | fragosti | 2018-06-02 | 3 | -6/+6 |
| | * | | Merge branch 'feature/website/landing-subscribe-button' into feature/website/... | fragosti | 2018-06-02 | 28 | -50/+376 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Implement subscription form | fragosti | 2018-06-02 | 7 | -68/+288 |
| | | * | Add styled-components and polished | fragosti | 2018-06-02 | 19 | -19/+34 |
| | | * | Have basic newsletter subscribe form working | fragosti | 2018-06-02 | 6 | -2/+93 |
* | | | | Add `switch-default` tslint rule and add missing default statement | Fabio Berger | 2018-06-05 | 1 | -0/+3 |
|/ / / | |||||
* | | | Address feedback | fragosti | 2018-06-05 | 4 | -14/+20 |
* | | | Implement WETH step logic for continue | fragosti | 2018-06-05 | 3 | -7/+14 |
* | | | Move trackedTokenStateByAddress logic into portal | fragosti | 2018-06-05 | 2 | -83/+100 |
|/ / | |||||
* | | Merge pull request #648 from 0xProject/feature/website/fill-order | Brandon Millman | 2018-06-02 | 4 | -34/+75 |
|\ \ | |||||
| * | | Remove old parse code | Brandon Millman | 2018-06-02 | 1 | -26/+0 |
| * | | Refactor order parser and add shared order support to new portal | Brandon Millman | 2018-06-02 | 3 | -3/+43 |
| * | | Add generate and fill order routes | Brandon Millman | 2018-06-02 | 2 | -7/+34 |
* | | | Only show ProviderDisplay in portal | Brandon Millman | 2018-06-02 | 1 | -12/+14 |
* | | | Improve sol-cov docs | Leonid Logvinov | 2018-06-02 | 1 | -4/+32 |
|/ / | |||||
* | | Fix missing key | Brandon Millman | 2018-06-01 | 1 | -1/+2 |
* | | Update placeholder param ordering | Brandon Millman | 2018-06-01 | 1 | -10/+21 |
* | | Change userEtherBalanceInWei to optional so we can know if its loading | Brandon Millman | 2018-06-01 | 13 | -22/+26 |
* | | Add loading state to ProviderDisplay | Brandon Millman | 2018-06-01 | 2 | -22/+39 |
* | | Tweaks | Brandon Millman | 2018-06-01 | 2 | -8/+29 |
* | | Add Placeholder component | Brandon Millman | 2018-06-01 | 1 | -14/+48 |
* | | Add StandardIconRow | Brandon Millman | 2018-06-01 | 1 | -34/+41 |
* | | Split render into loading and loaaded | Brandon Millman | 2018-06-01 | 1 | -5/+11 |
|/ | |||||
* | Merge pull request #635 from 0xProject/feature/website/custom-onboarding-tooltip | Francesco Agosti | 2018-05-31 | 17 | -68/+404 |
|\ | |||||
| * | Onboarding: implement add ETH step, and stub for add WETH step | fragosti | 2018-05-30 | 7 | -47/+121 |
| * | Address PR feedback | fragosti | 2018-05-30 | 7 | -40/+41 |
| * | Remove blacklist concept | fragosti | 2018-05-30 | 4 | -66/+20 |
| * | Some cleanup | fragosti | 2018-05-30 | 2 | -11/+13 |
| * | Improve tooltip look | fragosti | 2018-05-30 | 7 | -13/+69 |
| * | Add types for react-popper, remove types for react-joyride | fragosti | 2018-05-30 | 2 | -17/+16 |
| * | Replace react-joyride with react-popper | fragosti | 2018-05-30 | 2 | -11/+23 |
| * | Write custom tooltip component | fragosti | 2018-05-26 | 2 | -6/+56 |
| * | Run linter | fragosti | 2018-05-26 | 2 | -2/+5 |
| * | Add localstorage helper | fragosti | 2018-05-26 | 1 | -0/+16 |
| * | Add next button | fragosti | 2018-05-26 | 2 | -1/+11 |
| * | Auto-show onboarding flow on first page view | fragosti | 2018-05-26 | 5 | -7/+53 |
| * | Add ability to blacklist onboarding steps | fragosti | 2018-05-26 | 3 | -34/+92 |
| * | Fix PortalOnboardingFlowProps | fragosti | 2018-05-26 | 1 | -1/+0 |
| * | Implement metamask installation flow | fragosti | 2018-05-26 | 6 | -19/+75 |
* | | Fix unselected relayer drawer item | Brandon Millman | 2018-05-30 | 1 | -1/+1 |
* | | Hide wallet management option and expand component on small screens | Brandon Millman | 2018-05-26 | 2 | -15/+23 |
|/ | |||||
* | Implement design for relayers with no volume or tokens | Brandon Millman | 2018-05-25 | 3 | -9/+31 |
* | Improve OnboardingFlow API and typescript types | fragosti | 2018-05-25 | 3 | -12/+8 |
* | Address PR feedback | fragosti | 2018-05-25 | 5 | -13/+10 |
* | Fix build errors | fragosti | 2018-05-25 | 2 | -12/+9 |
* | Fix issue where modal can be out of sync with app state | fragosti | 2018-05-25 | 6 | -16/+51 |
* | Basic onboarding flow infrastructure set up | fragosti | 2018-05-25 | 13 | -37/+212 |
* | Merge pull request #612 from 0xProject/feature/website/add-redux-devtools | Francesco Agosti | 2018-05-25 | 1 | -1/+2 |
|\ | |||||
| * | Move to deps from devDeps and use in development only | fragosti | 2018-05-23 | 1 | -1/+1 |
| * | Add redux-devtools-extension to project | fragosti | 2018-05-23 | 1 | -1/+2 |
* | | Merge pull request #613 from 0xProject/check-tx-receipt-status | Alex Browne | 2018-05-24 | 1 | -1/+1 |
|\ \ | |||||
| * | | Check transaction receipt status codes where applicable | Alex Browne | 2018-05-24 | 1 | -1/+1 |
* | | | Use visibility property instead of placeholder div in wrap ether item | Brandon Millman | 2018-05-24 | 1 | -7/+4 |
* | | | Merge branch 'v2-prototype' into feature/website/wallet-flex-box | Brandon Millman | 2018-05-24 | 28 | -129/+147 |
|\| | | |||||
| * | | Fix prettier | Leonid Logvinov | 2018-05-24 | 2 | -2/+6 |
| * | | Fix prettier | Leonid Logvinov | 2018-05-24 | 1 | -3/+1 |
| * | | Remove 0x.js as a dependency from website | Leonid Logvinov | 2018-05-24 | 23 | -121/+137 |
| * | | Update dogfood url | Brandon Millman | 2018-05-23 | 1 | -1/+1 |
| * | | Fix tslint | Fabio Berger | 2018-05-23 | 2 | -4/+4 |
| * | | merge development | Fabio Berger | 2018-05-23 | 2 | -6/+6 |
| |\ \ | |||||
| | * \ | Merge branch 'development' into improvement/addCustomTslintRules | Fabio Berger | 2018-05-17 | 3 | -11/+11 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'development' into improvement/addCustomTslintRules | Fabio Berger | 2018-05-16 | 5 | -10/+27 |
| | |\ \ \ | |||||
| | * | | | | Fix TSLint rules | Fabio Berger | 2018-05-16 | 2 | -6/+6 |
* | | | | | | Add missing key | Brandon Millman | 2018-05-22 | 1 | -3/+6 |
* | | | | | | Use flexbox for wrapped ether item | Brandon Millman | 2018-05-22 | 1 | -21/+29 |
* | | | | | | Re add wrapped ether item | Brandon Millman | 2018-05-22 | 1 | -7/+24 |
* | | | | | | Rewrite balance rows using flex box | Brandon Millman | 2018-05-22 | 3 | -122/+129 |
|/ / / / / | |||||
* | | | | | merge development | Fabio Berger | 2018-05-22 | 2 | -7/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | | |||||
| * | | | Remove "Order utils" from menu for now | Fabio Berger | 2018-05-17 | 1 | -6/+0 |
| * | | | Fix top tokens key | Brandon Millman | 2018-05-17 | 1 | -2/+8 |
| * | | | Improve about page descriptions | fragosti | 2018-05-17 | 1 | -3/+3 |
| | |/ | |/| | |||||
* | | | Prettier | Brandon Millman | 2018-05-19 | 1 | -1/+3 |
* | | | Change number of columns in relayer index for small screens | Brandon Millman | 2018-05-19 | 1 | -1/+1 |
* | | | Wallet instead of balances for small screens | Brandon Millman | 2018-05-19 | 1 | -23/+21 |
* | | | Close drawer when new path is chosen | Brandon Millman | 2018-05-19 | 1 | -0/+7 |
* | | | Fix styling of portal menu | Brandon Millman | 2018-05-19 | 4 | -20/+37 |
* | | | Refactor portal specific colors out of react-shared | Brandon Millman | 2018-05-19 | 10 | -12/+38 |
* | | | Add custom styling for drawer | Brandon Millman | 2018-05-19 | 3 | -16/+106 |
* | | | Fix key issue for portal routes | Brandon Millman | 2018-05-19 | 1 | -1/+7 |
* | | | Fix responsiveness broken in rebase | Brandon Millman | 2018-05-19 | 1 | -13/+33 |
* | | | Set up scaffolding for new drawer | Brandon Millman | 2018-05-19 | 3 | -9/+28 |
* | | | Hide wallet component for small screens | Brandon Millman | 2018-05-19 | 1 | -0/+2 |
* | | | Fix token link key | Brandon Millman | 2018-05-19 | 1 | -2/+8 |
* | | | Modulate number of columns based on screenwidth | Brandon Millman | 2018-05-19 | 2 | -4/+19 |
* | | | Fix prettier | Brandon Millman | 2018-05-19 | 2 | -22/+17 |
* | | | Change my title to clarify | fragosti | 2018-05-18 | 1 | -1/+1 |
* | | | Center all the things | fragosti | 2018-05-18 | 4 | -11/+46 |
* | | | Refactor code in response to CR feedback | fragosti | 2018-05-18 | 5 | -15/+12 |
* | | | Remove duplicate function call to validate | fragosti | 2018-05-18 | 1 | -1/+1 |
* | | | Show error messages in the wrapped ether item | fragosti | 2018-05-18 | 6 | -23/+52 |
* | | | Improve about page descriptions | fragosti | 2018-05-18 | 1 | -3/+3 |
* | | | Fix tslint false positive | Brandon Millman | 2018-05-18 | 1 | -2/+9 |
* | | | Fix spread | Brandon Millman | 2018-05-18 | 1 | -1/+1 |
* | | | Refactor account management itmes | Brandon Millman | 2018-05-18 | 1 | -74/+70 |
* | | | Add loading component | Brandon Millman | 2018-05-18 | 3 | -50/+77 |
* | | | Refactor a bunch of layouts into their own files | Brandon Millman | 2018-05-18 | 6 | -139/+176 |
* | | | Add portal layout component | Brandon Millman | 2018-05-18 | 1 | -31/+36 |
* | | | Get rid of extra curly brackets | Brandon Millman | 2018-05-18 | 1 | -9/+9 |
* | | | Fix lint error | Brandon Millman | 2018-05-18 | 1 | -2/+1 |
* | | | Fix comments | Brandon Millman | 2018-05-18 | 3 | -4/+10 |
* | | | Wait for blockchain to display the account management routes | Brandon Millman | 2018-05-18 | 4 | -47/+78 |
* | | | Fix linter errors and relayer index reloading | Brandon Millman | 2018-05-18 | 3 | -14/+17 |
* | | | Trade direct route | Brandon Millman | 2018-05-18 | 2 | -44/+37 |
* | | | Add manage you wallet footer | Brandon Millman | 2018-05-18 | 1 | -24/+41 |
* | | | Add props to back button | Brandon Millman | 2018-05-18 | 1 | -9/+13 |
* | | | Back button and title components | Brandon Millman | 2018-05-18 | 3 | -64/+112 |
* | | | Implement new menu styling | Brandon Millman | 2018-05-18 | 2 | -4/+95 |
* | | | Add menu | Brandon Millman | 2018-05-18 | 2 | -20/+41 |
* | | | Add routes | Brandon Millman | 2018-05-18 | 1 | -2/+105 |
* | | | Merge branch 'development' into v2-prototype | Fabio Berger | 2018-05-16 | 84 | -476/+534 |
|\| | | |||||
| * | | Merge pull request #593 from 0xProject/bug/website/fix-cirular-dependency | Francesco Agosti | 2018-05-16 | 3 | -11/+13 |
| |\ \ | |||||
| | * | | fix style errors | fragosti | 2018-05-16 | 2 | -2/+2 |
| | * | | Fix circular dependency | fragosti | 2018-05-16 | 3 | -11/+13 |
| * | | | Merge pull request #592 from 0xProject/feature/website/add-francesco-about | Francesco Agosti | 2018-05-16 | 1 | -3/+11 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Add myself to about page | fragosti | 2018-05-16 | 1 | -3/+11 |
| | |/ |