aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website
Commit message (Collapse)AuthorAgeFilesLines
* 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-167-2/+277
| | |
* | | Finish set allowance stepfragosti2018-06-162-5/+32
| | |
* | | Add onboarding assetsfragosti2018-06-167-0/+82
| | |
* | | 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 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-0779-252/+330
| |\ \ | | | | | | | | | | | | 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-1320-12/+455
| |_|/ |/| |
* | | 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-0778-220/+308
| |\ \ \ | | | |/ | | |/|
| * | | 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-0778-220/+308
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-0714-10/+184
| |\| | | | | | | | | | | | | | | | | | | | | | 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-0713-1/+170
| | |\ \ \ \ | | | |_|/ / | | |/| | | 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
| | | | | |
| | | * | | Add a documentation page for ethereum typesLeonid Logvinov2018-06-0513-1/+159
| | | | | |
| * | | | | Get build and tests to passfragosti2018-06-071-1/+1
| | | | | |
| * | | | | Fix merge conflictfragosti2018-06-071-14/+0
| | | | | |
| * | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-071-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | feature/improve-linting
| * | | | | Fix remaining tslint issuesFabio Berger2018-06-065-26/+2
| | | | | |
| * | | | | merge v2-prototypeFabio Berger2018-06-0628-75/+449
| |\ \ \ \ \
| * | | | | | Try enabling no-unused-variable...fragosti2018-06-0561-167/+22
| | | | | | |
* | | | | | | Move spawnSwitchErr to @0xproject/utilsFabio Berger2018-06-064-8/+6
| |_|/ / / / |/| | | | |
* | | | | | Merge v2-prototypeFabio Berger2018-06-0629-107/+436
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'v2-prototype' into fixes/misc-small-fixesFabio Berger2018-06-0629-107/+433
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Remove TranslatedText Fix prettier Add back UMD bundles for 0x.js Move portal disclaimer to the account management section Move prices into portal Use stricter check for subscribe input text Make buttons stack on mobile Do not show subscribe form if language is not english Address PR feedback Lint and cleanup Implement subscription form Add styled-components and polished Have basic newsletter subscribe form working
| | * | | | Remove TranslatedTextfragosti2018-06-061-15/+0
| | | | | |
| | * | | | Fix prettierBrandon Millman2018-06-061-1/+1
| | | | | |
| | * | | | Merge pull request #668 from 0xProject/feature/website/move-disclaimerBrandon Millman2018-06-061-16/+18
| | |\ \ \ \ | | | |_|_|/ | | |/| | | Move portal disclaimer to the account management section
| | | * | | Move portal disclaimer to the account management sectionBrandon Millman2018-06-061-16/+18
| | | | | |
| | * | | | Move prices into portalBrandon Millman2018-06-062-30/+32
| | |/ / /
| | * | | Merge pull request #652 from ↵Francesco Agosti2018-06-0628-61/+398
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | 0xProject/feature/website/landing-subscribe-button-2 Implement subscribe form on landing page
| | | * | Use stricter check for subscribe input textfragosti2018-06-061-1/+2
| | | | |
| | | * | Make buttons stack on mobilefragosti2018-06-052-5/+6
| | | | |
| | | * | Do not show subscribe form if language is not englishfragosti2018-06-051-1/+1
| | | | |
| | | * | Address PR feedbackfragosti2018-06-057-39/+46
| | | | |
| | | * | Lint and cleanupfragosti2018-06-023-6/+6
| | | | |
| | | * | Merge branch 'feature/website/landing-subscribe-button' into ↵fragosti2018-06-0229-50/+378
| | | |\ \ | | | | |/ | | | |/| | | | | | feature/website/landing-subscribe-button-2
| | | | * Implement subscription formfragosti2018-06-027-68/+288
| | | | |
| | | | * Add styled-components and polishedfragosti2018-06-0220-19/+36
| | | | |
| | | | * Have basic newsletter subscribe form workingfragosti2018-06-026-2/+93
| | | | |
| * | | | Add `switch-default` tslint rule and add missing default statementFabio Berger2018-06-051-0/+3
| |/ / /
* / / / - Rename watch to watch_without_deps in sub-packages, so dev's don't confuse ↵Fabio Berger2018-06-051-1/+1
|/ / / | | | | | | | | | | | | | | | | | | running watch from root dir, with sub-package dir - stop using special prebuild script name and run pre_build steps for `watch` and `build` commands - Remove `clean` step from `build`/`watch`
* | | Address feedbackfragosti2018-06-054-14/+20
| | |
* | | Implement WETH step logic for continuefragosti2018-06-053-7/+14
| | |
* | | Move trackedTokenStateByAddress logic into portalfragosti2018-06-052-83/+100
|/ /
* | Merge pull request #648 from 0xProject/feature/website/fill-orderBrandon Millman2018-06-024-34/+75
|\ \ | | | | | | Add shared order support
| * | Remove old parse codeBrandon Millman2018-06-021-26/+0
| | |
| * | Refactor order parser and add shared order support to new portalBrandon Millman2018-06-023-3/+43
| | |
| * | Add generate and fill order routesBrandon Millman2018-06-022-7/+34
| | |
* | | Only show ProviderDisplay in portalBrandon Millman2018-06-021-12/+14
| | |
* | | Improve sol-cov docsLeonid Logvinov2018-06-022-6/+78
|/ /
* | Fix missing keyBrandon Millman2018-06-011-1/+2
| |
* | Update placeholder param orderingBrandon Millman2018-06-011-10/+21
| |
* | Change userEtherBalanceInWei to optional so we can know if its loadingBrandon Millman2018-06-0113-22/+26
| |
* | Add loading state to ProviderDisplayBrandon Millman2018-06-012-22/+39
| |
* | TweaksBrandon Millman2018-06-012-8/+29
| |
* | Add Placeholder componentBrandon Millman2018-06-011-14/+48
| |
* | Add StandardIconRowBrandon Millman2018-06-011-34/+41
| |
* | Split render into loading and loaadedBrandon Millman2018-06-011-5/+11
|/
* Remove some typesLeonid Logvinov2018-06-011-0/+2
|
* Remove published typesLeonid Logvinov2018-06-011-1/+1
|
* Merge pull request #635 from 0xProject/feature/website/custom-onboarding-tooltipFrancesco Agosti2018-05-3119-111/+444
|\ | | | | Remove react-joyride and some more refactoring
| * Onboarding: implement add ETH step, and stub for add WETH stepfragosti2018-05-307-47/+121
| |
| * Address PR feedbackfragosti2018-05-307-40/+41
| |
| * Remove react-joyride from depsfragosti2018-05-301-1/+0
| |
| * Remove blacklist conceptfragosti2018-05-304-66/+20
| |
| * Some cleanupfragosti2018-05-302-11/+13
| |
| * Improve tooltip lookfragosti2018-05-307-13/+69
| |
| * Add types for react-popper, remove types for react-joyridefragosti2018-05-302-17/+16
| |
| * Replace react-joyride with react-popperfragosti2018-05-304-53/+63
| |
| * Write custom tooltip componentfragosti2018-05-262-6/+56
| |
| * Run linterfragosti2018-05-262-2/+5
| |
| * Add localstorage helperfragosti2018-05-261-0/+16
| |
| * Add next buttonfragosti2018-05-262-1/+11
| |
| * Auto-show onboarding flow on first page viewfragosti2018-05-265-7/+53
| |
| * Add ability to blacklist onboarding stepsfragosti2018-05-263-34/+92
| |
| * Fix PortalOnboardingFlowPropsfragosti2018-05-261-1/+0
| |
| * Implement metamask installation flowfragosti2018-05-266-19/+75
| |
* | Fix unselected relayer drawer itemBrandon Millman2018-05-301-1/+1
| |
* | Hide wallet management option and expand component on small screensBrandon Millman2018-05-262-15/+23
|/
* Merge pull request #620 from 0xProject/feature/website/relayer-emptyBrandon Millman2018-05-253-9/+31
|\ | | | | Implement design for relayers with no volume or tokens
| * Implement design for relayers with no volume or tokensBrandon Millman2018-05-253-9/+31
| |
* | Merge pull request #618 from 0xProject/feature/v2-migrationsLeonid Logvinov2018-05-251-0/+1
|\ \ | |/ |/| Migrate migrations, types to v2
| * Pin types version in websiteLeonid Logvinov2018-05-251-0/+1
| |
* | Improve OnboardingFlow API and typescript typesfragosti2018-05-253-12/+8
| |
* | Address PR feedbackfragosti2018-05-256-16/+16
| |
* | Fix build errorsfragosti2018-05-252-12/+9
| |
* | Fix issue where modal can be out of sync with app statefragosti2018-05-256-16/+51
| |
* | Basic onboarding flow infrastructure set upfragosti2018-05-2514-37/+213
| |
* | Merge pull request #612 from 0xProject/feature/website/add-redux-devtoolsFrancesco Agosti2018-05-252-1/+3
|\ \ | |/ |/| Add redux-devtools-extension to project
| * Move to deps from devDeps and use in development onlyfragosti2018-05-232-2/+2
| |
| * Add redux-devtools-extension to projectfragosti2018-05-232-2/+4
| |
* | Merge pull request #615 from 0xProject/refactor/json-schemas/for-v2Fabio Berger2018-05-251-1/+6
|\ \ | | | | | | Refactor order schemas in json-schemas for v2
| * | Have source-map-loader ignore node_modules packagesFabio Berger2018-05-241-1/+6
| | |
* | | Merge pull request #613 from 0xProject/check-tx-receipt-statusAlex Browne2018-05-241-1/+1
|\ \ \ | | | | | | | | Check transaction receipt status
| * | | Check transaction receipt status codes where applicableAlex Browne2018-05-241-1/+1
| |/ /
* | | Use visibility property instead of placeholder div in wrap ether itemBrandon Millman2018-05-241-7/+4
| | |
* | | Merge branch 'v2-prototype' into feature/website/wallet-flex-boxBrandon Millman2018-05-2431-142/+168
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (95 commits) Add missing dep to website Upgrade solidity parser Fix trace test Fix linter issues Move contract utils Fix prettier Fix NameResolver Fix prettier Remove 0x.js as a dependency from website Enable 0x.js tests Fix small bug in order-utils Address feedback Fix Tslint error caused by "PromiseLike" value Fix Tslint error caused by "PromiseLike" value Update dogfood url fix contract-wrappers version Parse compiler.json in SolCompilerArtifactsAdapter Fix TokenTransferProxy artifact name since it's now suffixed with _v1 Update yarn.lock Fix signature verification test ...
| * | Add missing dep to websiteFabio Berger2018-05-241-0/+1
| | |
| * | Fix prettierLeonid Logvinov2018-05-242-2/+6
| | |
| * | Fix prettierLeonid Logvinov2018-05-241-3/+1
| | |
| * | Remove 0x.js as a dependency from websiteLeonid Logvinov2018-05-2424-122/+137
| | |
| * | Update dogfood urlBrandon Millman2018-05-232-2/+2
| | |
| * | Merge branch 'development' into v2-prototypeLeonid Logvinov2018-05-231-8/+8
| |\ \
| | * | PublishLeonid Logvinov2018-05-231-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.38.0 - @0xproject/abi-gen@0.3.0 - @0xproject/assert@0.2.10 - @0xproject/base-contract@0.3.2 - @0xproject/connect@0.6.13 - @0xproject/contract-wrappers@0.0.2 - contracts@2.1.29 - @0xproject/dev-utils@0.4.2 - @0xproject/fill-scenarios@0.0.2 - @0xproject/json-schemas@0.7.24 - @0xproject/metacoin@0.0.7 - @0xproject/migrations@0.0.6 - @0xproject/monorepo-scripts@0.1.20 - @0xproject/order-utils@0.0.5 - @0xproject/order-watcher@0.0.2 - @0xproject/react-docs-example@0.0.12 - @0xproject/react-docs@0.0.12 - @0xproject/react-shared@0.1.7 - @0xproject/sol-compiler@0.5.0 - @0xproject/sol-cov@0.0.11 - @0xproject/sol-resolver@0.0.5 - @0xproject/sra-report@0.1.0 - @0xproject/subproviders@0.10.2 - @0xproject/testnet-faucets@1.0.30 - @0xproject/tslint-config@0.4.18 - @0xproject/types@0.7.0 - @0xproject/typescript-typings@0.3.2 - @0xproject/utils@0.6.2 - @0xproject/web3-wrapper@0.6.4 - @0xproject/website@0.0.33
| * | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into ↵Fabio Berger2018-05-232-3/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v2-prototype * 'v2-prototype' of github.com:0xProject/0x-monorepo: Update artifacts Update yarn.lock Fix warnings in Metacoin Upgrade UglifyJS to include ES6 support Add CancelOrder and MatchOrder types Add missing return types Ignore classnames linter rule
| | * \ \ Merge pull request #605 from 0xProject/fix/multiple/build-errorsFabio Berger2018-05-232-3/+10
| | |\ \ \ | | | | | | | | | | | | Fix build/lint errors and warnings
| | | * | | Upgrade UglifyJS to include ES6 supportRemco Bloemen2018-05-222-3/+10
| | | | | |
| * | | | | Fix tslintFabio Berger2018-05-232-4/+4
| |/ / / /
| * | | | merge developmentFabio Berger2018-05-233-7/+8
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge pull request #594 from 0xProject/improvement/addCustomTslintRulesFabio Berger2018-05-233-7/+8
| | |\ \ | | | | | | | | | | Add more tslint rules
| | | * \ Merge branch 'development' into improvement/addCustomTslintRulesFabio Berger2018-05-173-11/+11
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Remove "Order utils" from menu for now Fix top tokens key Improve about page descriptions Do not remove artifacts when running `clean`
| | | * \ \ Merge branch 'development' into improvement/addCustomTslintRulesFabio Berger2018-05-167-10/+31
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: fix style errors Fix circular dependency Add my profile image to images Add myself to about page Add dogfood configs to website Change minimum Node version to 6.12 Document Node.js version requirement and add it to package.json
| | | * | | | Fix TSLint rulesFabio Berger2018-05-163-7/+8
| | | | | | |
* | | | | | | Add missing keyBrandon Millman2018-05-221-3/+6
| | | | | | |
* | | | | | | Use flexbox for wrapped ether itemBrandon Millman2018-05-221-21/+29
| | | | | | |
* | | | | | | Re add wrapped ether itemBrandon Millman2018-05-221-7/+24
| | | | | | |
* | | | | | | Rewrite balance rows using flex boxBrandon Millman2018-05-223-122/+129
|/ / / / / /
* | | | | / merge developmentFabio Berger2018-05-223-8/+3
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | Merge pull request #597 from 0xProject/make-promises-safeAlex Browne2018-05-181-1/+2
| |\ \ \ \ | | |_|_|/ | |/| | | Use make-promises-safe to catch unhandled rejections in tests
| | * | | Use make-promises-safe to catch unhandled rejections in testsAlex Browne2018-05-171-1/+2
| | | | |
| * | | | Remove "Order utils" from menu for nowFabio Berger2018-05-171-6/+0
| | | | |
| * | | | Fix top tokens keyBrandon Millman2018-05-171-2/+8
| |/ / /
| * | / Improve about page descriptionsfragosti2018-05-171-3/+3
| | |/ | |/|
* | | PrettierBrandon Millman2018-05-191-1/+3
| | |
* | | Change number of columns in relayer index for small screensBrandon Millman2018-05-191-1/+1
| | |
* | | Wallet instead of balances for small screensBrandon Millman2018-05-191-23/+21
| | |
* | | Close drawer when new path is chosenBrandon Millman2018-05-191-0/+7
| | |
* | | Fix styling of portal menuBrandon Millman2018-05-194-20/+37
| | |
* | | Refactor portal specific colors out of react-sharedBrandon Millman2018-05-1910-12/+38
| | |
* | | Add custom styling for drawerBrandon Millman2018-05-193-16/+106
| | |
* | | Fix key issue for portal routesBrandon Millman2018-05-191-1/+7
| | |
* | | Fix responsiveness broken in rebaseBrandon Millman2018-05-191-13/+33
| | |
* | | Set up scaffolding for new drawerBrandon Millman2018-05-193-9/+28
| | |
* | | Hide wallet component for small screensBrandon Millman2018-05-191-0/+2
| | |
* | | Fix token link keyBrandon Millman2018-05-191-2/+8
| | |
* | | Modulate number of columns based on screenwidthBrandon Millman2018-05-192-4/+19
| | |
* | | Fix prettierBrandon Millman2018-05-192-22/+17
| | |
* | | Change my title to clarifyfragosti2018-05-181-1/+1
| | |
* | | Center all the thingsfragosti2018-05-184-11/+46
| | |
* | | Refactor code in response to CR feedbackfragosti2018-05-185-15/+12
| | |
* | | Remove duplicate function call to validatefragosti2018-05-181-1/+1
| | |
* | | Show error messages in the wrapped ether itemfragosti2018-05-186-23/+52
| | |
* | | Improve about page descriptionsfragosti2018-05-181-3/+3
| | |
* | | Fix tslint false positiveBrandon Millman2018-05-181-2/+9
| | |
* | | Fix spreadBrandon Millman2018-05-181-1/+1
| | |
* | | Refactor account management itmesBrandon Millman2018-05-181-74/+70
| | |
* | | Add loading componentBrandon Millman2018-05-183-50/+77
| | |
* | | Refactor a bunch of layouts into their own filesBrandon Millman2018-05-186-139/+176
| | |
* | | Add portal layout componentBrandon Millman2018-05-181-31/+36
| | |
* | | Get rid of extra curly bracketsBrandon Millman2018-05-181-9/+9
| | |
* | | Fix lint errorBrandon Millman2018-05-181-2/+1
| | |
* | | Fix commentsBrandon Millman2018-05-183-4/+10
| | |
* | | Wait for blockchain to display the account management routesBrandon Millman2018-05-184-47/+78
| | |
* | | Fix linter errors and relayer index reloadingBrandon Millman2018-05-183-14/+17
| | |
* | | Trade direct routeBrandon Millman2018-05-182-44/+37
| | |
* | | Add manage you wallet footerBrandon Millman2018-05-181-24/+41
| | |
* | | Add props to back buttonBrandon Millman2018-05-181-9/+13
| | |
* | | Back button and title componentsBrandon Millman2018-05-183-64/+112
| | |
* | | Implement new menu stylingBrandon Millman2018-05-182-4/+95
| | |
* | | Add menuBrandon Millman2018-05-182-20/+41
| | |
* | | Add routesBrandon Millman2018-05-181-2/+105
| | |
* | | Merge branch 'development' into v2-prototypeFabio Berger2018-05-1687-482/+542
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (29 commits) Do not remove artifacts when running `clean` fix style errors Fix circular dependency Add my profile image to images Add myself to about page Add dogfood configs to website Revert to lerna:run lint Do lint sequentially Exclude monorepo-scripts from tslint as test Fix prettier Add hover state to top tokens Change to weekly txn volume Change minimum Node version to 6.12 Document Node.js version requirement and add it to package.json Apply prettier to some files which were not formatted correctly Fix TSLint issues Fix TSLint issues Update ethereeumjs-testrpc to ganache-cli Fix infinite loop Add changelog entries for packages where executable binary exporting fixed ... # Conflicts: # packages/contracts/package.json # packages/contracts/util/formatters.ts # packages/contracts/util/signed_order_utils.ts # packages/migrations/package.json # yarn.lock
| * | Merge pull request #593 from 0xProject/bug/website/fix-cirular-dependencyFrancesco Agosti2018-05-163-11/+13
| |\ \ | | | | | | | | Fix circular dependency
| | * | fix style errorsfragosti2018-05-162-2/+2
| | | |
| | * | Fix circular dependencyfragosti2018-05-163-11/+13
| | | |
| * | | Merge pull request #592 from 0xProject/feature/website/add-francesco-aboutFrancesco Agosti2018-05-162-3/+11
| |\ \ \ | | |/ / | |/| | Add myself to about page
| | * | Add my profile image to imagesfragosti2018-05-161-0/+0
| | | |
| | * | Add myself to about pagefragosti2018-05-161-3/+11
| | | |
| * | | Add dogfood configs to websiteBrandon Millman2018-05-164-2/+10
| |/ /
| * | Merge pull request #578 from 0xProject/document-node-versionAlex Browne2018-05-161-0/+3
| |\ \ | | |/ | |/| Document Node.js version requirement and add it to package.json
| | * Change minimum Node version to 6.12Alex Browne2018-05-151-1/+1
| | |
| | * Document Node.js version requirement and add it to package.jsonAlex Browne2018-05-151-0/+3
| | |
| * | Merge developmentFabio Berger2018-05-153-14/+47
| |\ \
| | * | Add hover state to top tokensBrandon Millman2018-05-151-10/+43
| | | |
| | * | Change to weekly txn volumeBrandon Millman2018-05-152-4/+4
| | |/
| * / Move from using lerna multi-package commands to wsrun, update README's ↵Fabio Berger2018-05-152-6/+4
| |/ | | | | | | accordingly
| * Add missing type definitionsLeonid Logvinov2018-05-1480-452/+460
| |
* | Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-1644-447/+1072
|\|
| * Merge branch 'development' into breakUp0xjsFabio Berger2018-05-1120-160/+171
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Fix ganache subprovider config Fix a bug in compiler config precedence Fix linter errors Fix templates Remove unused deployer docs configs Add a legacy endpoint for the deployer Add a check for compiler output Add a comment Put ARTIFACTS_VERSION in a config Improve a comment Remove _applyDefaultsToDeployTxDataAsync Add a HACK comment Fix linter issues Rename deployer to sol-compiler Remove deployer Remove deployer from 0x.js and migrations Configure migrations with a compiler.json Remove deployer from metacoin and contract tests Update wallet footer and add remove token functionality # Conflicts: # .gitignore # packages/0x.js/package.json # packages/0x.js/src/0x.ts # packages/contracts/package.json # packages/contracts/test/multi_sig_with_time_lock.ts # packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts # packages/contracts/util/artifacts.ts # packages/deployer/test/deployer_test.ts # packages/migrations/package.json
| | * Merge pull request #574 from 0xProject/feature/rm-rf-deployerLeonid Logvinov2018-05-1118-148/+102
| | |\ | | | | | | | | Remove @0xproject/deployer.Deployer. Make contracts able to deploy themselves
| | | * Fix templatesLeonid Logvinov2018-05-101-1/+1
| | | |
| | | * Remove unused deployer docs configsLeonid Logvinov2018-05-101-17/+4
| | | |
| | | * Add a legacy endpoint for the deployerLeonid Logvinov2018-05-102-0/+5
| | | |
| | | * Fix linter issuesLeonid Logvinov2018-05-101-1/+1
| | | |
| | | * Rename deployer to sol-compilerLeonid Logvinov2018-05-1017-129/+92
| | | |
| | | * Remove deployer from metacoin and contract testsLeonid Logvinov2018-05-101-2/+1
| | | |