diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-09-26 20:14:23 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-09-26 20:14:23 +0800 |
| commit | b244f3e2c0d3c105c364ffe9c5cc5c8046b0ec32 (patch) | |
| tree | ae0c499866ecb9c9cd1ac05b337220891d2ab9fe /packages/website/ts | |
| parent | 1b35a6e3b5d050fa33097b35e1d739ca13c6806e (diff) | |
| parent | d77c6e13b0a6791fd2b5a5b134f61c3610beff5d (diff) | |
| download | dexon-0x-contracts-b244f3e2c0d3c105c364ffe9c5cc5c8046b0ec32.tar.gz dexon-0x-contracts-b244f3e2c0d3c105c364ffe9c5cc5c8046b0ec32.tar.zst dexon-0x-contracts-b244f3e2c0d3c105c364ffe9c5cc5c8046b0ec32.zip | |
Merge branch 'development' of github.com:0xProject/0x-monorepo into development
* 'development' of github.com:0xProject/0x-monorepo:
Add weijie and rahul
Change news link
Diffstat (limited to 'packages/website/ts')
| -rw-r--r-- | packages/website/ts/pages/about/about.tsx | 18 | ||||
| -rw-r--r-- | packages/website/ts/pages/landing/landing.tsx | 4 |
2 files changed, 20 insertions, 2 deletions
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx index 42237bec3..75295349d 100644 --- a/packages/website/ts/pages/about/about.tsx +++ b/packages/website/ts/pages/about/about.tsx @@ -216,6 +216,23 @@ const teamRow7: ProfileInfo[] = [ }, ]; +const teamRow8: ProfileInfo[] = [ + { + name: 'Weijie Wu', + title: 'Research Fellow', + description: `Researching decentralized governance. Previously Researcher at Huawei and Assistant Professor at Shanghai Jiao Tong University. PhD in Computer Science at The Chinese University of Hong Kong.`, + image: 'images/team/weijie.png', + linkedIn: 'https://www.linkedin.com/in/weijiewu/', + }, + { + name: 'Rahul Singireddy', + title: 'Relayer Success Manager', + description: `Previously community at Zeppelin, growth at Dharma, and cryptocurrency contributor at Forbes. Symbolic Systems at Stanford.`, + image: 'images/team/rahul.png', + linkedIn: 'https://www.linkedin.com/in/rahul-singireddy-3037908a/', + }, +]; + const advisors1: ProfileInfo[] = [ { name: 'Fred Ehrsam', @@ -323,6 +340,7 @@ export class About extends React.Component<AboutProps, AboutState> { <div className="clearfix">{this._renderProfiles(teamRow5)}</div> <div className="clearfix">{this._renderProfiles(teamRow6)}</div> <div className="clearfix">{this._renderProfiles(teamRow7)}</div> + <div className="clearfix">{this._renderProfiles(teamRow8)}</div> </div> <div className="pt3 pb2"> <div diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx index 211be7bf2..388e83d51 100644 --- a/packages/website/ts/pages/landing/landing.tsx +++ b/packages/website/ts/pages/landing/landing.tsx @@ -37,8 +37,8 @@ interface Project { } const THROTTLE_TIMEOUT = 100; -const WHATS_NEW_TITLE = '18 ideas for 0x relayers in 2018'; -const WHATS_NEW_URL = 'https://blog.0xproject.com/18-ideas-for-0x-relayers-in-2018-80a1498b955f'; +const WHATS_NEW_TITLE = '0x Protocol v2 is Live!'; +const WHATS_NEW_URL = 'https://blog.0xproject.com/0x-protocol-v2-0-is-live-183aac180149'; const TITLE_STYLE: React.CSSProperties = { fontFamily: 'Roboto Mono', color: colors.grey, |