Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 14 | -10/+184 |
|\| | | | | | | | | | | | 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 | 13 | -1/+170 |
| |\ \ | | | | | | | | | 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 |
| | | | | |||||
| | * | | Add a documentation page for ethereum types | Leonid Logvinov | 2018-06-05 | 13 | -1/+159 |
| | | | | |||||
* | | | | Get build and tests to pass | fragosti | 2018-06-07 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix merge conflict | fragosti | 2018-06-07 | 1 | -14/+0 |
| | | | | |||||
* | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | feature/improve-linting | ||||
| * | | | Merge v2-prototype | Fabio Berger | 2018-06-06 | 29 | -107/+436 |
| |\ \ \ | |||||
| * | | | | - Rename watch to watch_without_deps in sub-packages, so dev's don't confuse ↵ | Fabio Berger | 2018-06-05 | 1 | -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` | ||||
* | | | | | Fix remaining tslint issues | Fabio Berger | 2018-06-06 | 5 | -26/+2 |
| | | | | | |||||
* | | | | | merge v2-prototype | Fabio Berger | 2018-06-06 | 28 | -75/+449 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'v2-prototype' into fixes/misc-small-fixes | Fabio Berger | 2018-06-06 | 29 | -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 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 | ||||
| | | * | | | 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 ↵ | Francesco Agosti | 2018-06-06 | 28 | -61/+398 |
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | 0xProject/feature/website/landing-subscribe-button-2 Implement subscribe form on landing page | ||||
| | | * | | 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 ↵ | fragosti | 2018-06-02 | 29 | -50/+378 |
| | | |\ \ | | | | |/ | | | |/| | | | | | | feature/website/landing-subscribe-button-2 | ||||
| | | | * | Implement subscription form | fragosti | 2018-06-02 | 7 | -68/+288 |
| | | | | | |||||
| | | | * | Add styled-components and polished | fragosti | 2018-06-02 | 20 | -19/+36 |
| | | | | | |||||
| | | | * | 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 |
| |/ / / | |||||
* / / / | Try enabling no-unused-variable... | fragosti | 2018-06-05 | 61 | -167/+22 |
|/ / / | |||||
* | | | 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 |
|\ \ | | | | | | | Add shared order support | ||||
| * | | 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 | 2 | -6/+78 |
|/ / | |||||
* | | 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 |
|/ | |||||
* | Remove some types | Leonid Logvinov | 2018-06-01 | 1 | -0/+2 |
| | |||||
* | Remove published types | Leonid Logvinov | 2018-06-01 | 1 | -1/+1 |
| | |||||
* | Merge pull request #635 from 0xProject/feature/website/custom-onboarding-tooltip | Francesco Agosti | 2018-05-31 | 19 | -111/+444 |
|\ | | | | | Remove react-joyride and some more refactoring | ||||
| * | 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 react-joyride from deps | fragosti | 2018-05-30 | 1 | -1/+0 |
| | | |||||
| * | 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 | 4 | -53/+63 |
| | | |||||
| * | 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 |
|/ | |||||
* | Merge pull request #620 from 0xProject/feature/website/relayer-empty | Brandon Millman | 2018-05-25 | 3 | -9/+31 |
|\ | | | | | Implement design for relayers with no volume or tokens | ||||
| * | Implement design for relayers with no volume or tokens | Brandon Millman | 2018-05-25 | 3 | -9/+31 |
| | | |||||
* | | Merge pull request #618 from 0xProject/feature/v2-migrations | Leonid Logvinov | 2018-05-25 | 1 | -0/+1 |
|\ \ | |/ |/| | Migrate migrations, types to v2 | ||||
| * | Pin types version in website | Leonid Logvinov | 2018-05-25 | 1 | -0/+1 |
| | | |||||
* | | Improve OnboardingFlow API and typescript types | fragosti | 2018-05-25 | 3 | -12/+8 |
| | | |||||
* | | Address PR feedback | fragosti | 2018-05-25 | 6 | -16/+16 |
| | | |||||
* | | 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 | 14 | -37/+213 |
| | | |||||
* | | Merge pull request #612 from 0xProject/feature/website/add-redux-devtools | Francesco Agosti | 2018-05-25 | 2 | -1/+3 |
|\ \ | |/ |/| | Add redux-devtools-extension to project | ||||
| * | Move to deps from devDeps and use in development only | fragosti | 2018-05-23 | 2 | -2/+2 |
| | | |||||
| * | Add redux-devtools-extension to project | fragosti | 2018-05-23 | 2 | -2/+4 |
| | | |||||
* | | Merge pull request #615 from 0xProject/refactor/json-schemas/for-v2 | Fabio Berger | 2018-05-25 | 1 | -1/+6 |
|\ \ | | | | | | | Refactor order schemas in json-schemas for v2 | ||||
| * | | Have source-map-loader ignore node_modules packages | Fabio Berger | 2018-05-24 | 1 | -1/+6 |
| | | | |||||
* | | | Merge pull request #613 from 0xProject/check-tx-receipt-status | Alex Browne | 2018-05-24 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Check transaction receipt status | ||||
| * | | | 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 | 31 | -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 website | Fabio Berger | 2018-05-24 | 1 | -0/+1 |
| | | | |||||
| * | | 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 | 24 | -122/+137 |
| | | | |||||
| * | | Update dogfood url | Brandon Millman | 2018-05-23 | 2 | -2/+2 |
| | | | |||||
| * | | Merge branch 'development' into v2-prototype | Leonid Logvinov | 2018-05-23 | 1 | -8/+8 |
| |\ \ | |||||
| | * | | Publish | Leonid Logvinov | 2018-05-23 | 1 | -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 Berger | 2018-05-23 | 2 | -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-errors | Fabio Berger | 2018-05-23 | 2 | -3/+10 |
| | |\ \ \ | | | | | | | | | | | | | Fix build/lint errors and warnings | ||||
| | | * | | | Upgrade UglifyJS to include ES6 support | Remco Bloemen | 2018-05-22 | 2 | -3/+10 |
| | | | | | | |||||
| * | | | | | Fix tslint | Fabio Berger | 2018-05-23 | 2 | -4/+4 |
| |/ / / / | |||||
| * | | | | merge development | Fabio Berger | 2018-05-23 | 3 | -7/+8 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| | * | | Merge pull request #594 from 0xProject/improvement/addCustomTslintRules | Fabio Berger | 2018-05-23 | 3 | -7/+8 |
| | |\ \ | | | | | | | | | | | Add more tslint rules | ||||
| | | * \ | Merge branch 'development' into improvement/addCustomTslintRules | Fabio Berger | 2018-05-17 | 3 | -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/addCustomTslintRules | Fabio Berger | 2018-05-16 | 7 | -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 rules | Fabio Berger | 2018-05-16 | 3 | -7/+8 |
| | | | | | | | |||||
* | | | | | | | 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 | 3 | -8/+3 |
|\| | | | | | |_|_|_|/ |/| | | | | |||||
| * | | | | Merge pull request #597 from 0xProject/make-promises-safe | Alex Browne | 2018-05-18 | 1 | -1/+2 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Use make-promises-safe to catch unhandled rejections in tests | ||||
| | * | | | Use make-promises-safe to catch unhandled rejections in tests | Alex Browne | 2018-05-17 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | 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 | 87 | -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-dependency | Francesco Agosti | 2018-05-16 | 3 | -11/+13 |
| |\ \ | | | | | | | | | Fix circular dependency | ||||
| | * | | 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 | 2 | -3/+11 |
| |\ \ \ | | |/ / | |/| | | Add myself to about page | ||||
| | * | | Add my profile image to images | fragosti | 2018-05-16 | 1 | -0/+0 |
| | | | | |||||
| | * | | Add myself to about page | fragosti | 2018-05-16 | 1 | -3/+11 |
| | | | | |||||
| * | | | Add dogfood configs to website | Brandon Millman | 2018-05-16 | 4 | -2/+10 |
| |/ / | |||||
| * | | Merge pull request #578 from 0xProject/document-node-version | Alex Browne | 2018-05-16 | 1 | -0/+3 |
| |\ \ | | |/ | |/| | Document Node.js version requirement and add it to package.json | ||||
| | * | Change minimum Node version to 6.12 | Alex Browne | 2018-05-15 | 1 | -1/+1 |
| | | | |||||
| | * | Document Node.js version requirement and add it to package.json | Alex Browne | 2018-05-15 | 1 | -0/+3 |
| | | | |||||
| * | | Merge development | Fabio Berger | 2018-05-15 | 3 | -14/+47 |
| |\ \ | |||||
| | * | | Add hover state to top tokens | Brandon Millman | 2018-05-15 | 1 | -10/+43 |
| | | | | |||||
| | * | | Change to weekly txn volume | Brandon Millman | 2018-05-15 | 2 | -4/+4 |
| | |/ | |||||
| * / | Move from using lerna multi-package commands to wsrun, update README's ↵ | Fabio Berger | 2018-05-15 | 2 | -6/+4 |
| |/ | | | | | | | accordingly | ||||
| * | Add missing type definitions | Leonid Logvinov | 2018-05-14 | 80 | -452/+460 |
| | | |||||
* | | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 44 | -447/+1072 |
|\| | |||||
| * | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-11 | 20 | -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-deployer | Leonid Logvinov | 2018-05-11 | 18 | -148/+102 |
| | |\ | | | | | | | | | Remove @0xproject/deployer.Deployer. Make contracts able to deploy themselves | ||||
| | | * | Fix templates | Leonid Logvinov | 2018-05-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | Remove unused deployer docs configs | Leonid Logvinov | 2018-05-10 | 1 | -17/+4 |
| | | | | |||||
| | | * | Add a legacy endpoint for the deployer | Leonid Logvinov | 2018-05-10 | 2 | -0/+5 |
| | | | | |||||
| | | * | Fix linter issues | Leonid Logvinov | 2018-05-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | Rename deployer to sol-compiler | Leonid Logvinov | 2018-05-10 | 17 | -129/+92 |
| | | | | |||||
| | | * | Remove deployer from metacoin and contract tests | Leonid Logvinov | 2018-05-10 | 1 | -2/+1 |
| | | | | |||||
| | * | | Merge pull request #580 from 0xProject/feature/website/remove-tokens | Brandon Millman | 2018-05-11 | 2 | -12/+69 |
| | |\ \ | | | |/ | | |/| | Update wallet footer and add remove token functionality | ||||
| | | * | Update wallet footer and add remove token functionality | Brandon Millman | 2018-05-10 | 2 | -12/+69 |
| | | | | |||||
| * | | | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-10 | 13 | -203/+596 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (38 commits) Add fallback image support to relayer grid tile Clear relayer grid state when fetching Configure the compiler to generate artifacts with deployedBytecode Implement loading and error state for relayer grid Fallback image for relayer grid tile Change relayer grid tile to link on header Display top tokens from backend Remove overflowZ property from portal Suggestions and fix bad merge Fix typo Only show untracked tokens Make wallet scrollable Add token flow Update The Ocean logo Fix artifacts paths Create an artifacts folder Introduce a var Add removeHexPrefix util method CHeck if ABI exists Improve the readability of the check for should compile ... # Conflicts: # .gitignore # 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 | ||||
| | * | | Add fallback image support to relayer grid tile | Brandon Millman | 2018-05-10 | 1 | -2/+36 |
| | | | | |||||
| | * | | Clear relayer grid state when fetching | Brandon Millman | 2018-05-10 | 1 | -0/+6 |
| | |/ | |||||
| | * | Implement loading and error state for relayer grid | Brandon Millman | 2018-05-10 | 1 | -10/+50 |
| | | | |||||
| | * | Fallback image for relayer grid tile | Brandon Millman | 2018-05-10 | 2 | -2/+3 |
| | | | |||||
| | * | Change relayer grid tile to link on header | Brandon Millman | 2018-05-10 | 1 | -17/+17 |
| | | | |||||
| | * | Merge pull request #576 from 0xProject/feature/website/top-tokens | Brandon Millman | 2018-05-09 | 3 | -41/+17 |
| | |\ | | | | | | | | | Display top tokens from backend | ||||
| | | * | Display top tokens from backend | Brandon Millman | 2018-05-09 | 3 | -41/+17 |
| | | | | |||||
| | * | | Merge branch 'development' into feature/website/top-bar-redesign | Brandon Millman | 2018-05-09 | 4 | -79/+92 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Remove overflowZ property from portal Fix typo Only show untracked tokens Make wallet scrollable Add token flow | ||||
| | | * | Remove overflowZ property from portal | Brandon Millman | 2018-05-09 | 1 | -1/+0 |
| | | | | |||||
| | | * | Fix typo | Brandon Millman | 2018-05-09 | 1 | -1/+1 |
| | | | | |||||
| | | * | Only show untracked tokens | Brandon Millman | 2018-05-09 | 1 | -1/+1 |
| | | | | |||||
| | | * | Make wallet scrollable | Brandon Millman | 2018-05-09 | 1 | -9/+48 |
| | | | | |||||
| | | * | Add token flow | Brandon Millman | 2018-05-09 | 4 | -69/+43 |
| | | | | |||||
| | * | | Suggestions and fix bad merge | Brandon Millman | 2018-05-09 | 2 | -21/+6 |
| | | | | |||||
| | * | | Merge branch 'development' into feature/website/top-bar-redesign | Brandon Millman | 2018-05-09 | 28 | -92/+304 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (63 commits) Update The Ocean logo Fix artifacts paths Create an artifacts folder Introduce a var Add removeHexPrefix util method CHeck if ABI exists Improve the readability of the check for should compile Use named constants Add a comment Fix comments Rename args to constructor-args Fix a typo Define a separator const Move artifacts from src/artifacts to artifacts/v1 Fix sol-cov to work with the new artifacts format Implement new artifacts format Publish Updated CHANGELOGS Make node types a dependency Fix type errors in CSS properties ... | ||||
| | | * | Merge pull request #556 from 0xProject/feature/website/portal-v2 | Brandon Millman | 2018-05-09 | 3 | -3/+326 |
| | | |\ | | | | | | | | | | | Add new top-level portal component with wallet and relayer index layout | ||||
| | | | * | Add headers to wallet and relayer index | Brandon Millman | 2018-05-05 | 2 | -2/+12 |
| | | | | | |||||
| | | | * | Add scrolling to relayer index | Brandon Millman | 2018-05-05 | 2 | -2/+8 |
| | | | | | |||||
| | | | * | Lay out wallet and relayers | Brandon Millman | 2018-05-05 | 3 | -3/+310 |
| | | | | | |||||
| | | * | | Update The Ocean logo | Fabio Berger | 2018-05-08 | 1 | -0/+0 |
| | | | | | |||||
| | * | | | ProviderDisplay changes | Brandon Millman | 2018-04-24 | 2 | -37/+28 |
| | | | | | |||||
| | * | | | Top bar expanded display type | Brandon Millman | 2018-04-24 | 2 | -17/+33 |
| | | | | | |||||
| | * | | | Relayer grid spacing tweaks | Brandon Millman | 2018-04-24 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Add headers to wallet and relayer index | Brandon Millman | 2018-04-24 | 2 | -2/+12 |
| | | | | | |||||
| | * | | | Add scrolling to relayer index | Brandon Millman | 2018-04-24 | 2 | -2/+8 |
| | | | | | |||||
| | * | | | Lay out wallet and relayers | Brandon Millman | 2018-04-24 | 3 | -3/+310 |
| | | | | | |||||
| * | | | | Fix website and 0x.js docs | Fabio Berger | 2018-05-10 | 2 | -19/+34 |
| | |/ / | |/| | | |||||
| * | | | Publishcontracts@2.1.28@0xproject/website@0.0.32@0xproject/testnet-faucets@1.0.29@0xproject/sra-report@0.0.14@0xproject/sol-resolver@0.0.4@0xproject/react-docs-example@0.0.11@0xproject/migrations@0.0.5@0xproject/metacoin@0.0.6@0xproject/dev-utils@0.4.1@0xproject/base-contract@0.3.1 | Leonid Logvinov | 2018-05-05 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.37.2 - @0xproject/abi-gen@0.2.13 - @0xproject/assert@0.2.9 - @0xproject/base-contract@0.3.1 - @0xproject/connect@0.6.12 - contracts@2.1.28 - @0xproject/deployer@0.4.3 - @0xproject/dev-utils@0.4.1 - @0xproject/json-schemas@0.7.23 - @0xproject/metacoin@0.0.6 - @0xproject/migrations@0.0.5 - @0xproject/order-utils@0.0.4 - @0xproject/react-docs-example@0.0.11 - @0xproject/react-docs@0.0.11 - @0xproject/react-shared@0.1.6 - @0xproject/sol-cov@0.0.10 - @0xproject/sol-resolver@0.0.4 - @0xproject/sra-report@0.0.14 - @0xproject/subproviders@0.10.1 - @0xproject/testnet-faucets@1.0.29 - @0xproject/types@0.6.3 - @0xproject/typescript-typings@0.3.1 - @0xproject/utils@0.6.1 - @0xproject/web3-wrapper@0.6.3 - @0xproject/website@0.0.32 | ||||
| * | | | Fix type errors in CSS properties | Leonid Logvinov | 2018-05-05 | 3 | -3/+3 |
| | | | | |||||
| * | | | Publish@0xproject/website@0.0.31@0xproject/react-docs@0.0.10@0xproject/react-docs-example@0.0.10 | Leonid Logvinov | 2018-05-05 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - @0xproject/react-docs-example@0.0.10 - @0xproject/react-docs@0.0.10 - @0xproject/react-shared@0.1.5 - @0xproject/website@0.0.31 | ||||
| * | | | Upgrade react types version | Leonid Logvinov | 2018-05-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Publishcontracts@2.1.27@0xproject/website@0.0.30@0xproject/testnet-faucets@1.0.28@0xproject/sra-report@0.0.13 | Leonid Logvinov | 2018-05-05 | 1 | -2/+2 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.37.1 - contracts@2.1.27 - @0xproject/order-utils@0.0.3 - @0xproject/sra-report@0.0.13 - @0xproject/testnet-faucets@1.0.28 - @0xproject/website@0.0.30 | ||||
| * | | Publishcontracts@2.1.26@0xproject/website@0.0.29@0xproject/testnet-faucets@1.0.27@0xproject/sra-report@0.0.12@0xproject/sol-resolver@0.0.3@0xproject/react-docs-example@0.0.9@0xproject/monorepo-scripts@0.1.19@0xproject/migrations@0.0.4@0xproject/metacoin@0.0.5@0xproject/dev-utils@0.4.0@0xproject/base-contract@0.3.0 | Leonid Logvinov | 2018-05-04 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.37.0 - @0xproject/abi-gen@0.2.12 - @0xproject/assert@0.2.8 - @0xproject/base-contract@0.3.0 - @0xproject/connect@0.6.11 - contracts@2.1.26 - @0xproject/deployer@0.4.2 - @0xproject/dev-utils@0.4.0 - @0xproject/json-schemas@0.7.22 - @0xproject/metacoin@0.0.5 - @0xproject/migrations@0.0.4 - @0xproject/monorepo-scripts@0.1.19 - @0xproject/order-utils@0.0.2 - @0xproject/react-docs-example@0.0.9 - @0xproject/react-docs@0.0.9 - @0xproject/react-shared@0.1.4 - @0xproject/sol-cov@0.0.9 - @0xproject/sol-resolver@0.0.3 - @0xproject/sra-report@0.0.12 - @0xproject/subproviders@0.10.0 - @0xproject/testnet-faucets@1.0.27 - @0xproject/tslint-config@0.4.17 - @0xproject/types@0.6.2 - @0xproject/typescript-typings@0.3.0 - @0xproject/utils@0.6.0 - @0xproject/web3-wrapper@0.6.2 - @0xproject/website@0.0.29 | ||||
| * | | Add order utils docs to the menu | Leonid Logvinov | 2018-05-04 | 7 | -0/+12 |
| | | | |||||
| * | | Open relayer app when clicking on grid tile | Brandon Millman | 2018-05-04 | 2 | -16/+20 |
| | | | |||||
| * | | Add header images to relayer grid tiles | Brandon Millman | 2018-05-04 | 2 | -4/+7 |
| | | | |||||
| * | | Fix logo left padding on mobile | Fabio Berger | 2018-05-03 | 1 | -1/+1 |
| | | | |||||
| * | | Add new section to homepage | Fabio Berger | 2018-05-03 | 1 | -0/+25 |
| | | | |||||
| * | | Remove id property from WebsiteBackendRelayerInfo | Brandon Millman | 2018-05-03 | 2 | -2/+1 |
| | | | |||||
| * | | Move order utils to @0xproject/order-utils | Leonid Logvinov | 2018-05-02 | 7 | -1/+129 |
| | | | |||||
| * | | Add Greg and Remco to the about page | Brandon Millman | 2018-05-02 | 4 | -1/+23 |
| | | | |||||
| * | | Remove WETH special case, website backend handles this now | Brandon Millman | 2018-05-01 | 1 | -6/+2 |
| | | | |||||
| * | | Hit website backend for price information | Brandon Millman | 2018-05-01 | 4 | -49/+12 |
| | | | |||||
| * | | Style suggestions | Brandon Millman | 2018-04-28 | 1 | -15/+10 |
| | | | |||||
| * | | Move quote currency string into config | Brandon Millman | 2018-04-28 | 2 | -3/+3 |
| | | | |||||
| * | | Merge branch 'development' into feature/website/crypto-compare-prices | Brandon Millman | 2018-04-27 | 6 | -26/+28 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Fix react type versions to avoid minor version bumps with breaking changes Update Web3 Provider Engine to 14.0.4 Remove auto-assignment of everyone to PR's Check for Yarn instead of npm Add hack comment about the use of sudo Fix lazy load component name Rename Portal and PortalMenu components to LegacyPortal and LegacyPortalMenu Remove unnecessary additional params Remove outside declaration Capitalize yarn Use path for platform independence Consolidate github personal access token env to one place: constants.ts Use methods moved to utils since now shared by multiple scripts Add comment Improve comments Add checks for the required local setup before running the publish script Add descriptions for all commands in monorepo-scripts Add removeGitTags script that can be run after a failed Lerna publish | ||||
| | * \ | Merge pull request #555 from ↵ | Jacob Evans | 2018-04-26 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/subproviders/upgrade-provider-engine Update Web3 Provider Engine to 14.0.4 | ||||
| | | * | | Update Web3 Provider Engine to 14.0.4 | Jacob Evans | 2018-04-24 | 1 | -1/+1 |
| | | |/ | |||||
| | * / | Fix react type versions to avoid minor version bumps with breaking changes | Fabio Berger | 2018-04-24 | 1 | -1/+1 |
| | |/ | |||||
| | * | Fix lazy load component name | Brandon Millman | 2018-04-24 | 1 | -2/+2 |
| | | | |||||
| | * | Rename Portal and PortalMenu components to LegacyPortal and LegacyPortalMenu | Brandon Millman | 2018-04-24 | 5 | -23/+25 |
| | | | |||||
| * | | Rename baseCurrency to quoteCurrency | Brandon Millman | 2018-04-23 | 1 | -3/+3 |
| | | | |||||
| * | | Remove some unused imports | Brandon Millman | 2018-04-23 | 1 | -2/+1 |
| | | | |||||
| * | | Rate limit crypto compare calls | Brandon Millman | 2018-04-23 | 1 | -3/+25 |
| | | | |||||
| * | | Refactor common fetch logic into fetch_utils | Brandon Millman | 2018-04-23 | 3 | -56/+62 |
| | | |