aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2019-01-17 22:59:00 +0800
committerFabio Berger <me@fabioberger.com>2019-01-17 22:59:00 +0800
commit293e93729176b06f7e3cf78c798f48ddf360e311 (patch)
treee47909d281ae7da6b7c9e6af76757373ad485705 /packages/website
parentfe2f97dabd1511918051161c882c57bcc1d41ac2 (diff)
parent0b23aaca2619b888dd4e15774d5c543f79f4588d (diff)
downloaddexon-sol-tools-293e93729176b06f7e3cf78c798f48ddf360e311.tar
dexon-sol-tools-293e93729176b06f7e3cf78c798f48ddf360e311.tar.gz
dexon-sol-tools-293e93729176b06f7e3cf78c798f48ddf360e311.tar.bz2
dexon-sol-tools-293e93729176b06f7e3cf78c798f48ddf360e311.tar.lz
dexon-sol-tools-293e93729176b06f7e3cf78c798f48ddf360e311.tar.xz
dexon-sol-tools-293e93729176b06f7e3cf78c798f48ddf360e311.tar.zst
dexon-sol-tools-293e93729176b06f7e3cf78c798f48ddf360e311.zip
Merge branch 'development' into fix/dev-tools-pages/finalTouches
* development: (22 commits) Fix linter Update packages/sol-tracing-utils/src/trace_collection_subprovider.ts Update packages/sol-tracing-utils/CHANGELOG.json Update packages/sol-tracing-utils/CHANGELOG.json Add PR numbers Fix/simplify handling of revert trace snippets Fix a bug when TraceCollectionSubprovider was hanging on the fake Geth snapshot transaction Fix a bug when a custom Geth tracer didn't return stack entries for DELEGATECALL Revert devnet mining period from 1 to 0 update team info, add brent Publish Updated CHANGELOGS Add commented-out pre-publish checks Add additional check to make sure user was added to our DockerHub org Update test for required amountAvailableToFill Add actual error message thrown Flag order-watcher as having a Docker image to publish Add publish to DockerHub step to publish flow Flesh out postpublish configs in packageJSON type Add pre-publish check to ensure publisher is logged in to docker cmdline ...
Diffstat (limited to 'packages/website')
-rw-r--r--packages/website/package.json28
-rw-r--r--packages/website/public/images/team/oshirob.pngbin0 -> 522249 bytes
-rw-r--r--packages/website/ts/pages/about/team.tsx9
3 files changed, 21 insertions, 16 deletions
diff --git a/packages/website/package.json b/packages/website/package.json
index 475af4d61..0d2773a2c 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/website",
- "version": "0.0.65",
+ "version": "0.0.66",
"engines": {
"node": ">=6.12"
},
@@ -20,18 +20,18 @@
"author": "Fabio Berger",
"license": "Apache-2.0",
"dependencies": {
- "@0x/asset-buyer": "^4.0.0",
- "@0x/contract-addresses": "^2.1.0",
- "@0x/contract-wrappers": "^4.2.1",
- "@0x/json-schemas": "^2.1.6",
- "@0x/order-utils": "^3.1.1",
- "@0x/react-docs": "^1.0.24",
- "@0x/react-shared": "^1.1.1",
- "@0x/subproviders": "^2.1.10",
- "@0x/types": "^1.5.1",
- "@0x/typescript-typings": "^3.0.7",
- "@0x/utils": "^3.0.0",
- "@0x/web3-wrapper": "^3.2.3",
+ "@0x/asset-buyer": "^4.0.1",
+ "@0x/contract-addresses": "^2.2.0",
+ "@0x/contract-wrappers": "^5.0.0",
+ "@0x/json-schemas": "^2.1.7",
+ "@0x/order-utils": "^3.1.2",
+ "@0x/react-docs": "^1.0.25",
+ "@0x/react-shared": "^1.1.2",
+ "@0x/subproviders": "^2.1.11",
+ "@0x/types": "^1.5.2",
+ "@0x/typescript-typings": "^3.0.8",
+ "@0x/utils": "^3.0.1",
+ "@0x/web3-wrapper": "^3.2.4",
"@reach/dialog": "^0.1.2",
"@types/react-lazyload": "^2.3.1",
"@types/react-loadable": "^5.4.2",
@@ -42,7 +42,7 @@
"blockies": "^0.0.2",
"bowser": "^1.9.3",
"deep-equal": "^1.0.1",
- "ethereum-types": "^1.1.5",
+ "ethereum-types": "^1.1.6",
"ethereumjs-util": "^5.1.1",
"find-versions": "^2.0.0",
"jsonschema": "^1.2.0",
diff --git a/packages/website/public/images/team/oshirob.png b/packages/website/public/images/team/oshirob.png
new file mode 100644
index 000000000..094bab79b
--- /dev/null
+++ b/packages/website/public/images/team/oshirob.png
Binary files differ
diff --git a/packages/website/ts/pages/about/team.tsx b/packages/website/ts/pages/about/team.tsx
index 41d6c2cf8..466ba9f43 100644
--- a/packages/website/ts/pages/about/team.tsx
+++ b/packages/website/ts/pages/about/team.tsx
@@ -30,7 +30,7 @@ const team: TeamMember[] = [
{
imageUrl: '/images/team/fabiob.jpg',
name: 'Fabio Berger',
- title: 'senior engineer',
+ title: 'engineering manager',
},
{
imageUrl: '/images/team/alexv.jpg',
@@ -55,7 +55,7 @@ const team: TeamMember[] = [
{
imageUrl: '/images/team/toms.jpg',
name: 'Tom Schmidt',
- title: 'product manager',
+ title: 'product lead',
},
{
imageUrl: '/images/team/jacobe.jpg',
@@ -147,6 +147,11 @@ const team: TeamMember[] = [
name: 'Xianny Ng',
title: 'engineer',
},
+ {
+ imageUrl: '/images/team/oshirob.png',
+ name: 'Brent Oshiro',
+ title: 'community engagement lead',
+ },
];
const advisors: TeamMember[] = [