| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge branch 'development' into createWethPage | Fabio Berger | 2017-12-20 | 7 | -193/+255 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | |||||
| | * | Move muiTheme into it's own module | Fabio Berger | 2017-12-19 | 1 | -0/+35 | |
| | | | ||||||
| | * | Refactor configs and constants, standardize on uppercase/snakecase, ↵ | Fabio Berger | 2017-12-19 | 4 | -178/+164 | |
| | | | | | | | | | alphebetize, rename for logical grouping | |||||
| | * | Sort colors into color spectrum | Fabio Berger | 2017-12-18 | 1 | -8/+22 | |
| | | | ||||||
| | * | standarize on `grey` over `gray` spelling and other color related fixes | Fabio Berger | 2017-12-18 | 1 | -9/+10 | |
| | | | ||||||
| | * | Standardize colors to always be in uppercase hex and consolidate material-ui ↵ | Fabio Berger | 2017-12-18 | 1 | -15/+13 | |
| | | | | | | | | | greys | |||||
| | * | Consolidate all custom colors and material-ui colors into a colors module | Fabio Berger | 2017-12-18 | 2 | -1/+30 | |
| | | | ||||||
| | * | Replace remaining strEnums with property TS string enums | Fabio Berger | 2017-12-18 | 2 | -5/+5 | |
| | | | ||||||
| | * | Update first two string enums to native type | Fabio Berger | 2017-12-18 | 1 | -4/+4 | |
| | | | ||||||
| * | | Temporarily pretend as if new WETH contracts are already whitelisted by ↵ | Fabio Berger | 2017-12-18 | 1 | -0/+7 | |
| | | | | | | | | | 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 | 1 | -0/+1 | |
| | | | | | | | | | draw attention to the new dedicated section for unwrapping from outdated WETH tokens | |||||
| * | | Move weth.io url to constants | Fabio Berger | 2017-12-18 | 1 | -0/+1 | |
| |/ | ||||||
| * | Fix linter errors | Fabio Berger | 2017-12-16 | 1 | -1/+0 | |
| | | ||||||
| * | Merge branch 'development' into createWethPage | Fabio Berger | 2017-12-16 | 4 | -10/+2 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 website unused vars | Leonid Logvinov | 2017-12-15 | 4 | -10/+2 | |
| | | | ||||||
| * | | Use new wrap/unwrap buttons, fetch outdated WETH balances and re-fetch after ↵ | Fabio Berger | 2017-12-15 | 1 | -6/+17 | |
| | | | | | | | | | a successful unwrap. | |||||
| * | | Clear trackedTokens so that a user starts tracking the new WETH and no ↵ | Fabio Berger | 2017-12-14 | 1 | -0/+1 | |
| | | | | | | | | | longer the old one | |||||
| * | | Merge branch 'development' into createWethPage | Fabio Berger | 2017-12-13 | 1 | -30/+44 | |
| |\| | | | | | | | | | | | | | * development: update yarn.lock Fix typedoc_utils to take into account subPackageName when rendering call path Add WebSocketOrderbookChannel to connect docs | |||||
| | * | Fix typedoc_utils to take into account subPackageName when rendering call path | Brandon Millman | 2017-12-13 | 1 | -30/+44 | |
| | | | ||||||
| * | | progress weth page | Fabio Berger | 2017-12-13 | 1 | -1/+12 | |
| |/ | ||||||
| * | Add orderWatcher to 0x.js docs | Fabio Berger | 2017-11-30 | 1 | -1/+1 | |
| | | ||||||
| * | Refactor the topLevel documentation react components for 0x.js and Smart ↵ | Fabio Berger | 2017-11-29 | 2 | -27/+1 | |
| | | | | | contracts into a single component | |||||
| * | Refactor docs to be more declarative, put all hard-coded doc-related data in ↵ | Fabio Berger | 2017-11-29 | 2 | -180/+77 | |
| | | | | | one place so it easier to add new doc pages | |||||
| * | Fix tslint issues | Fabio Berger | 2017-11-28 | 6 | -52/+100 | |
| | | ||||||
| * | Add "Web3" prefix to web3 alias types and link to the correct line in the ↵ | Fabio Berger | 2017-11-28 | 1 | -1/+4 | |
| | | | | | web3 typings | |||||
| * | Force the clearance of tradeHistory | Fabio Berger | 2017-11-23 | 1 | -1/+1 | |
| | | ||||||
| * | Add website to mono repo, update packages to align with existing ↵ | Fabio Berger | 2017-11-22 | 7 | -0/+1128 | |
| sub-packages, use new subscribeAsync 0x.js method | ||||||
 |
index : dexon-0x-contracts | |
| DEXON fork of 0x protocol contracts forked from 0x-monorepo (https://github.com/dexon-foundation/0x-contracts) |
| aboutsummaryrefslogtreecommitdiffstats |