Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #285 from 0xProject/fix/underscorePrivate | Brandon Millman | 2017-12-22 | 94 | -1366/+1433 |
|\ | | | | | Add new underscore-privates rule to @0xproject/tslint-config and fix … | ||||
| * | Add some missed underscores, update changelog and comments | Brandon Millman | 2017-12-21 | 7 | -34/+28 |
| | | |||||
| * | Merge branch 'development' into fix/underscorePrivate | Brandon Millman | 2017-12-21 | 49 | -409/+1430 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (29 commits) Move call to error reporter to end of handler so that even if reporting the error takes a while, it doesn't block the UI Update outdated WETH ranges Fix conditional Fix top-padding Publish Update CHANGELOGs Add slashes to base URLs Fix linter issue Fix WETH symbol Update snapshot and artifacts Replace our EtherTokens with WETH9 from maker Fix test description Fix a typo Add err==null assertions Add WETH9 tests Use the new snapshot including WETH9 and it's artifacts Add WETH9 and mirations Fix WETH events watching Fix a typo Init the _etherTokenContractsByAddress ... | ||||
| * | | Add new underscore-privates rule to @0xproject/tslint-config and fix lint errors | Brandon Millman | 2017-12-20 | 93 | -1345/+1418 |
| | | | |||||
* | | | Merge pull request #287 from 0xProject/fix/toBaseUnitAmount | Fabio Berger | 2017-12-22 | 3 | -1/+22 |
|\ \ \ | | | | | | | | | Fix toBaseUnitAmount Issue | ||||
| * | | | Add to CHANGELOG | Fabio Berger | 2017-12-21 | 1 | -0/+5 |
| | | | | |||||
| * | | | Refactor toBaseUnitAmount so that it throws if user supplies unitAmount with ↵ | Fabio Berger | 2017-12-21 | 2 | -0/+10 |
| | | | | | | | | | | | | | | | | too many decimals | ||||
| * | | | Make assertion stricter so that one cannot submit invalid baseUnit amounts ↵ | Fabio Berger | 2017-12-21 | 2 | -1/+7 |
| | |/ | |/| | | | | | | | to `toUnitAmount` | ||||
* | | | Merge pull request #286 from 0xProject/feature/updateContractsReadme | Amir Bandeali | 2017-12-21 | 1 | -28/+42 |
|\ \ \ | | | | | | | | | Update and standardize contracts README | ||||
| * | | | Update and standardize contracts README | Amir Bandeali | 2017-12-21 | 1 | -28/+42 |
|/ / / | |||||
* / / | Fix Max button bug | Fabio Berger | 2017-12-21 | 1 | -1/+1 |
|/ / | |||||
* | | Move call to error reporter to end of handler so that even if reporting the ↵ | Fabio Berger | 2017-12-21 | 4 | -6/+6 |
| | | | | | | | | error takes a while, it doesn't block the UI | ||||
* | | Update outdated WETH ranges | Fabio Berger | 2017-12-21 | 1 | -4/+4 |
| | | |||||
* | | Fix conditional | Fabio Berger | 2017-12-21 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'development' of github.com:0xProject/0x.js into development | Fabio Berger | 2017-12-21 | 15 | -58/+58 |
|\ \ | | | | | | | | | | | | | * 'development' of github.com:0xProject/0x.js: Publish | ||||
| * | | Publishcontracts@2.1.0@0xproject/website@0.0.3@0xproject/monorepo-scripts@0.1.1@0xproject/kovan_faucets@1.0.1@0xproject/dev-utils@0.0.20x.js@0.28.0 | Leonid Logvinov | 2017-12-21 | 15 | -58/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.28.0 - @0xproject/abi-gen@0.0.3 - @0xproject/assert@0.0.8 - @0xproject/connect@0.3.1 - contracts@2.1.0 - @0xproject/dev-utils@0.0.2 - @0xproject/json-schemas@0.7.0 - @0xproject/kovan_faucets@1.0.1 - @0xproject/monorepo-scripts@0.1.1 - @0xproject/subproviders@0.1.1 - @0xproject/tslint-config@0.3.0 - @0xproject/types@0.1.1 - @0xproject/utils@0.1.1 - @0xproject/web3-wrapper@0.1.1 - @0xproject/website@0.0.3 | ||||
* | | | Fix top-padding | Fabio Berger | 2017-12-21 | 3 | -5/+5 |
|/ / | |||||
* | | Update CHANGELOGs | Leonid Logvinov | 2017-12-20 | 4 | -4/+8 |
| | | |||||
* | | Add slashes to base URLs | Leonid Logvinov | 2017-12-20 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #280 from 0xProject/feature/updateReadmes | Brandon Millman | 2017-12-20 | 4 | -25/+169 |
|\ \ | | | | | | | Update readmes for connect, kovan-faucets, types, and utils packages | ||||
| * \ | Merge branch 'development' into feature/updateReadmes | Brandon Millman | 2017-12-20 | 2 | -24/+18 |
| |\ \ | | | | | | | | | | | | | | | | | * development: Remove reliance on testrpc snapshot in ZRX tests | ||||
| * | | | Fix wording | Brandon Millman | 2017-12-20 | 4 | -8/+8 |
| | | | | |||||
| * | | | Merge branch 'development' into feature/updateReadmes | Brandon Millman | 2017-12-20 | 73 | -1030/+1113 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (35 commits) Remove etherToken from smart contract docs Update new WETH addresses and localStorage clearance key Fix merge Remove re-assignment Fix scrolling topBar on Portal Fix overflow issue on calculated fillAmount Fix faulty import Refactor remaining _.assign to spread operator Move muiTheme into it's own module Add WETH remove extra space Remove binding on prop passed callbacks Add airtable tasks to TODO's Refactor configs and constants, standardize on uppercase/snakecase, alphebetize, rename for logical grouping Sort colors into color spectrum remove unused style standarize on `grey` over `gray` spelling and other color related fixes Standardize colors to always be in uppercase hex and consolidate material-ui greys Consolidate all custom colors and material-ui colors into a colors module Remove unused `location` prop ... | ||||
| * | | | | Update some wording and remove N/A test sections | Brandon Millman | 2017-12-20 | 4 | -28/+9 |
| | | | | | |||||
| * | | | | Update readmes for connect, kovan-facuets, types, and utils packages | Brandon Millman | 2017-12-20 | 4 | -17/+180 |
| | | | | | |||||
* | | | | | Merge pull request #277 from 0xProject/feature/weth-events | Leonid | 2017-12-20 | 19 | -305/+1178 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Add etherToken.getLogsAsync and etherToken.subscribe with tests | ||||
| * | | | | Fix linter issue | Leonid Logvinov | 2017-12-20 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Fix WETH symbol | Leonid Logvinov | 2017-12-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Update snapshot and artifacts | Leonid Logvinov | 2017-12-20 | 4 | -4/+4 |
| | | | | | |||||
| * | | | | Replace our EtherTokens with WETH9 from maker | Leonid Logvinov | 2017-12-20 | 6 | -303/+2 |
| | | | | | |||||
| * | | | | Fix test description | Leonid Logvinov | 2017-12-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix a typo | Leonid Logvinov | 2017-12-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add err==null assertions | Leonid Logvinov | 2017-12-20 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Add WETH9 tests | Leonid Logvinov | 2017-12-20 | 3 | -4/+58 |
| | | | | | |||||
| * | | | | Use the new snapshot including WETH9 and it's artifacts | Leonid Logvinov | 2017-12-20 | 4 | -6/+6 |
| | | | | | |||||
| * | | | | Add WETH9 and mirations | Leonid Logvinov | 2017-12-20 | 2 | -0/+769 |
| | | | | | |||||
| * | | | | Fix WETH events watching | Leonid Logvinov | 2017-12-20 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | Fix a typo | Leonid Logvinov | 2017-12-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Init the _etherTokenContractsByAddress | Leonid Logvinov | 2017-12-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Export new public types | Leonid Logvinov | 2017-12-20 | 2 | -0/+6 |
| | | | | | |||||
| * | | | | Update CHANGELOG | Leonid Logvinov | 2017-12-20 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Make order watcher react to new etherToken events | Leonid Logvinov | 2017-12-20 | 1 | -0/+33 |
| | | | | | |||||
| * | | | | Add EtherToken events to the ABI | Leonid Logvinov | 2017-12-20 | 2 | -2/+36 |
| | | | | | |||||
| * | | | | Enable multiple EtherTokenContract instances | Leonid Logvinov | 2017-12-20 | 1 | -4/+9 |
| | | | | | |||||
| * | | | | Add etherToken.getLogsAsync and etherToken.subscribe with tests | Leonid Logvinov | 2017-12-20 | 8 | -8/+274 |
| | | | | | |||||
* | | | | | Merge branch 'development' of github.com:0xProject/0x.js into development | Fabio Berger | 2017-12-20 | 4 | -17/+191 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'development' of github.com:0xProject/0x.js: Change contributing test Fix yarn workspaces explanation Change CONTRIBUTING section Fix the headers Address feedback Write 4 README's | ||||
| * \ \ \ \ | Merge pull request #279 from 0xProject/feature/READMEs | Leonid | 2017-12-20 | 4 | -17/+191 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Write 4 README's | ||||
| | * | | | | | Change contributing test | Leonid Logvinov | 2017-12-20 | 4 | -4/+4 |
| | | | | | | | |||||
| | * | | | | | Fix yarn workspaces explanation | Leonid Logvinov | 2017-12-20 | 4 | -6/+13 |
| | | | | | | | |||||
| | * | | | | | Change CONTRIBUTING section | Leonid Logvinov | 2017-12-20 | 4 | -5/+9 |
| | | | | | | | |||||
| | * | | | | | Fix the headers | Leonid Logvinov | 2017-12-20 | 4 | -4/+4 |
| | | | | | | | |||||
| | * | | | | | Address feedback | Leonid Logvinov | 2017-12-20 | 4 | -36/+76 |
| | | | | | | | |||||
| | * | | | | | Write 4 README's | Leonid Logvinov | 2017-12-20 | 4 | -12/+135 |
| | |/ / / / | |||||
* | / / / / | Fix md link | Fabio Berger | 2017-12-20 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Fix link | Fabio Berger | 2017-12-20 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #284 from 0xProject/feature/newAndImprovedReadmes | Fabio Berger | 2017-12-20 | 4 | -40/+229 |
|\ \ \ \ \ | |/ / / / |/| | | | | Improve/Add to README's | ||||
| * | | | | Standardize on improved contributing section | Fabio Berger | 2017-12-20 | 4 | -3/+8 |
| | | | | | |||||
| * | | | | Add Yarn < v1.0 disclaimer | Fabio Berger | 2017-12-20 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Flesh out LedgerSubprovider usage example | Fabio Berger | 2017-12-20 | 1 | -1/+11 |
| | | | | | |||||
| * | | | | Fix command | Fabio Berger | 2017-12-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Update and improve website README | Fabio Berger | 2017-12-20 | 1 | -26/+30 |
| | | | | | |||||
| * | | | | Add mono repo scripts README | Fabio Berger | 2017-12-20 | 1 | -0/+51 |
| | | | | | |||||
| * | | | | Add clean instructions | Fabio Berger | 2017-12-20 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | Improve subproviders readme | Fabio Berger | 2017-12-20 | 1 | -6/+52 |
| | | | | | |||||
| * | | | | Flesh out main repo README | Fabio Berger | 2017-12-20 | 1 | -0/+62 |
| | | | | | |||||
| * | | | | Improve package descriptions | Fabio Berger | 2017-12-20 | 1 | -8/+8 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #278 from 0xProject/fix/error-taker-format | Leonid | 2017-12-20 | 7 | -24/+88 |
|\ \ \ \ | |_|_|/ |/| | | | Throw a better error message when taker is null|undefined or anything but not a string | ||||
| * | | | Don't throw in transformers | Leonid Logvinov | 2017-12-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update CHANGELOG | Leonid Logvinov | 2017-12-19 | 1 | -0/+1 |
| | | | | |||||
| * | | | Throw a better error message when taker is null|undefined or anything but ↵ | Leonid Logvinov | 2017-12-19 | 6 | -24/+87 |
| | |/ | |/| | | | | | | | not a string | ||||
* | | | Merge pull request #282 from 0xProject/fix/zrx-tests | Amir Bandeali | 2017-12-20 | 2 | -24/+18 |
|\ \ \ | |_|/ |/| | | Remove reliance on testrpc snapshot in ZRX tests | ||||
| * | | Remove reliance on testrpc snapshot in ZRX tests | Amir Bandeali | 2017-12-20 | 2 | -24/+18 |
| | | | |||||
* | | | Merge pull request #283 from 0xProject/createWethPage | Fabio Berger | 2017-12-20 | 11 | -59/+195 |
|\ \ \ | |/ / |/| | | Merge WETH page improvements into development | ||||
| * | | Remove etherToken from smart contract docs | Fabio Berger | 2017-12-20 | 3 | -7/+0 |
| | | | |||||
| * | | Update new WETH addresses and localStorage clearance key | Fabio Berger | 2017-12-20 | 1 | -3/+3 |
| | | | |||||
| * | | Fix merge | Fabio Berger | 2017-12-20 | 4 | -7/+8 |
| | | | |||||
| * | | Merge branch 'development' into createWethPage | Fabio Berger | 2017-12-20 | 92 | -1051/+1012 |
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (27 commits) Remove re-assignment Fix scrolling topBar on Portal Fix overflow issue on calculated fillAmount Fix faulty import Introduce an identityCommandBuilder Define types for methodID Define types for ethereumjs-abi Install types for yargs Fix comments Fix linter issues Fix linter error Rename SubscriptionOpts to BlockRange Refactor remaining _.assign to spread operator Move muiTheme into it's own module Refactor configs and constants, standardize on uppercase/snakecase, alphebetize, rename for logical grouping Sort colors into color spectrum remove unused style standarize on `grey` over `gray` spelling and other color related fixes Standardize colors to always be in uppercase hex and consolidate material-ui greys Consolidate all custom colors and material-ui colors into a colors module ... # Conflicts: # packages/website/ts/components/eth_wrappers.tsx # packages/website/ts/components/portal.tsx # packages/website/ts/utils/configs.ts # packages/website/ts/utils/constants.ts | ||||
* | | | Merge pull request #275 from 0xProject/refactor/website | Fabio Berger | 2017-12-20 | 72 | -982/+929 |
|\ \ \ | |_|/ |/| | | Refactor Website | ||||
| * | | Remove re-assignment | Fabio Berger | 2017-12-20 | 1 | -5/+9 |
| | | | |||||
| * | | Merge branch 'development' into refactor/website | Fabio Berger | 2017-12-20 | 21 | -60/+74 |
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Introduce an identityCommandBuilder Define types for methodID Define types for ethereumjs-abi Install types for yargs Fix comments Fix linter issues Fix linter error Rename SubscriptionOpts to BlockRange | ||||
* | | | Merge pull request #273 from 0xProject/fix/contract-fixes | Leonid | 2017-12-19 | 6 | -13/+21 |
|\ \ \ | | | | | | | | | Add proper types for yargs and ethereumjs-abi | ||||
| * | | | Introduce an identityCommandBuilder | Leonid Logvinov | 2017-12-19 | 1 | -2/+3 |
| | | | | |||||
| * | | | Define types for methodID | Leonid Logvinov | 2017-12-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Define types for ethereumjs-abi | Leonid Logvinov | 2017-12-19 | 1 | -1/+4 |
| | | | | |||||
| * | | | Install types for yargs | Leonid Logvinov | 2017-12-19 | 6 | -11/+15 |
|/ / / | |||||
* | | | Merge pull request #272 from 0xProject/fix/subscription-opts | Leonid | 2017-12-19 | 15 | -47/+53 |
|\ \ \ | | | | | | | | | Rename SubscriptionOpts to BlockRange | ||||
| * | | | Fix comments | Leonid Logvinov | 2017-12-19 | 2 | -2/+2 |
| | | | | |||||
| * | | | Fix linter issues | Leonid Logvinov | 2017-12-19 | 3 | -4/+4 |
| | | | | |||||
| * | | | Fix linter error | Leonid Logvinov | 2017-12-19 | 1 | -4/+4 |
| | | | | |||||
| * | | | Rename SubscriptionOpts to BlockRange | Leonid Logvinov | 2017-12-19 | 15 | -45/+51 |
|/ / / | |||||
| * | | Fix scrolling topBar on Portal | Fabio Berger | 2017-12-19 | 2 | -2/+2 |
| | | | |||||
| * | | Fix overflow issue on calculated fillAmount | Fabio Berger | 2017-12-19 | 1 | -15/+13 |
| | | | |||||
| * | | Fix faulty import | Fabio Berger | 2017-12-19 | 1 | -1/+1 |
| | | | |||||
| * | | Refactor remaining _.assign to spread operator | Fabio Berger | 2017-12-19 | 4 | -8/+15 |
| | | | |||||
| * | | Move muiTheme into it's own module | Fabio Berger | 2017-12-19 | 2 | -35/+37 |
| | | | |||||
| * | | Merge branch 'development' into refactor/website | Fabio Berger | 2017-12-19 | 27 | -105/+142 |
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Add additional public changes introduced to changelog Update CHANGELOG Add a comment Introduce a variable for true Remove redundant template string Implement the address derivations Add hdnode dependency Move web3 import after subprovider imports in test web3_factory Fixed https://github.com/0xProject/wiki/issues/19 by disabling re-rendering of markdownCodeBlock renderer if props haven't updated Add convenience `rebuild` command Update website calls to deposit/withdraw Add entry to CHANGELOG Fix tests in contracts Modify the etherToken wrapper methods to accept an etherTokenAddress as the first arg. Since it is becoming apparent we will be updating the canonical WETH contract, we want users of 0x.js to be able to interact with n number of etherTokens without re-instantiating for each one. Fix documentation issue where `unsubscribeAll` shown as method on every contractWrapper instance even though it's only used by Exchange and Token wrappers. # Conflicts: # packages/website/ts/components/eth_weth_conversion_button.tsx | ||||
| * | | Refactor configs and constants, standardize on uppercase/snakecase, ↵ | Fabio Berger | 2017-12-19 | 28 | -295/+298 |
| | | | | | | | | | | | | alphebetize, rename for logical grouping | ||||
| * | | Sort colors into color spectrum | Fabio Berger | 2017-12-18 | 1 | -8/+22 |
| | | | |||||
| * | | remove unused style | Fabio Berger | 2017-12-18 | 1 | -5/+0 |
| | | | |||||
| * | | standarize on `grey` over `gray` spelling and other color related fixes | Fabio Berger | 2017-12-18 | 40 | -92/+91 |
| | | | |||||
| * | | Standardize colors to always be in uppercase hex and consolidate material-ui ↵ | Fabio Berger | 2017-12-18 | 21 | -50/+48 |
| | | | | | | | | | | | | greys | ||||
| * | | Consolidate all custom colors and material-ui colors into a colors module | Fabio Berger | 2017-12-18 | 48 | -226/+169 |
| | | | |||||
| * | | Remove unused `location` prop | Fabio Berger | 2017-12-18 | 6 | -8/+6 |
| | | | |||||
| * | | Use bigNumberConfigs from @0xproject/utils in website repo | Fabio Berger | 2017-12-18 | 2 | -5/+3 |
| | | | |||||
| * | | Fix unhoverable help tooltip by renaming `Trade Permissions` to `Allowance` | Fabio Berger | 2017-12-18 | 1 | -2/+2 |
| | | | |||||
| * | | Replace remaining strEnums with property TS string enums | Fabio Berger | 2017-12-18 | 15 | -92/+79 |
| | | | |||||
| * | | Update ActionType enum and move from using _.assign in reducer | Fabio Berger | 2017-12-18 | 3 | -180/+222 |
| | | | |||||
| * | | Remove unused enums | Fabio Berger | 2017-12-18 | 3 | -39/+0 |
| | | | |||||
| * | | Update first two string enums to native type | Fabio Berger | 2017-12-18 | 13 | -58/+56 |
| | | | |||||
| | * | Add WETH | Fabio Berger | 2017-12-19 | 1 | -1/+1 |
| | | | |||||
| | * | remove extra space | Fabio Berger | 2017-12-19 | 1 | -1/+1 |
| | | | |||||
| | * | Remove binding on prop passed callbacks | Fabio Berger | 2017-12-19 | 2 | -4/+4 |
| | | | |||||
| | * | Add airtable tasks to TODO's | Fabio Berger | 2017-12-19 | 1 | -0/+3 |
| | | | |||||
| | * | Merge branch 'development' into createWethPage | Fabio Berger | 2017-12-19 | 15 | -36/+91 |
| | |\ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Add additional public changes introduced to changelog Update CHANGELOG Add a comment Introduce a variable for true Remove redundant template string Implement the address derivations Add hdnode dependency Move web3 import after subprovider imports in test web3_factory Fixed https://github.com/0xProject/wiki/issues/19 by disabling re-rendering of markdownCodeBlock renderer if props haven't updated Add convenience `rebuild` command Update website calls to deposit/withdraw Add entry to CHANGELOG | ||||
* | | | Merge pull request #268 from 0xProject/fix/codeSelectingInDocs | Fabio Berger | 2017-12-19 | 2 | -10/+20 |
|\ \ \ | | | | | | | | | Fix code selection bug in docs | ||||
| * | | | Fixed https://github.com/0xProject/wiki/issues/19 by disabling re-rendering ↵ | Fabio Berger | 2017-12-18 | 1 | -10/+19 |
| | | | | | | | | | | | | | | | | of markdownCodeBlock renderer if props haven't updated | ||||
| * | | | Add convenience `rebuild` command | Fabio Berger | 2017-12-18 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge pull request #267 from 0xProject/refactor/passInEtherTokenAddress | Fabio Berger | 2017-12-19 | 14 | -69/+57 |
|\ \ \ | | | | | | | | | Refactor EtherToken wrapper to accept address in method args | ||||
| * | | | Add additional public changes introduced to changelog | Fabio Berger | 2017-12-19 | 1 | -1/+3 |
| | | | | |||||
| * | | | Update website calls to deposit/withdraw | Fabio Berger | 2017-12-18 | 2 | -6/+6 |
| | | | | |||||
| * | | | Add entry to CHANGELOG | Fabio Berger | 2017-12-17 | 1 | -0/+4 |
| | | | | |||||
* | | | | Merge pull request #269 from 0xProject/fix/brokenCi | Brandon Millman | 2017-12-18 | 5 | -7/+13 |
|\ \ \ \ | | | | | | | | | | | Move web3 import after subprovider imports in test web3_factory | ||||
| * | | | | Move web3 import after subprovider imports in test web3_factory | Brandon Millman | 2017-12-18 | 5 | -7/+13 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #271 from 0xProject/fix/ledger-derivation | Leonid | 2017-12-18 | 7 | -19/+52 |
|\ \ \ \ | |/ / / |/| | | | Implement ledger optimization for address derivation | ||||
| * | | | Update CHANGELOG | Leonid Logvinov | 2017-12-18 | 1 | -1/+2 |
| | | | | |||||
| * | | | Add a comment | Leonid Logvinov | 2017-12-18 | 1 | -0/+2 |
| | | | | |||||
| * | | | Introduce a variable for true | Leonid Logvinov | 2017-12-18 | 1 | -1/+4 |
| | | | | |||||
| * | | | Remove redundant template string | Leonid Logvinov | 2017-12-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Implement the address derivations | Leonid Logvinov | 2017-12-18 | 4 | -17/+32 |
| | | | | |||||
| * | | | Add hdnode dependency | Leonid Logvinov | 2017-12-18 | 3 | -1/+13 |
| | | | | |||||
| | | * | Temporarily pretend as if new WETH contracts are already whitelisted by ↵ | Fabio Berger | 2017-12-18 | 2 | -6/+18 |
| | | | | | | | | | | | | | | | | tokenRegistry and put hacks behind the shouldDeprecateOldWethToken flag | ||||
| | | * | Add notice dialog to balances page about updating the WETH contract. We also ↵ | Fabio Berger | 2017-12-18 | 3 | -10/+79 |
| | | | | | | | | | | | | | | | | draw attention to the new dedicated section for unwrapping from outdated WETH tokens | ||||
| | | * | Fix linter errors | Fabio Berger | 2017-12-18 | 1 | -2/+4 |
| | | | | |||||
| | | * | Move weth.io url to constants | Fabio Berger | 2017-12-18 | 2 | -1/+2 |
| | | | | |||||
| | | * | Make it such that Wrapped Ether page works on networks without any outdated ↵ | Fabio Berger | 2017-12-18 | 1 | -11/+19 |
| | | | | | | | | | | | | | | | | WETH tokens | ||||
| | | * | Add `Max` convenience button in unwrap WETH dialog | Fabio Berger | 2017-12-18 | 1 | -1/+15 |
| | | | | |||||
| | | * | Link all EtherTokens to Etherscan and add address tooltip | Fabio Berger | 2017-12-18 | 1 | -20/+53 |
| | | | | |||||
| | | * | Update to passing etherTokenAddress into withdraw and deposit calls | Fabio Berger | 2017-12-18 | 2 | -6/+6 |
| | | | | |||||
| | | * | Since sending the error report could take some time, we first trigger ↵ | Fabio Berger | 2017-12-17 | 1 | -1/+1 |
| | |/ | | | | | | | | | | `onError` so that the user gets notified immediately | ||||
| | * | Fix tests in contracts | Fabio Berger | 2017-12-17 | 2 | -13/+11 |
| | | | |||||
| | * | Modify the etherToken wrapper methods to accept an etherTokenAddress as the ↵ | Fabio Berger | 2017-12-17 | 6 | -46/+21 |
| | | | | | | | | | | | | first arg. Since it is becoming apparent we will be updating the canonical WETH contract, we want users of 0x.js to be able to interact with n number of etherTokens without re-instantiating for each one. | ||||
| | * | Fix documentation issue where `unsubscribeAll` shown as method on every ↵ | Fabio Berger | 2017-12-17 | 3 | -4/+13 |
| |/ |/| | | | | | contractWrapper instance even though it's only used by Exchange and Token wrappers. | ||||
* | | Temporary hack to alleviate issues with updating tokenRegistry with new WETH ↵ | Fabio Berger | 2017-12-16 | 1 | -1/+14 |
| | | | | | | | | address | ||||
* | | Two mysteriously missing imports | Fabio Berger | 2017-12-16 | 2 | -0/+2 |
| | | |||||
* | | Merge pull request #264 from 0xProject/createWethPage | Fabio Berger | 2017-12-16 | 14 | -93/+539 |
|\ \ | |/ |/| | Create WETH Page | ||||
| * | Fix linter errors | Fabio Berger | 2017-12-16 | 3 | -13/+0 |
| | | |||||
| * | Merge branch 'development' into createWethPage | Fabio Berger | 2017-12-16 | 217 | -3087/+2758 |
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (54 commits) Fix redundant spaces Fix tests Fix website unused vars Fix connect unused vars Fix 0x.js unused vars Dissallow unused vars/imports Implement first custom linter rule async-suffix Reuse intervalutils in website Add a newline Name a variable Add a comment Fix a conditional Make migrations deterministic Fix linter error Fix linter errors Add a function to init token balances Rename tokenUtils.getNonProtocolTokens to tokenUtils.getDummyTokens Add DummyToken to gitignore Add DummyToken to artifacts list Increase mocha timeout ... | ||||
* | | Merge pull request #266 from 0xProject/fix/no-unused-vars | Leonid | 2017-12-16 | 111 | -432/+109 |
|\ \ | | | | | | | Remove all unused vars and imports | ||||
| * | | Fix redundant spaces | Leonid Logvinov | 2017-12-16 | 9 | -28/+58 |
| | | | |||||
| * | | Fix tests | Leonid Logvinov | 2017-12-15 | 1 | -0/+1 |
| | | | |||||
| * | | Fix website unused vars | Leonid Logvinov | 2017-12-15 | 56 | -256/+28 |
| | | | |||||
| * | | Fix connect unused vars | Leonid Logvinov | 2017-12-15 | 24 | -54/+8 |
| | | | |||||
| * | | Fix 0x.js unused vars | Leonid Logvinov | 2017-12-15 | 25 | -94/+13 |
| | | | |||||
| * | | Dissallow unused vars/imports | Leonid Logvinov | 2017-12-15 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #265 from 0xProject/feature/custom-linter-rule | Leonid | 2017-12-15 | 8 | -4/+61 |
|\ \ | | | | | | | Implement first custom linter rule async-suffix | ||||
| * | | Implement first custom linter rule async-suffix | Leonid Logvinov | 2017-12-15 | 8 | -4/+61 |
|/ / | |||||
* | | Merge pull request #258 from 0xProject/feature/contracts-refactor | Leonid | 2017-12-15 | 66 | -2397/+272 |
|\ \ | | | | | | | A bunch of refactorings | ||||
| * | | Reuse intervalutils in website | Leonid Logvinov | 2017-12-15 | 2 | -6/+6 |
| | | | |||||
| * | | Add a newline | Leonid Logvinov | 2017-12-15 | 1 | -1/+2 |
| | | | |||||
| * | | Name a variable | Leonid Logvinov | 2017-12-15 | 1 | -1/+2 |
| | | | |||||
| * | | Add a comment | Leonid Logvinov | 2017-12-15 | 1 | -0/+2 |
| | | | |||||
| * | | Fix a conditional | Leonid Logvinov | 2017-12-15 | 1 | -5/+1 |
| | | | |||||
| * | | Make migrations deterministic | Leonid Logvinov | 2017-12-14 | 1 | -57/+45 |
| | | | |||||
| * | | Fix linter error | Leonid Logvinov | 2017-12-14 | 1 | -1/+1 |
| | | | |||||
| * | | Fix linter errors | Leonid Logvinov | 2017-12-14 | 3 | -3/+3 |
| | | | |||||
| * | | Add a function to init token balances | Leonid Logvinov | 2017-12-14 | 2 | -4/+30 |
| | | | |||||
| * | | Rename tokenUtils.getNonProtocolTokens to tokenUtils.getDummyTokens | Leonid Logvinov | 2017-12-14 | 4 | -11/+14 |
| | | | |||||
| * | | Add DummyToken to gitignore | Leonid Logvinov | 2017-12-14 | 1 | -0/+1 |
| | | | |||||
| * | | Add DummyToken to artifacts list | Leonid Logvinov | 2017-12-14 | 1 | -0/+2 |
| | | | |||||
| * | | Increase mocha timeout | Leonid Logvinov | 2017-12-14 | 1 | -1/+1 |
| | | | |||||
| * | | Add DummyToken to artifacts list | Leonid Logvinov | 2017-12-14 | 1 | -1/+1 |
| | | | |||||
| * | | Update addresses and add DummyToken artifact | Leonid Logvinov | 2017-12-14 | 5 | -4/+27 |
| | | | |||||
| * | | Change circle commit hash to the newest one from the monorepo | Leonid Logvinov | 2017-12-14 | 1 | -1/+1 |
| | | | |||||
| * | | Fix CI build | Leonid Logvinov | 2017-12-14 | 1 | -1/+1 |
| | | | |||||
| * | | Delete abi-gen-templates | Leonid Logvinov | 2017-12-14 | 1 | -15/+0 |
| | | | |||||
| * | | Move shared types to types package | Leonid Logvinov | 2017-12-14 | 3 | -29/+7 |
| | | | |||||
| * | | Move more shared utils into utils package and reuse them | Leonid Logvinov | 2017-12-14 | 29 | -171/+41 |
| | | | |||||
| * | | Create dev-utils with blockchainLifecycle in it | Leonid Logvinov | 2017-12-14 | 7 | -0/+158 |
| | | | |||||
| * | | Move 0x.js temnplates to 0x.js instead of having them as a separate package | Leonid Logvinov | 2017-12-14 | 8 | -8/+6 |
| | | | |||||
| * | | Remove generated contracts and ignore them. Add a prebuild command to ↵ | Leonid Logvinov | 2017-12-14 | 7 | -2165/+8 |
|/ / | | | | | | | regenerate them | ||||
* | | Reorganize packages section of readme | Brandon Millman | 2017-12-14 | 1 | -16/+21 |
| | | |||||
* | | Merge pull request #229 from 0xProject/feature/addKovanFaucets | Brandon Millman | 2017-12-14 | 21 | -75/+1402 |
|\ \ | | | | | | | Add kovan faucet project into the mono repo | ||||
| * | | Fix hanging requests by importing web3 last | Brandon Millman | 2017-12-14 | 3 | -2/+17 |
| | | | |||||
| * | | Add kovan faucet to main README | Brandon Millman | 2017-12-14 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'development' into feature/addKovanFaucets | Brandon Millman | 2017-12-14 | 3 | -5/+10 |
| |\ \ | |/ / |/| | | | | | | | | | | | * development: Add new packages to main README Remove redundant totalSupply from token interface | ||||
* | | | Add new packages to main README | Leonid Logvinov | 2017-12-13 | 2 | -2/+10 |
| | | | |||||
* | | | Remove redundant totalSupply from token interface | Amir Bandeali | 2017-12-13 | 1 | -3/+0 |
| | | | |||||
| * | | Cleanup kovan-faucet package | Brandon Millman | 2017-12-14 | 12 | -48/+37 |
| | | | |||||
| * | | Fix build errors | Brandon Millman | 2017-12-13 | 19 | -142/+540 |
| | | | |||||
| * | | Add kovan faucet project into the mono repo | Brandon Millman | 2017-12-13 | 23 | -24/+948 |
|/ / | |||||
* | | Merge pull request #255 from 0xProject/feature/updateWeth | Amir Bandeali | 2017-12-13 | 44 | -185/+909 |
|\ \ | | | | | | | Update WETH | ||||
| * | | Increase timeout on deployer tests | Amir Bandeali | 2017-12-13 | 1 | -1/+1 |
| | | | |||||
| * | | Add version string to EtherToken_v2 | Amir Bandeali | 2017-12-13 | 1 | -0/+1 |
| | | | |||||
| * | | Formatting fixes | Amir Bandeali | 2017-12-13 | 6 | -18/+29 |
| | | | |||||
| * | | Add missing package in utils, fix linting error | Amir Bandeali | 2017-12-13 | 1 | -0/+1 |
| | | | |||||
| * | | fix tests after merging with development | Amir Bandeali | 2017-12-13 | 1 | -3/+3 |
| | | | |||||
| * | | Add test:circleci command, add newlines to end of contracts | Amir Bandeali | 2017-12-13 | 25 | -2/+25 |
| | | | |||||
| * | | Add gas limits to failing tests | Amir Bandeali | 2017-12-13 | 6 | -14/+31 |
| | | | |||||
| * | | Rename contracts lib to utils | Amir Bandeali | 2017-12-13 | 13 | -9/+214 |
| | | | |||||
| * | | Refactor unlimited allowance logic out of ERC20Token | Amir Bandeali | 2017-12-13 | 8 | -20/+56 |
| | | | |||||
| * | | Fix typo, change variable name to be consistent | Amir Bandeali | 2017-12-13 | 2 | -6/+6 |
| | | | |||||
| * | | Update 0x.js version, fix build errors | Amir Bandeali | 2017-12-13 | 9 | -60/+41 |
| | | | |||||
| * | | Add updated contracts, reorganize contract file structure | Amir Bandeali | 2017-12-13 | 25 | -120/+170 |
| | | | |||||
| * | | Add tests for ERC20Token and EtherToken_v2 | Amir Bandeali | 2017-12-13 | 8 | -14/+183 |
| | | | |||||
| * | | Fix errors with new testrpc version | Amir Bandeali | 2017-12-13 | 8 | -44/+45 |
| | | | |||||
| * | | Add version to new EtherToken, fix typos | Amir Bandeali | 2017-12-13 | 5 | -5/+126 |
| | | | |||||
| * | | Add updated ERC20 implementation, update WETH | Amir Bandeali | 2017-12-13 | 3 | -2/+110 |
|/ / | |||||
| * | Update name to be a call to action | Fabio Berger | 2017-12-16 | 1 | -1/+1 |
| | | |||||
| * | Add default value for onConversionSuccessful | Fabio Berger | 2017-12-16 | 1 | -3/+2 |
| | | |||||
| * | Improve WETH page styling | Fabio Berger | 2017-12-15 | 2 | -12/+35 |
| | | |||||
| * | Use new wrap/unwrap buttons, fetch outdated WETH balances and re-fetch after ↵ | Fabio Berger | 2017-12-15 | 3 | -72/+208 |
| | | | | | | | | a successful unwrap. | ||||
| * | Refactor the WETH conversion dialog/button to be either wrap or unwrap ↵ | Fabio Berger | 2017-12-15 | 2 | -59/+109 |
| | | | | | | | | specific and not both | ||||
| * | Clear trackedTokens so that a user starts tracking the new WETH and no ↵ | Fabio Berger | 2017-12-14 | 3 | -0/+14 |
| | | | | | | | | longer the old one | ||||
| * | Make label optional and make sure the input field still renders properly ↵ | Fabio Berger | 2017-12-14 | 1 | -3/+4 |
| | | | | | | | | without it | ||||
| * | Remove ETH-WETH convert button from balances page | Fabio Berger | 2017-12-14 | 2 | -25/+0 |
| | | |||||
| * | Remove temporary hack | Fabio Berger | 2017-12-14 | 1 | -2/+0 |
| | | |||||
| * | Use boxed ETH | Fabio Berger | 2017-12-14 | 1 | -0/+0 |
| | | |||||
| * | Merge branch 'development' into createWethPage | Fabio Berger | 2017-12-13 | 2 | -31/+57 |
| |\ | |/ |/| | | | | | | | | | * development: update yarn.lock Fix typedoc_utils to take into account subPackageName when rendering call path Add WebSocketOrderbookChannel to connect docs | ||||
* | | update yarn.lock | Fabio Berger | 2017-12-13 | 1 | -1/+21 |
| | | |||||
* | | Merge pull request #263 from 0xProject/fix/docsCallPath | Brandon Millman | 2017-12-13 | 1 | -30/+44 |
|\ \ | | | | | | | Fix typedoc_utils to take into account subPackageName when rendering … | ||||
| * | | Fix typedoc_utils to take into account subPackageName when rendering call path | Brandon Millman | 2017-12-13 | 1 | -30/+44 |
|/ / | |||||
* | | Merge pull request #261 from 0xProject/feature/addWebSocketDocs | Brandon Millman | 2017-12-13 | 1 | -1/+13 |
|\ \ | | | | | | | Add WebSocketOrderbookChannel to connect docs | ||||
| * | | Add WebSocketOrderbookChannel to connect docs | Brandon Millman | 2017-12-12 | 1 | -1/+13 |
| | | | |||||
| | * | progress weth page | Fabio Berger | 2017-12-13 | 10 | -3/+285 |
| |/ |/| | |||||
* | | Merge branch 'development' of github.com:0xProject/0x.js into development | Fabio Berger | 2017-12-13 | 31 | -138/+154 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'development' of github.com:0xProject/0x.js: Re-hard code the dependency Add missing dependency Add missing dependency Fix a dependency Fix an invocation Move dependency Merge dependencies Don't unsubscribe on error. It's done automatically Rename blockAndLogStreamer to blockAndLogStreamerIfExists Move isAddress to shared utils and remove all dependencies on ethereum-address Remove ethereum-address dependency and add this logic to the repo | ||||
| * | Merge pull request #257 from 0xProject/fix/ethereum-address | Leonid | 2017-12-12 | 13 | -24/+58 |
| |\ | | | | | | | Remove ethereum-address dependency and add this logic to the repo | ||||
| | * | Add missing dependency | Leonid Logvinov | 2017-12-12 | 1 | -0/+1 |
| | | | |||||
| | * | Fix a dependency | Leonid Logvinov | 2017-12-12 | 1 | -1/+1 |
| | | | |||||
| | * | Fix an invocation | Leonid Logvinov | 2017-12-12 | 1 | -1/+1 |
| | | | |||||
| | * | Move dependency | Leonid Logvinov | 2017-12-12 | 2 | -1/+1 |
| | | | |||||
| | * | Merge dependencies | Leonid Logvinov | 2017-12-12 | 1 | -3/+1 |
| | | | |||||
| | * | Move isAddress to shared utils and remove all dependencies on ethereum-address | Leonid Logvinov | 2017-12-11 | 12 | -26/+19 |
| | | | |||||
| | * | Remove ethereum-address dependency and add this logic to the repo | Leonid Logvinov | 2017-12-11 | 4 | -5/+48 |
| | | | |||||
| * | | Merge pull request #262 from 0xProject/fix/portal-bug | Leonid | 2017-12-12 | 21 | -114/+96 |
| |\ \ | | | | | | | | | Fix portal subscriptions bug | ||||
| | * | | Re-hard code the dependency | Leonid Logvinov | 2017-12-12 | 17 | -73/+73 |
| | | | | |||||
| | * | | Add missing dependency | Leonid Logvinov | 2017-12-12 | 1 | -0/+1 |
| | | | | |||||
| | * | | Don't unsubscribe on error. It's done automatically | Leonid Logvinov | 2017-12-12 | 3 | -28/+5 |
| | | | | |||||
| | * | | Rename blockAndLogStreamer to blockAndLogStreamerIfExists | Leonid Logvinov | 2017-12-12 | 1 | -14/+18 |
| | |/ | |||||
* | / | Resize token icons | Fabio Berger | 2017-12-13 | 6 | -0/+0 |
|/ / | |||||
* | | Merge pull request #259 from 0xProject/fix/addChangelogAndPostpublishScripts | Brandon Millman | 2017-12-12 | 12 | -6/+97 |
|\ \ | |/ |/| | Fix broken postpublish_utils, add CHANGELOG and postpublish.js script… | ||||
| * | Fix broken postpublish_utils, add CHANGELOG and postpublish.js scripts to ↵ | Brandon Millman | 2017-12-09 | 12 | -6/+97 |
|/ | | | | all packages | ||||
* | Publishwebsite@0.0.2contracts@2.0.0abi-gen-templates@0.0.2@0xproject/web3-wrapper@0.1.0@0xproject/utils@0.1.0@0xproject/types@0.1.0@0xproject/tslint-config@0.2.1@0xproject/subproviders@0.1.0@0xproject/monorepo-scripts@0.1.0@0xproject/json-schemas@0.6.10@0xproject/connect@0.3.0@0xproject/assert@0.0.7@0xproject/abi-gen@0.0.20x.js@0.27.2 | Brandon Millman | 2017-12-09 | 14 | -44/+44 |
| | | | | | | | | | | | | | | | | | - 0x.js@0.27.2 - abi-gen-templates@0.0.2 - @0xproject/abi-gen@0.0.2 - @0xproject/assert@0.0.7 - @0xproject/connect@0.3.0 - contracts@2.0.0 - @0xproject/json-schemas@0.6.10 - @0xproject/monorepo-scripts@0.1.0 - @0xproject/subproviders@0.1.0 - @0xproject/tslint-config@0.2.1 - @0xproject/types@0.1.0 - @0xproject/utils@0.1.0 - @0xproject/web3-wrapper@0.1.0 - website@0.0.2 | ||||
* | Add scope to abi-gen dependency in 0x.js | Brandon Millman | 2017-12-09 | 1 | -1/+1 |
| | |||||
* | Add @0xproject scope to abi-gen package name | Brandon Millman | 2017-12-09 | 1 | -1/+1 |
| | |||||
* | Add yarn install to lerna:publish command | Brandon Millman | 2017-12-09 | 2 | -6/+2 |
| | |||||
* | Make contracts package private | Brandon Millman | 2017-12-09 | 1 | -0/+1 |
| | |||||
* | Update connect changelog | Brandon Millman | 2017-12-09 | 1 | -1/+1 |
| | |||||
* | Merge pull request #252 from 0xProject/feature/addSubproviders | Fabio Berger | 2017-12-09 | 25 | -233/+1270 |
|\ | | | | | Add Subproviders Subpackage | ||||
| * | Merge branch 'development' into feature/addSubproviders | Fabio Berger | 2017-12-09 | 75 | -331/+404 |
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Update README.md Inline network module Stop supporting different file extensions in abi-gen Refactor networkId out of web3Wrapper Update connect types in preperation for publishing Fix CI command Address feedback Refactor web3Wrapper to a separate package # Conflicts: # package.json # packages/website/ts/blockchain.ts | ||||
* | | Update README.md | Fabio Berger | 2017-12-09 | 1 | -3/+3 |
| | |