Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Implement allowance and final flow step | fragosti | 2018-06-13 | 1 | -1/+1 |
| | |||||
* | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-13 | 1 | -3/+3 |
|\ | | | | | | | feature/website/onboarding-flow-allowances | ||||
| * | Fix no-unused-variable tslint rule to include parameters and fix issues | Fabio Berger | 2018-06-12 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils | Fabio Berger | 2018-06-07 | 1 | -18/+19 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (66 commits) Run prettier Remove unused variable Fix linting issues Change shouldRenderHeader prop to shouldHideHeader Get build and tests to pass typo Apply prettier Update contracts tests after rebase Apply various fixes based on PR feedback Document debug_increaseTime method and fix typo in devnet README Use an enum for ProviderType in contracts/src/utils/web3_wrapper Update contracts package README Update relevant changelogs Remove global gas estimate buffer Add Async suffix to relevant assertions Fix linter errors Update package.json and yarn.lock Update more things to work with both Geth and Ganache Small fixes and cleanup Add additional gas to calls to fillOrderNoThrow ... # Conflicts: # packages/order-watcher/src/order_watcher/order_watcher.ts # packages/react-docs/src/components/type.tsx # packages/website/ts/components/ui/lifecycle_raised_button.tsx # packages/website/ts/components/wallet/wallet.tsx | ||||
| * | | Move spawnSwitchErr to @0xproject/utils | Fabio Berger | 2018-06-06 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 1 | -18/+19 |
|\ \ \ | | |/ | |/| | | | | feature/website/onboarding-flow-allowances | ||||
| * | | 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 | 1 | -15/+19 |
| |\ \ | | | | | | | | | | | | | feature/improve-linting | ||||
| | * | | 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 | 1 | -1/+4 |
| | |/ | |||||
| * | | merge v2-prototype | Fabio Berger | 2018-06-06 | 1 | -1/+1 |
| |\| | |||||
| * | | Try enabling no-unused-variable... | fragosti | 2018-06-05 | 1 | -2/+0 |
| | | | |||||
* | | | Wrap AllowanceToggle in redux container | fragosti | 2018-06-07 | 1 | -4/+1 |
| |/ |/| | |||||
* | | Merge branch 'feature/website/landing-subscribe-button' into ↵ | fragosti | 2018-06-02 | 1 | -1/+1 |
|\ \ | |/ |/| | | | feature/website/landing-subscribe-button-2 | ||||
| * | Have basic newsletter subscribe form working | fragosti | 2018-06-02 | 1 | -1/+1 |
| | | |||||
* | | Change userEtherBalanceInWei to optional so we can know if its loading | Brandon Millman | 2018-06-01 | 1 | -0/+3 |
|/ | |||||
* | Remove 0x.js as a dependency from website | Leonid Logvinov | 2018-05-24 | 1 | -5/+5 |
| | |||||
* | Add missing type definitions | Leonid Logvinov | 2018-05-14 | 1 | -20/+20 |
| | |||||
* | Remove Dharma integration from Website | Fabio Berger | 2018-04-03 | 1 | -69/+0 |
| | |||||
* | Refactor TokenState type | Brandon Millman | 2018-03-22 | 1 | -8/+1 |
| | |||||
* | Consolidate all console.log into the @0xproject/utils package | Brandon Millman | 2018-03-14 | 1 | -4/+4 |
| | |||||
* | Fix getTokenBalanceAndAllowanceAsync to take ownerAddressIfExists so that we ↵ | Fabio Berger | 2018-03-11 | 1 | -2/+4 |
| | | | | don't sometimes pass an empty string and sometimes undefined | ||||
* | Replace local PRECISION constants with global config.AMOUNT_DISPLAY_PRECISION | Fabio Berger | 2018-03-11 | 1 | -3/+2 |
| | |||||
* | Create blockchainWatcher class and refactor Portal such that Ether amounts ↵ | Fabio Berger | 2018-03-10 | 1 | -5/+12 |
| | | | | are always passed around as baseUnits | ||||
* | Move Documentation to the `@0xproject/react-docs` package | Fabio Berger | 2018-03-06 | 1 | -8/+16 |
| | |||||
* | Moved over all pages/shared components and dependencies to react-shared | Fabio Berger | 2018-03-05 | 1 | -2/+1 |
| | |||||
* | Bug fixes | Fabio Berger | 2018-03-05 | 1 | -1/+1 |
| | |||||
* | Move over AnchorTitle and associated elements | Fabio Berger | 2018-03-04 | 1 | -1/+1 |
| | |||||
* | Fix flash message when receiving test ether | Fabio Berger | 2018-02-08 | 1 | -1/+2 |
| | |||||
* | Only show faucet error if not on a testnet | Fabio Berger | 2018-02-07 | 1 | -4/+3 |
| | |||||
* | Move isTestNetwork into utils and also check it from showing ZRX request button | Fabio Berger | 2018-02-07 | 1 | -9/+2 |
| | |||||
* | Remove stray log | Fabio Berger | 2018-02-07 | 1 | -1/+0 |
| | |||||
* | Use isTestNetwork instead of isKovanTestNetwork on balances page except for ↵ | Fabio Berger | 2018-02-07 | 1 | -7/+15 |
| | | | | Dharma integration | ||||
* | Properly detect Rinkeby and Ropsten TokenRegistry tokens as mintable | Fabio Berger | 2018-02-07 | 1 | -2/+8 |
| | |||||
* | Add networkId to faucet requests so that we can request tokens on Kovan, ↵ | Fabio Berger | 2018-02-07 | 1 | -1/+3 |
| | | | | Rinkeby and Ropsten | ||||
* | Add networkId to event label | Fabio Berger | 2018-02-07 | 1 | -0/+1 |
| | |||||
* | Uppercase Networks enum values | Fabio Berger | 2018-01-31 | 1 | -2/+2 |
| | |||||
* | Fix linter errors | Fabio Berger | 2018-01-31 | 1 | -2/+2 |
| | |||||
* | Fix all setState calls after unmounted errors. Decided to create our own ↵ | Fabio Berger | 2018-01-31 | 1 | -3/+10 |
| | | | | flag rather then using a cancellablePromise since there was little to be gained from this alternative | ||||
* | Fix bug related to balance/allowance fetching being async | Fabio Berger | 2018-01-29 | 1 | -0/+14 |
| | |||||
* | Add missing entries for Ropsten and Rinkeby testnets, added Ropsten to ↵ | Fabio Berger | 2018-01-29 | 1 | -16/+17 |
| | | | | Ledger network dropdown | ||||
* | Implement just-in-time loading of token balances & allowances | Fabio Berger | 2018-01-28 | 1 | -31/+115 |
| | |||||
* | Properly detect user signing cancellation on Metamask, Parity signer and Ledger | Fabio Berger | 2018-01-28 | 1 | -1/+1 |
| | |||||
* | Merge pull request #325 from 0xProject/fix/portal-bugs | Leonid | 2018-01-18 | 1 | -1/+1 |
|\ | | | | | Small Fixes/Additions | ||||
| * | Fix balance page copy to refer to the Wrap ETH tab instead of a "convert" button | Fabio Berger | 2018-01-18 | 1 | -1/+1 |
| | | |||||
* | | Enable restrict-plus-operands and fix issues detected | Leonid Logvinov | 2018-01-17 | 1 | -1/+1 |
|/ | |||||
* | Use configured version of bignumber in all packages | Leonid Logvinov | 2018-01-04 | 1 | -1/+1 |
| | |||||
* | Apply prettier config | Leonid Logvinov | 2018-01-03 | 1 | -189/+124 |
| | |||||
* | Merge branch 'development' into fix/underscorePrivate | Brandon Millman | 2017-12-21 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ... | ||||
| * | Move call to error reporter to end of handler so that even if reporting the ↵ | Fabio Berger | 2017-12-21 | 1 | -2/+2 |
| | | | | | | | | error takes a while, it doesn't block the UI | ||||
* | | Add new underscore-privates rule to @0xproject/tslint-config and fix lint errors | Brandon Millman | 2017-12-20 | 1 | -34/+34 |
|/ | |||||
* | Refactor remaining _.assign to spread operator | Fabio Berger | 2017-12-19 | 1 | -2/+3 |
| | |||||
* | Refactor configs and constants, standardize on uppercase/snakecase, ↵ | Fabio Berger | 2017-12-19 | 1 | -9/+9 |
| | | | | alphebetize, rename for logical grouping | ||||
* | standarize on `grey` over `gray` spelling and other color related fixes | Fabio Berger | 2017-12-18 | 1 | -2/+2 |
| | |||||
* | Consolidate all custom colors and material-ui colors into a colors module | Fabio Berger | 2017-12-18 | 1 | -4/+4 |
| | |||||
* | 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 | 1 | -6/+6 |
| | |||||
* | Update first two string enums to native type | Fabio Berger | 2017-12-18 | 1 | -1/+1 |
| | |||||
* | Fix linter errors | Fabio Berger | 2017-12-16 | 1 | -5/+0 |
| | |||||
* | Merge branch 'development' into createWethPage | Fabio Berger | 2017-12-16 | 1 | -2/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ... | ||||
| * | Fix redundant spaces | Leonid Logvinov | 2017-12-16 | 1 | -1/+1 |
| | | |||||
| * | Fix website unused vars | Leonid Logvinov | 2017-12-15 | 1 | -1/+0 |
| | | |||||
* | | Remove ETH-WETH convert button from balances page | Fabio Berger | 2017-12-14 | 1 | -24/+0 |
|/ | |||||
* | fix remaining tslint errors | Fabio Berger | 2017-11-28 | 1 | -26/+27 |
| | |||||
* | Add missing keys | Fabio Berger | 2017-11-24 | 1 | -0/+2 |
| | |||||
* | Add website to mono repo, update packages to align with existing ↵ | Fabio Berger | 2017-11-22 | 1 | -0/+697 |
sub-packages, use new subscribeAsync 0x.js method |