diff options
author | Fabio Berger <me@fabioberger.com> | 2018-09-26 20:18:20 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-09-26 20:18:20 +0800 |
commit | 4a94f8b1cac453b8a6d97cd5293fe0855a6602cf (patch) | |
tree | 38df7202ef0f41c84e608962dd1a75e8588befd5 | |
parent | f8532b3f51a5bb4f4294606c495321a82d71c69d (diff) | |
parent | b244f3e2c0d3c105c364ffe9c5cc5c8046b0ec32 (diff) | |
download | dexon-0x-contracts-4a94f8b1cac453b8a6d97cd5293fe0855a6602cf.tar dexon-0x-contracts-4a94f8b1cac453b8a6d97cd5293fe0855a6602cf.tar.gz dexon-0x-contracts-4a94f8b1cac453b8a6d97cd5293fe0855a6602cf.tar.bz2 dexon-0x-contracts-4a94f8b1cac453b8a6d97cd5293fe0855a6602cf.tar.lz dexon-0x-contracts-4a94f8b1cac453b8a6d97cd5293fe0855a6602cf.tar.xz dexon-0x-contracts-4a94f8b1cac453b8a6d97cd5293fe0855a6602cf.tar.zst dexon-0x-contracts-4a94f8b1cac453b8a6d97cd5293fe0855a6602cf.zip |
Merge branch 'development' into addFlagToPublishReleases
* development:
Add weijie and rahul
Change news link
-rw-r--r-- | packages/website/public/images/team/rahul.png | bin | 0 -> 29636 bytes | |||
-rw-r--r-- | packages/website/public/images/team/weijie.png | bin | 0 -> 38401 bytes | |||
-rw-r--r-- | packages/website/ts/pages/about/about.tsx | 18 | ||||
-rw-r--r-- | packages/website/ts/pages/landing/landing.tsx | 4 |
4 files changed, 20 insertions, 2 deletions
diff --git a/packages/website/public/images/team/rahul.png b/packages/website/public/images/team/rahul.png Binary files differnew file mode 100644 index 000000000..b63cc12b1 --- /dev/null +++ b/packages/website/public/images/team/rahul.png diff --git a/packages/website/public/images/team/weijie.png b/packages/website/public/images/team/weijie.png Binary files differnew file mode 100644 index 000000000..69fd51794 --- /dev/null +++ b/packages/website/public/images/team/weijie.png 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, |