diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-08-14 04:01:32 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-08-14 04:01:32 +0800 |
| commit | 9d3c287918389d07f884245bd1bc968955768b6f (patch) | |
| tree | 460fded537c7d64154972b7d14332f88554d14c0 /packages/website | |
| parent | c2b5fe3d844d35966c5498326000bd8317fb547c (diff) | |
| parent | 15e15f994a1b18cf2e9be151194c826d53a01601 (diff) | |
| download | dexon-sol-tools-9d3c287918389d07f884245bd1bc968955768b6f.tar dexon-sol-tools-9d3c287918389d07f884245bd1bc968955768b6f.tar.gz dexon-sol-tools-9d3c287918389d07f884245bd1bc968955768b6f.tar.bz2 dexon-sol-tools-9d3c287918389d07f884245bd1bc968955768b6f.tar.lz dexon-sol-tools-9d3c287918389d07f884245bd1bc968955768b6f.tar.xz dexon-sol-tools-9d3c287918389d07f884245bd1bc968955768b6f.tar.zst dexon-sol-tools-9d3c287918389d07f884245bd1bc968955768b6f.zip | |
Merge branch 'sol-cov-fixes' of github.com:0xProject/0x-monorepo into sol-cov-fixes
* 'sol-cov-fixes' of github.com:0xProject/0x-monorepo: (49 commits)
Add @return comments
Import marshaller directly
Update comment about ethers checksummed address behavior
Add packages/coverage/.gitkeep file
Update CI config and package.json to run @0xproject/utils tests on CI
Update remaining CHANGELOG.json files
Change amir picture
Update CHANGELOG.json for contract-wrappers
Update ethers typings for TypeScript 2.9.2
Update CHANGELOG.json for base-contract
Move some ethers-related types to typescript-typings/ethers
Apply prettier
Add strictArgumentEncodingCheck to BaseContract and use it in contract templates
fix(monorepo-scripts): Fix typo in git tag command
feat(monorepo-scripts): Add confirmation prompt before publishing
fix comments and styling for MixinSignatureValidator
Update TypeScript to version 2.9.2
Use asm for hashEIP712Message, increment free memory pointer after asm hashing functions
Fix comments, styling, and optimize hashOrder
Remove assertion comments
...
Diffstat (limited to 'packages/website')
| -rw-r--r-- | packages/website/package.json | 2 | ||||
| -rw-r--r-- | packages/website/public/images/team/amir.jpeg | bin | 21098 -> 0 bytes | |||
| -rw-r--r-- | packages/website/public/images/team/amir.png | bin | 0 -> 116488 bytes | |||
| -rw-r--r-- | packages/website/ts/pages/about/about.tsx | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/packages/website/package.json b/packages/website/package.json index 13f1f5372..4a19fed6d 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -98,7 +98,7 @@ "style-loader": "0.13.x", "tslint": "5.11.0", "tslint-config-0xproject": "^0.0.2", - "typescript": "2.7.1", + "typescript": "2.9.2", "uglifyjs-webpack-plugin": "^1.2.5", "webpack": "^3.1.0", "webpack-dev-middleware": "^1.10.0", diff --git a/packages/website/public/images/team/amir.jpeg b/packages/website/public/images/team/amir.jpeg Binary files differdeleted file mode 100644 index 7ee16263a..000000000 --- a/packages/website/public/images/team/amir.jpeg +++ /dev/null diff --git a/packages/website/public/images/team/amir.png b/packages/website/public/images/team/amir.png Binary files differnew file mode 100644 index 000000000..2bb795d50 --- /dev/null +++ b/packages/website/public/images/team/amir.png diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx index b9bc906bd..1574f65e0 100644 --- a/packages/website/ts/pages/about/about.tsx +++ b/packages/website/ts/pages/about/about.tsx @@ -27,7 +27,7 @@ const teamRow1: ProfileInfo[] = [ title: 'Co-founder & CTO', description: `Smart contract R&D. Previously fixed income trader at DRW. \ Finance at University of Illinois, Urbana-Champaign.`, - image: '/images/team/amir.jpeg', + image: '/images/team/amir.png', linkedIn: 'https://www.linkedin.com/in/abandeali1/', github: 'https://github.com/abandeali1', medium: 'https://medium.com/@abandeali1', |
