Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Updated CHANGELOGS | Fabio Berger | 2018-07-26 | 36 | -10/+184 |
| | |||||
* | Update yarn.lock | Fabio Berger | 2018-07-26 | 1 | -0/+67 |
| | |||||
* | Point to actual current version | Fabio Berger | 2018-07-26 | 11 | -22/+22 |
| | |||||
* | Add changelog entries for other RCs that did publish | Fabio Berger | 2018-07-26 | 2 | -0/+16 |
| | |||||
* | Fix changelogs and package versions for ones that weren't published | Fabio Berger | 2018-07-26 | 16 | -21/+13 |
| | |||||
* | Fix circle.yml | Fabio Berger | 2018-07-26 | 1 | -1/+1 |
| | |||||
* | Publishcontracts@2.1.38@0xproject/website@0.0.42@0xproject/testnet-faucets@1.0.39@0xproject/sol-compiler@1.0.3@0xproject/react-docs-example@0.0.18@0xproject/monorepo-scripts@1.0.4@0xproject/metacoin@0.0.13@0xproject/abi-gen@1.0.3 | Fabio Berger | 2018-07-26 | 31 | -252/+252 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.1-rc.2 - @0xproject/abi-gen@1.0.3 - @0xproject/assert@1.0.3 - @0xproject/base-contract@1.0.3 - @0xproject/connect@1.0.3 - @0xproject/contract-wrappers@1.0.1-rc.2 - contracts@2.1.38 - @0xproject/dev-utils@1.0.3 - ethereum-types@1.0.3 - @0xproject/fill-scenarios@1.0.1-rc.2 - @0xproject/json-schemas@1.0.1-rc.2 - @0xproject/metacoin@0.0.13 - @0xproject/migrations@1.0.3 - @0xproject/monorepo-scripts@1.0.4 - @0xproject/order-utils@1.0.1-rc.2 - @0xproject/order-watcher@1.0.1-rc.2 - @0xproject/react-docs@1.0.3 - @0xproject/react-docs-example@0.0.18 - @0xproject/react-shared@1.0.4 - @0xproject/sol-compiler@1.0.3 - @0xproject/sol-cov@1.0.3 - @0xproject/sol-resolver@1.0.3 - @0xproject/sra-report@1.0.3 - @0xproject/subproviders@1.0.3 - @0xproject/testnet-faucets@1.0.39 - @0xproject/tslint-config@1.0.4 - @0xproject/types@1.0.1-rc.2 - @0xproject/typescript-typings@1.0.3 - @0xproject/utils@1.0.3 - @0xproject/web3-wrapper@1.1.1 - @0xproject/website@0.0.42 | ||||
* | Updated CHANGELOGS | Fabio Berger | 2018-07-26 | 52 | -7/+289 |
| | |||||
* | Still test unrunnable packages for compilation issues | Fabio Berger | 2018-07-26 | 1 | -8/+8 |
| | |||||
* | Add changelog entries for next RC publish | Fabio Berger | 2018-07-26 | 7 | -0/+56 |
| | |||||
* | Expose lerna dep | Fabio Berger | 2018-07-26 | 1 | -1/+1 |
| | |||||
* | Split running packages that cannot be run in a node.js script | Fabio Berger | 2018-07-26 | 1 | -1/+9 |
| | |||||
* | Fix accidental import from test folder | Fabio Berger | 2018-07-26 | 1 | -1/+1 |
| | |||||
* | Re-enable deleted the dir after test runs | Fabio Berger | 2018-07-26 | 1 | -1/+1 |
| | |||||
* | Change test:installation so it also causes run-time errors to appear | Fabio Berger | 2018-07-26 | 1 | -3/+10 |
| | |||||
* | Fix lint issue | Fabio Berger | 2018-07-26 | 1 | -2/+1 |
| | |||||
* | Always append monorepo root path so script can be called from anywhere | Fabio Berger | 2018-07-26 | 1 | -3/+5 |
| | |||||
* | Delete any remenants of test-env dir before creating a new one | Fabio Berger | 2018-07-26 | 1 | -0/+1 |
| | |||||
* | Print version that will be tested | Fabio Berger | 2018-07-26 | 1 | -1/+1 |
| | |||||
* | Add ending slash | Fabio Berger | 2018-07-26 | 1 | -1/+1 |
| | |||||
* | Add support for testing installations post-publish as well | Fabio Berger | 2018-07-26 | 2 | -2/+5 |
| | |||||
* | Fix asset path | Fabio Berger | 2018-07-26 | 1 | -2/+2 |
| | |||||
* | Publishcontracts@2.1.37@0xproject/website@0.0.41@0xproject/testnet-faucets@1.0.38@0xproject/react-docs-example@0.0.17@0xproject/monorepo-scripts@1.0.3@0xproject/metacoin@0.0.12@0xproject/abi-gen@1.0.2 | Fabio Berger | 2018-07-26 | 31 | -261/+257 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.1-rc.1 - @0xproject/abi-gen@1.0.2 - @0xproject/assert@1.0.2 - @0xproject/base-contract@1.0.2 - @0xproject/connect@1.0.2 - @0xproject/contract-wrappers@1.0.1-rc.1 - contracts@2.1.37 - @0xproject/dev-utils@1.0.2 - ethereum-types@1.0.2 - @0xproject/fill-scenarios@1.0.1-rc.1 - @0xproject/json-schemas@1.0.1-rc.1 - @0xproject/metacoin@0.0.12 - @0xproject/migrations@1.0.2 - @0xproject/monorepo-scripts@1.0.3 - @0xproject/order-utils@1.0.1-rc.1 - @0xproject/order-watcher@1.0.1-rc.1 - @0xproject/react-docs@1.0.2 - @0xproject/react-docs-example@0.0.17 - @0xproject/react-shared@1.0.3 - @0xproject/sol-compiler@1.0.2 - @0xproject/sol-cov@1.0.2 - @0xproject/sol-resolver@1.0.2 - @0xproject/sra-report@1.0.2 - @0xproject/subproviders@1.0.2 - @0xproject/testnet-faucets@1.0.38 - @0xproject/tslint-config@1.0.3 - @0xproject/types@1.0.1-rc.1 - @0xproject/typescript-typings@1.0.2 - @0xproject/utils@1.0.2 - @0xproject/web3-wrapper@1.1.0 - @0xproject/website@0.0.41 | ||||
* | Updated CHANGELOGS | Fabio Berger | 2018-07-26 | 52 | -8/+299 |
| | |||||
* | Fix linter | Fabio Berger | 2018-07-26 | 2 | -3/+0 |
| | |||||
* | Revert to using execAsync | Fabio Berger | 2018-07-26 | 1 | -10/+2 |
| | |||||
* | update yarn.lock | Fabio Berger | 2018-07-26 | 1 | -7/+0 |
| | |||||
* | Revert to publishing ethereum-types | Fabio Berger | 2018-07-26 | 18 | -18/+17 |
| | |||||
* | Fix marshaller import | Fabio Berger | 2018-07-26 | 1 | -1/+1 |
| | |||||
* | Update yarn.lock | Fabio Berger | 2018-07-26 | 1 | -0/+7 |
| | |||||
* | Temporarily have all packages depend on an older, published version of ↵ | Fabio Berger | 2018-07-26 | 17 | -17/+17 |
| | | | | ethereum-types since we cannot publish a new one | ||||
* | Temporarily make ethereum-types private to exclude from publishing | Fabio Berger | 2018-07-26 | 1 | -0/+1 |
| | |||||
* | Add order-watcher artifacts to gitignore | Fabio Berger | 2018-07-26 | 1 | -1/+2 |
| | |||||
* | Fix changelogs | Fabio Berger | 2018-07-26 | 6 | -3/+30 |
| | |||||
* | Remove artifacts for git | Fabio Berger | 2018-07-26 | 4 | -3256/+0 |
| | |||||
* | Call 'lerna publish' with spawn so we see stderr and stdout in real-time | Fabio Berger | 2018-07-26 | 1 | -2/+10 |
| | |||||
* | Merge pull request #902 from 0xProject/feature/web3-wrapper/unexport-marshaller | Francesco Agosti | 2018-07-26 | 3 | -2/+6 |
|\ | | | | | Stop exporting marshaller from web3-wrapper | ||||
| * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-07-26 | 177 | -3870/+4542 |
| |\ | | | | | | | | | | feature/web3-wrapper/unexport-marshaller | ||||
| * | | Add remove marshaller to changelog notes | fragosti | 2018-07-20 | 1 | -0/+8 |
| | | | |||||
| * | | Stop exporting marshaller from web3-wrapper | fragosti | 2018-07-20 | 3 | -6/+2 |
| | | | |||||
* | | | Remove careers page feature flag | Brandon Millman | 2018-07-26 | 2 | -14/+2 |
| | | | |||||
* | | | Merge pull request #893 from 0xProject/feature/website/jobs-page-part2 | Brandon Millman | 2018-07-26 | 30 | -438/+420 |
|\ \ \ | | | | | | | | | Jobs page | ||||
| * | | | Header copy change | Brandon Millman | 2018-07-26 | 1 | -8/+7 |
| | | | | |||||
| * | | | Margin polish | Brandon Millman | 2018-07-26 | 2 | -4/+4 |
| | | | | |||||
| * | | | Update open positions section | Brandon Millman | 2018-07-25 | 3 | -10/+29 |
| | | | | |||||
| * | | | Update benefits section | Brandon Millman | 2018-07-25 | 3 | -23/+48 |
| | | | | |||||
| * | | | Update mission section | Brandon Millman | 2018-07-25 | 2 | -18/+47 |
| | | | | |||||
| * | | | Header copy updates | Brandon Millman | 2018-07-25 | 1 | -6/+16 |
| | | | | |||||
| * | | | Use isMobileWidth util | Brandon Millman | 2018-07-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Use our image component in mission | Brandon Millman | 2018-07-25 | 2 | -2/+7 |
| | | | | |||||
| * | | | Always go to open positions when clicking CTA | Brandon Millman | 2018-07-24 | 1 | -0/+1 |
| | | | | |||||
| * | | | Fix hiding of dots on small screens | Brandon Millman | 2018-07-24 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'v2-prototype' into feature/website/jobs-page-part2 | Brandon Millman | 2018-07-24 | 118 | -2294/+2720 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (38 commits) Revert "Publish" Publish Remove ERC721 callback functions Use != instead of > in loops, add sanity checks to market fill functions Add more tests and fixes Remove MConstants and MixinConstants for LibConstants Remove redundant external call by reimplementing fillOrderNoThrow Remove orders length check Add assertValidFillResults Update web3Wrapper CHANGELOG Get actual gasPrice from transaction instead of setting default Store orders length in varible before looping over orders Use transferFrom instead of safeTransferFrom Fix minimal tests Fix rounding error issues, use different logic when makerAsset is ZRX Rename marketSellEth => marketSellWeth Update percentage constants Update transferEthFeeAndRefund, add check to ERC721 transfer Refactor forwarding contract architecture, remove batch functions Updated CHANGELOGS ... | ||||
| * \ \ \ | Merge branch 'v2-prototype' into feature/website/jobs-page-part2 | Brandon Millman | 2018-07-21 | 115 | -913/+1992 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (103 commits) Add changelog entry for @0xproject/utils Add AbortController polyfill to fetchAsync in utils Increase node heap size for webpack command Add missing timestamp to CHANGELOG entries Upgrade some @0xproject packages to 1.0.0 in website Hard code fillOrder selector into abiEncodeFillOrder Returns byte array instead of memory range for encoding fillOrder calldata Created LibAbiEncoder with `fillOrderNoThrow` Add missing dep in migrations Fix the abi-gen entry point Fix linter error Remove the postinstall hook Update website package.json with original imports @0xproject/sra-report@1.0.0 Change all package to depend on the new @0xproject/connect@1.0.0 @0xproject/connect@1.0.0 Use old assert version in @0xproject/connect FIx a typo Remove rc versions from unmigrated packages 0x.js@1.0.0-rc.2 ... | ||||
| * | | | | | Update hr color | Brandon Millman | 2018-07-19 | 2 | -4/+1 |
| | | | | | | |||||
| * | | | | | Fix lint errors | Brandon Millman | 2018-07-19 | 3 | -26/+0 |
| | | | | | | |||||
| * | | | | | Add /careers route and fix hr styling | Brandon Millman | 2018-07-19 | 7 | -9/+19 |
| | | | | | | |||||
| * | | | | | Fix typos | Brandon Millman | 2018-07-19 | 2 | -5/+5 |
| | | | | | | |||||
| * | | | | | Fix key errors and typo | Brandon Millman | 2018-07-19 | 2 | -5/+4 |
| | | | | | | |||||
| * | | | | | Fix padding on open positions section | Brandon Millman | 2018-07-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add dots on hero | Brandon Millman | 2018-07-19 | 1 | -1/+11 |
| | | | | | | |||||
| * | | | | | Padding fixes | Brandon Millman | 2018-07-19 | 2 | -7/+4 |
| | | | | | | |||||
| * | | | | | Update open positions section | Brandon Millman | 2018-07-19 | 3 | -85/+78 |
| | | | | | | |||||
| * | | | | | Benefits and values sections | Brandon Millman | 2018-07-19 | 22 | -284/+209 |
| | | | | | | |||||
| * | | | | | Remove sections | Brandon Millman | 2018-07-19 | 1 | -7/+0 |
| | | | | | | |||||
| * | | | | | Update mission section | Brandon Millman | 2018-07-19 | 1 | -37/+29 |
| | | | | | | |||||
| * | | | | | Updates to the Join 0x section | Brandon Millman | 2018-07-19 | 1 | -8/+12 |
| | | | | | | |||||
| * | | | | | Fix development environment check | Brandon Millman | 2018-07-19 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Also skip prompt when publishing for real | Fabio Berger | 2018-07-26 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #911 from 0xProject/fix-v2-beta-migration | Fabio Berger | 2018-07-26 | 44 | -4507/+60023 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Update/Fix V2-beta-testnet migration & Use it in all RC packages | ||||
| * | | | | | Add order-watcher artifacts to prettierignore | Fabio Berger | 2018-07-26 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Add contract-wrappers artifacts to prettierignore | Fabio Berger | 2018-07-26 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Prettier fixes | Fabio Berger | 2018-07-26 | 6 | -3199/+3263 |
| | | | | | | |||||
| * | | | | | Missing artifact | Fabio Berger | 2018-07-26 | 1 | -0/+723 |
| | | | | | | |||||
| * | | | | | Replace hard-coded compact_artifacts with migrations artifacts | Fabio Berger | 2018-07-26 | 11 | -381/+3211 |
| | | | | | | |||||
| * | | | | | Update order-utils to use 2.0.0-beta-testnet artifacts | Fabio Berger | 2018-07-26 | 1 | -3/+5 |
| | | | | | | |||||
| * | | | | | Remove artifacts which should no longer be commited | Fabio Berger | 2018-07-26 | 9 | -14598/+0 |
| | | | | | | |||||
| * | | | | | Add artifacts to gitignore | Fabio Berger | 2018-07-26 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | New WETH9 artifacts | Fabio Berger | 2018-07-26 | 2 | -36/+36 |
| | | | | | | |||||
| * | | | | | Modify WETH9 event arg names to be identical to ERC20 standard suggested names | Fabio Berger | 2018-07-26 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Update artifacts in contract-wrappers, generate artifacts and improve README | Fabio Berger | 2018-07-26 | 18 | -3817/+25006 |
| | | | | | | |||||
| * | | | | | Update the kovan addresses in artifacts | Fabio Berger | 2018-07-25 | 4 | -6/+6 |
| | | | | | | |||||
| * | | | | | Improve the README instructions for migrations | Fabio Berger | 2018-07-25 | 1 | -2/+22 |
| | | | | | | |||||
| * | | | | | Use infura | Fabio Berger | 2018-07-25 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Fix typo | Fabio Berger | 2018-07-25 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Update v2-beta-testnet migration | Fabio Berger | 2018-07-25 | 11 | -259/+45542 |
|/ / / / / | |||||
* | | | | | Merge pull request #908 from 0xProject/publish-fixes-rc | Fabio Berger | 2018-07-25 | 65 | -1349/+1507 |
|\ \ \ \ \ | | | | | | | | | | | | | Publish Flow Fixes For RC releases | ||||
| * | | | | | Update yarn.lock to not use local npm registry | Fabio Berger | 2018-07-25 | 1 | -76/+76 |
| | | | | | | |||||
| * | | | | | Remove unused import | Fabio Berger | 2018-07-25 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Update artifact | Fabio Berger | 2018-07-25 | 1 | -8/+8 |
| | | | | | | |||||
| * | | | | | update yarn.lock | Fabio Berger | 2018-07-25 | 1 | -0/+7 |
| | | | | | | |||||
| * | | | | | Fix dep collision | Fabio Berger | 2018-07-25 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | merge v2-prototype | Fabio Berger | 2018-07-25 | 4 | -13/+9 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Update orderEpoch comments | Amir Bandeali | 2018-07-25 | 2 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #891 from 0xProject/bug/website/wiki-page-topbar | Francesco Agosti | 2018-07-25 | 1 | -1/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Make topbar zIndex 1 | ||||
| * | | | | | | Add zIndex 1 to topbar and fix issue where no box-shadow present on /docs | fragosti | 2018-07-19 | 2 | -2/+6 |
| | | | | | | | |||||
| * | | | | | | Make topbar zIndex 1 | fragosti | 2018-07-18 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #905 from 0xProject/fix-rc-packages | Fabio Berger | 2018-07-25 | 9 | -13/+37 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Fix Published Packages Type Issues | ||||
| * | | | | | | Omit specific version of react types | Fabio Berger | 2018-07-24 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Correct next version | Fabio Berger | 2018-07-24 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge v2-prototype | Fabio Berger | 2018-07-24 | 106 | -2233/+2565 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| | | * | | | | Leave react-dom type version also unspecified | Fabio Berger | 2018-07-25 | 2 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | Remove unused typwe | Fabio Berger | 2018-07-25 | 1 | -12/+0 |
| | | | | | | | |||||
| | | * | | | | Remove force publish | Fabio Berger | 2018-07-25 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Revert "Temporarily add changelog & package.json version changes" | Fabio Berger | 2018-07-25 | 52 | -290/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 97268d22534c2f4aca9bd6a88c70e988969d3c76. | ||||
| | | * | | | | Add back build step | Fabio Berger | 2018-07-25 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Specify registry url only if local publish attempted | Leonid Logvinov | 2018-07-25 | 6 | -36/+42 |
| | | | | | | | |||||
| | | * | | | | Replace dry mode with local publishing mode | Leonid Logvinov | 2018-07-25 | 3 | -30/+38 |
| | | | | | | | |||||
| | | * | | | | Install our fork of lerna and use it | Fabio Berger | 2018-07-25 | 3 | -451/+472 |
| | | | | | | | |||||
| | | * | | | | Omit specific version of react types | Fabio Berger | 2018-07-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Temporarily add changelog & package.json version changes | Fabio Berger | 2018-07-24 | 52 | -8/+290 |
| | | | | | | | |||||
| | | * | | | | Fix lerna verson | Fabio Berger | 2018-07-24 | 2 | -18/+18 |
| | | | | | | | |||||
| | | * | | | | Correct next version | Fabio Berger | 2018-07-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Merge fix-rc-packages | Fabio Berger | 2018-07-24 | 9 | -11/+38 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Move solidity-parser-antlr type to dependencies since it's used as part of ↵ | Fabio Berger | 2018-07-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | the packages public interface | ||||
| * | | | | | | Omit verson of react types | Fabio Berger | 2018-07-23 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Stop specifying a specific version of @types/react so there can't be two ↵ | Fabio Berger | 2018-07-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | instances of the type installed | ||||
| * | | | | | | Move hdkey typings to dependencies since it's part of the exported interface | Fabio Berger | 2018-07-23 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Add dependent types of the react-popper typings | Fabio Berger | 2018-07-23 | 1 | -1/+3 |
| | | | | | | | |||||
| * | | | | | | Revert "Move frontend package types out of typescript-typings since this ↵ | Fabio Berger | 2018-07-23 | 7 | -56/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | package will be used in both node and browser contexts" This reverts commit 74483631d09395de248fe97034c059a2a8bb2097. | ||||
| * | | | | | | Add troubleshooting section to utils README | Fabio Berger | 2018-07-23 | 1 | -1/+15 |
| | | | | | | | |||||
| * | | | | | | Add additional required tsconfig option for utils package since it now ↵ | Fabio Berger | 2018-07-23 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | relies on RequestInit & Response types defined in lib.dom.d.ts | ||||
| * | | | | | | Move frontend package types out of typescript-typings since this package ↵ | Fabio Berger | 2018-07-22 | 7 | -53/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | will be used in both node and browser contexts | ||||
| * | | | | | | Add bn.js types as dep of `typescript-typings` since they are needed by ↵ | Fabio Berger | 2018-07-22 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ethereumjs-utils types | ||||
| * | | | | | | Move ECSignature type from types package into eth-light-wallet type dec ↵ | Fabio Berger | 2018-07-22 | 3 | -8/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | since only used there | ||||
| | | * | | | | Make the test:installation work with the local npm registry | Leonid Logvinov | 2018-07-24 | 2 | -5/+13 |
| | | | | | | | |||||
| | | * | | | | Pretend we defined types for @lerna/batch-packages | Leonid Logvinov | 2018-07-24 | 1 | -0/+1 |
| | | | | | | | |||||
| | | * | | | | Add utils.getTopologicallySortedPackages | Leonid Logvinov | 2018-07-24 | 1 | -1/+11 |
| | | | | | | | |||||
| | | * | | | | Introduce PackageJson file | Leonid Logvinov | 2018-07-24 | 1 | -10/+12 |
| | | | | | | | |||||
| | | * | | | | Add .npmrc to gitignore | Leonid Logvinov | 2018-07-24 | 1 | -0/+1 |
| | | | | | | | |||||
| | | * | | | | Test installation on latest version, not the packed one | Leonid Logvinov | 2018-07-24 | 1 | -6/+4 |
| | | | | | | | |||||
| | | * | | | | Temp: Force publish | Leonid Logvinov | 2018-07-24 | 1 | -1/+3 |
| | | | | | | | |||||
| | | * | | | | Fix(lerna): Change lerna version | Leonid Logvinov | 2018-07-24 | 2 | -17/+17 |
| | | | | | | | |||||
| | | * | | | | improve logs | Fabio Berger | 2018-07-24 | 1 | -3/+2 |
| | | | | | | | |||||
| | | * | | | | remove legacy prepublishOnly | Fabio Berger | 2018-07-24 | 1 | -1/+0 |
| | | | | | | | |||||
| | | * | | | | Add --yes flag | Fabio Berger | 2018-07-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Add node | Fabio Berger | 2018-07-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Use relative path to lerna executable | Fabio Berger | 2018-07-24 | 1 | -3/+3 |
| | | | | | | | |||||
| | | * | | | | Upgrade to new lerna | Fabio Berger | 2018-07-24 | 2 | -62/+62 |
| | | | | | | | |||||
| | | * | | | | Add missing 'publish' | Fabio Berger | 2018-07-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Fix publish command | Fabio Berger | 2018-07-24 | 1 | -3/+5 |
| | | | | | | | |||||
| | | * | | | | Use cdVersions flag instead of interactive prompt | Fabio Berger | 2018-07-24 | 1 | -63/+4 |
| | | | | | | | |||||
| | | * | | | | Temporarily use local lerna | Fabio Berger | 2018-07-24 | 3 | -96/+96 |
| | | | | | | | |||||
| | | * | | | | Add ignore flag | Fabio Berger | 2018-07-24 | 1 | -0/+8 |
| | | | | | | | |||||
| | | * | | | | Use include | Fabio Berger | 2018-07-24 | 1 | -3/+1 |
| | | | | | | | |||||
| | | * | | | | Dedup versionPrompt being triggered multiple times | Fabio Berger | 2018-07-24 | 1 | -2/+8 |
| | | | | | | | |||||
| | | * | | | | Remove regex | Fabio Berger | 2018-07-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Make regex less strict | Fabio Berger | 2018-07-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Add timeout before writing to stdin | Fabio Berger | 2018-07-24 | 1 | -4/+11 |
| | | | | | | | |||||
| | | * | | | | Use string equals and remove returns | Fabio Berger | 2018-07-24 | 1 | -3/+1 |
| | | | | | | | |||||
| | | * | | | | Add in print statements | Fabio Berger | 2018-07-24 | 1 | -0/+3 |
| | | | | | | | |||||
| | | * | | | | Add missing vars | Fabio Berger | 2018-07-24 | 1 | -2/+4 |
| | | | | | | | |||||
| | | * | | | | Also add private package new versions to packageToNextVersion | Fabio Berger | 2018-07-24 | 1 | -11/+14 |
| | | | | | | | |||||
| | | * | | | | Make sure private packages have a next version | Fabio Berger | 2018-07-24 | 1 | -0/+8 |
| | | | | | | | |||||
| | | * | | | | more bogus | Fabio Berger | 2018-07-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | testing | Fabio Berger | 2018-07-24 | 1 | -0/+3 |
| | | | | | | | |||||
| | | * | | | | Fix publish to give lerna actual version rather then the semver diff | Fabio Berger | 2018-07-24 | 2 | -12/+12 |
| | | | | | | | |||||
| | | * | | | | Update lerna.json | Fabio Berger | 2018-07-24 | 1 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | Changed artifacts | Fabio Berger | 2018-07-24 | 13 | -414/+483 |
| | | | | | | | |||||
| | | * | | | | And also temporarily remove rebuilding from publish flow | Fabio Berger | 2018-07-24 | 1 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | Temporarily uncommented parts of publish flow | Fabio Berger | 2018-07-24 | 2 | -23/+23 |
| | | | | | | | |||||
| | | * | | | | Fix lerna publish to include publishing prerelease versions | Fabio Berger | 2018-07-24 | 2 | -13/+15 |
| | | | | | | | |||||
| | | * | | | | Omit building website before publish | Fabio Berger | 2018-07-24 | 1 | -2/+4 |
| | | | | | | | |||||
| | | * | | | | Add new RC versions to changelog so that these packages are publised as RC's | Fabio Berger | 2018-07-24 | 7 | -0/+65 |
| | | | | | | | |||||
| | | * | | | | Revert "Revert "Publish"" | Fabio Berger | 2018-07-24 | 31 | -280/+277 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a66ccaa1da2af753038bf22a5e7e63bdc307bf2f. | ||||
| | | * | | | | Add skip-git for testing | Fabio Berger | 2018-07-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Allow registry to be configured in lerna.json | Fabio Berger | 2018-07-24 | 4 | -6/+8 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #847 from 0xProject/refactor/contracts/simplify-forwarder | Amir Bandeali | 2018-07-23 | 33 | -1890/+1740 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Refactor forwarding contract architecture, remove batch functions | ||||
| * | | | | | | Remove ERC721 callback functions | Amir Bandeali | 2018-07-23 | 4 | -49/+3 |
| | | | | | | | |||||
| * | | | | | | Use != instead of > in loops, add sanity checks to market fill functions | Amir Bandeali | 2018-07-23 | 3 | -19/+19 |
| | | | | | | | |||||
| * | | | | | | Add more tests and fixes | Amir Bandeali | 2018-07-23 | 8 | -412/+484 |
| | | | | | | | |||||
| * | | | | | | Remove MConstants and MixinConstants for LibConstants | Amir Bandeali | 2018-07-23 | 8 | -57/+23 |
| | | | | | | | |||||
| * | | | | | | Remove redundant external call by reimplementing fillOrderNoThrow | Amir Bandeali | 2018-07-23 | 6 | -166/+355 |
| | | | | | | | |||||
| * | | | | | | Remove orders length check | Amir Bandeali | 2018-07-23 | 2 | -11/+0 |
| | | | | | | | |||||
| * | | | | | | Add assertValidFillResults | Amir Bandeali | 2018-07-23 | 1 | -61/+88 |
| | | | | | | | |||||
| * | | | | | | Update web3Wrapper CHANGELOG | Amir Bandeali | 2018-07-23 | 1 | -0/+9 |
| | | | | | | | |||||
| * | | | | | | Get actual gasPrice from transaction instead of setting default | Amir Bandeali | 2018-07-23 | 2 | -35/+48 |
| | | | | | | | |||||
| * | | | | | | Store orders length in varible before looping over orders | Amir Bandeali | 2018-07-23 | 2 | -14/+25 |
| | | | | | | | |||||
| * | | | | | | Use transferFrom instead of safeTransferFrom | Amir Bandeali | 2018-07-23 | 2 | -6/+2 |
| | | | | | | | |||||
| * | | | | | | Fix minimal tests | Amir Bandeali | 2018-07-23 | 4 | -730/+748 |
| | | | | | | | |||||
| * | | | | | | Fix rounding error issues, use different logic when makerAsset is ZRX | Amir Bandeali | 2018-07-23 | 6 | -52/+95 |
| | | | | | | | |||||
| * | | | | | | Rename marketSellEth => marketSellWeth | Amir Bandeali | 2018-07-23 | 2 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Update percentage constants | Amir Bandeali | 2018-07-23 | 3 | -17/+18 |
| | | | | | | | |||||
| * | | | | | | Update transferEthFeeAndRefund, add check to ERC721 transfer | Amir Bandeali | 2018-07-23 | 6 | -26/+54 |
| | | | | | | | |||||
| * | | | | | | Refactor forwarding contract architecture, remove batch functions | Amir Bandeali | 2018-07-23 | 20 | -1038/+572 |
| | | | | | | | |||||
* | | | | | | | Revert "Publish" | Leonid Logvinov | 2018-07-23 | 31 | -277/+280 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3dc94051713e4a32796ce3b4ae4b70b527e24cfe. | ||||
* | | | | | | | Publish | Leonid Logvinov | 2018-07-23 | 31 | -280/+277 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.0 - @0xproject/abi-gen@1.0.1 - @0xproject/assert@1.0.1 - @0xproject/base-contract@1.0.1 - @0xproject/connect@1.0.1 - @0xproject/contract-wrappers@1.0.0 - contracts@2.1.36 - @0xproject/dev-utils@1.0.1 - ethereum-types@1.0.1 - @0xproject/fill-scenarios@1.0.0 - @0xproject/json-schemas@1.0.0 - @0xproject/metacoin@0.0.11 - @0xproject/migrations@1.0.1 - @0xproject/monorepo-scripts@1.0.1 - @0xproject/order-utils@1.0.0 - @0xproject/order-watcher@1.0.0 - @0xproject/react-docs@1.0.1 - @0xproject/react-docs-example@0.0.16 - @0xproject/react-shared@1.0.1 - @0xproject/sol-compiler@1.0.1 - @0xproject/sol-cov@1.0.1 - @0xproject/sol-resolver@1.0.1 - @0xproject/sra-report@1.0.1 - @0xproject/subproviders@1.0.1 - @0xproject/testnet-faucets@1.0.37 - @0xproject/tslint-config@1.0.1 - @0xproject/types@1.0.0 - @0xproject/typescript-typings@1.0.1 - @0xproject/utils@1.0.1 - @0xproject/web3-wrapper@1.0.1 - @0xproject/website@0.0.40 | ||||
* | | | | | | Merge pull request #906 from 0xProject/refactor/contracts/examples | Amir Bandeali | 2018-07-23 | 14 | -26/+124 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [contracts] Add `examples` directory | ||||
| * | | | | | | Add tests to verify ZRX_ASSET_DATA | Amir Bandeali | 2018-07-23 | 5 | -1/+77 |
| | | | | | | | |||||
| * | | | | | | Add comments for deploying with constant ZRX_ASSET_DATA | Amir Bandeali | 2018-07-23 | 2 | -2/+15 |
| | | | | | | | |||||
| * | | | | | | Move example contracts into new examples dir | Amir Bandeali | 2018-07-23 | 10 | -24/+33 |
| | | | | | | | |||||
* | | | | | | | Updated CHANGELOGS | Leonid Logvinov | 2018-07-23 | 56 | -109/+657 |
|/ / / / / / | |||||
* | | | | | | Add missing timestamps in CHANGELOGs | Leonid Logvinov | 2018-07-23 | 7 | -11/+8 |
| | | | | | | |||||
* | | | | | | Add missing timestamps in CHANGELOGs | Leonid Logvinov | 2018-07-23 | 2 | -2/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #877 from 0xProject/feature/contracts/removeERC721Callback | Amir Bandeali | 2018-07-23 | 8 | -199/+36 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Removed receiverData and `onReceive` callback from ERC721 proxy. | ||||
| * | | | | | Fixed merge errors | Greg Hysen | 2018-07-18 | 1 | -2/+0 |
| | | | | | | |||||
| * | | | | | Fixed merge error | Greg Hysen | 2018-07-18 | 1 | -11/+11 |
| | | | | | | |||||
| * | | | | | Ran prettier | Greg Hysen | 2018-07-18 | 2 | -15/+12 |
| | | | | | | |||||
| * | | | | | Removed receiverData from ERC721 Proxy Id generation | Greg Hysen | 2018-07-18 | 7 | -17/+12 |
| | | | | | | |||||
| * | | | | | Removed receiverData and `onReceive` callback from ERC721 proxy. | Greg Hysen | 2018-07-18 | 3 | -178/+25 |
| | | | | | | |||||
* | | | | | | Merge pull request #880 from feuGeneA/patch-5 | Fabio Berger | 2018-07-22 | 1 | -7/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | make PR template checklist more useful | ||||
| * | | | | | | make PR template checklist more useful | F. Eugene Aumson | 2018-07-17 | 1 | -7/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Goal is to make it so that every PR should check off every checklist item before it is considered complete. Removed mention of labels. Since contributors outside the org don't have permission to add labels, it's not possible for any such contributor to ever check those items off. Opted instead to prescribe bracketed PR title prefixes, which are accessible to all. Re-ordered checklist items to better represent chronological progress. | ||||
* | | | | | | | Merge pull request #895 from 0xProject/feature/website/send-eth-from-portal | Francesco Agosti | 2018-07-22 | 9 | -48/+129 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Send Ether from Portal | ||||
| * | | | | | | | Remove TODO | fragosti | 2018-07-19 | 1 | -1/+0 |
| | | | | | | | | |||||
| * | | | | | | | Remove unused Token import | fragosti | 2018-07-19 | 1 | -1/+0 |
| | | | | | | | | |||||
| * | | | | | | | Add lifecycle messages | fragosti | 2018-07-19 | 3 | -17/+56 |
| | | | | | | | | |||||
| * | | | | | | | WIP for sending ether from portal (works) | fragosti | 2018-07-19 | 7 | -38/+82 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Fix version of ethereumjs-abi to 0.6.5 to fix decoding bug | Fabio Berger | 2018-07-22 | 4 | -5/+21 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #904 from lukeautry/luke/leading_zero_encode | Fabio Berger | 2018-07-22 | 3 | -4/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | 0x.js v2: fix decodeAssetData for addresses starting in 0 | ||||
| * | | | | | | | fix decodeAssetData for addresses starting in 0 | Luke Autry | 2018-07-22 | 3 | -4/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #899 from kroitor/patch-1 | Amir Bandeali | 2018-07-21 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | Deduplicate assert web3-wrapper signMessageAsync | ||||
| * | | | | | | | Deduplicate assert web3-wrapper signMessageAsync | Igor Kroitor | 2018-07-20 | 1 | -1/+0 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #903 from 0xProject/bug/website/fix-website | Brandon Millman | 2018-07-21 | 5 | -71/+29 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add AbortController polyfill to fetchAsync in utils | ||||
| * \ \ \ \ \ \ | Merge branch 'v2-prototype' into bug/website/fix-website | Brandon Millman | 2018-07-21 | 26 | -0/+27 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Add missing timestamp to CHANGELOG entries | ||||
* | | | | | | | | Add missing timestamp to CHANGELOG entries | Fabio Berger | 2018-07-21 | 26 | -0/+27 |
| |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Add changelog entry for @0xproject/utils | Brandon Millman | 2018-07-21 | 1 | -0/+9 |
| | | | | | | | |||||
| * | | | | | | Add AbortController polyfill to fetchAsync in utils | Brandon Millman | 2018-07-21 | 3 | -0/+8 |
| | | | | | | | |||||
| * | | | | | | Increase node heap size for webpack command | Brandon Millman | 2018-07-21 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Upgrade some @0xproject packages to 1.0.0 in website | Brandon Millman | 2018-07-21 | 2 | -70/+11 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #892 from 0xProject/refactor/contracts/LibAbiEncoder | Amir Bandeali | 2018-07-20 | 2 | -170/+234 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Created LibAbiEncoder with `fillOrderNoThrow` | ||||
| * | | | | | | Hard code fillOrder selector into abiEncodeFillOrder | Amir Bandeali | 2018-07-20 | 1 | -7/+4 |
| | | | | | | | |||||
| * | | | | | | Returns byte array instead of memory range for encoding fillOrder calldata | Greg Hysen | 2018-07-20 | 2 | -24/+26 |
| | | | | | | | |||||
| * | | | | | | Created LibAbiEncoder with `fillOrderNoThrow` | Greg Hysen | 2018-07-20 | 2 | -170/+235 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #901 from 0xProject/feature/abi-gen-fix | Leonid Logvinov | 2018-07-20 | 3 | -3/+12 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix the abi-gen entry point | ||||
| * | | | | | | Fix the abi-gen entry point | Leonid Logvinov | 2018-07-20 | 3 | -3/+12 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into ↵ | Fabio Berger | 2018-07-20 | 3 | -35/+243 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v2-prototype * 'v2-prototype' of github.com:0xProject/0x-monorepo: Fix linter error Remove the postinstall hook | ||||
| * | | | | | Fix linter error | Leonid Logvinov | 2018-07-20 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Remove the postinstall hook | Leonid Logvinov | 2018-07-20 | 2 | -35/+242 |
| | | | | | | |||||
* | | | | | | Add missing dep in migrations | Fabio Berger | 2018-07-20 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into ↵ | Fabio Berger | 2018-07-20 | 2 | -2/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v2-prototype * 'v2-prototype' of github.com:0xProject/0x-monorepo: @0xproject/sra-report@1.0.0 Change all package to depend on the new @0xproject/connect@1.0.0 | ||||
| * | | | | | @0xproject/sra-report@1.0.0 | Leonid Logvinov | 2018-07-20 | 2 | -1/+9 |
| | | | | | | |||||
| * | | | | | Change all package to depend on the new @0xproject/connect@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Update website package.json with original imports | Fabio Berger | 2018-07-20 | 1 | -9/+9 |
|/ / / / / | |||||
* | | | | | @0xproject/connect@1.0.0 | Leonid Logvinov | 2018-07-20 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Use old assert version in @0xproject/connect | Leonid Logvinov | 2018-07-20 | 2 | -103/+184 |
| | | | | | |||||
* | | | | | FIx a typo | Leonid Logvinov | 2018-07-20 | 24 | -24/+24 |
| | | | | | |||||
* | | | | | Remove rc versions from unmigrated packages | Leonid Logvinov | 2018-07-20 | 2 | -5/+5 |
| | | | | | |||||
* | | | | | 0x.js@1.0.0-rc.2 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Move methods in `ZeroEx.assetData` to `ZeroEx` itself | Fabio Berger | 2018-07-20 | 2 | -4/+59 |
| | | | | | |||||
* | | | | | Fix scoping of assets in 0x.js | Leonid Logvinov | 2018-07-20 | 1 | -9/+7 |
| | | | | | |||||
* | | | | | 0x.js@1.0.0-rc.1 | Leonid Logvinov | 2018-07-20 | 2 | -12/+8 |
| | | | | | |||||
* | | | | | Remove bundles config | Leonid Logvinov | 2018-07-20 | 1 | -7/+1 |
| | | | | | |||||
* | | | | | @0xproject/order-watcher@1.0.0-rc.1 | Leonid Logvinov | 2018-07-20 | 2 | -1/+10 |
| | | | | | |||||
* | | | | | Add monorepo-scripts postpublish.ts | Leonid Logvinov | 2018-07-20 | 1 | -0/+8 |
| | | | | | |||||
* | | | | | Change all package to depend on the new @0xproject/contract-wrappers@1.0.0-rc.1 | Leonid Logvinov | 2018-07-20 | 4 | -11/+3 |
| | | | | | |||||
* | | | | | @0xproject/contract-wrappers@1.0.0-rc.1 | Leonid Logvinov | 2018-07-20 | 2 | -5/+5 |
| | | | | | |||||
* | | | | | Change all package to depend on the new @0xproject/migrations@1.0.0 | Leonid Logvinov | 2018-07-20 | 4 | -4/+5 |
| | | | | | |||||
* | | | | | @0xproject/migrations@1.0.0 | Leonid Logvinov | 2018-07-20 | 2 | -1/+9 |
| | | | | | |||||
* | | | | | Change all package to depend on the new @0xproject/sol-cov@1.0.0 | Leonid Logvinov | 2018-07-20 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | @0xproject/sol-cov@1.0.0 | Leonid Logvinov | 2018-07-20 | 2 | -8/+10 |
| | | | | |