aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website
diff options
context:
space:
mode:
authorSteve Klebanoff <steve.klebanoff@gmail.com>2018-12-01 06:09:23 +0800
committerSteve Klebanoff <steve.klebanoff@gmail.com>2018-12-01 06:09:23 +0800
commitef041d1603ed9c707c032c5620f9829eeaf0e361 (patch)
treee67491b0c66fc50dcf8dfdfa7e57068696f219fc /packages/website
parent271adcdb7e3ecb9f88f05f36ffb71d2147bac292 (diff)
parent34b2f4736e30b50f94a3110c313131b56e35bc02 (diff)
downloaddexon-sol-tools-ef041d1603ed9c707c032c5620f9829eeaf0e361.tar
dexon-sol-tools-ef041d1603ed9c707c032c5620f9829eeaf0e361.tar.gz
dexon-sol-tools-ef041d1603ed9c707c032c5620f9829eeaf0e361.tar.bz2
dexon-sol-tools-ef041d1603ed9c707c032c5620f9829eeaf0e361.tar.lz
dexon-sol-tools-ef041d1603ed9c707c032c5620f9829eeaf0e361.tar.xz
dexon-sol-tools-ef041d1603ed9c707c032c5620f9829eeaf0e361.tar.zst
dexon-sol-tools-ef041d1603ed9c707c032c5620f9829eeaf0e361.zip
Merge branch 'feature/instant/prod-env-switches-cdn' into feature/instant/rollbar-env
Diffstat (limited to 'packages/website')
-rw-r--r--packages/website/package.json14
-rw-r--r--packages/website/public/images/team/xianny.pngbin0 -> 49783 bytes
-rw-r--r--packages/website/ts/pages/about/about.tsx8
3 files changed, 15 insertions, 7 deletions
diff --git a/packages/website/package.json b/packages/website/package.json
index 52ba206c6..dc10c7b1c 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/website",
- "version": "0.0.60",
+ "version": "0.0.61",
"engines": {
"node": ">=6.12"
},
@@ -20,16 +20,16 @@
"author": "Fabio Berger",
"license": "Apache-2.0",
"dependencies": {
- "@0x/contract-wrappers": "^4.1.0",
+ "@0x/contract-wrappers": "^4.1.1",
"@0x/json-schemas": "^2.1.2",
- "@0x/order-utils": "^3.0.3",
- "@0x/react-docs": "^1.0.19",
- "@0x/react-shared": "^1.0.22",
- "@0x/subproviders": "^2.1.5",
+ "@0x/order-utils": "^3.0.4",
+ "@0x/react-docs": "^1.0.20",
+ "@0x/react-shared": "^1.0.23",
+ "@0x/subproviders": "^2.1.6",
"@0x/types": "^1.3.0",
"@0x/typescript-typings": "^3.0.4",
"@0x/utils": "^2.0.6",
- "@0x/web3-wrapper": "^3.1.5",
+ "@0x/web3-wrapper": "^3.1.6",
"accounting": "^0.4.1",
"basscss": "^8.0.3",
"blockies": "^0.0.2",
diff --git a/packages/website/public/images/team/xianny.png b/packages/website/public/images/team/xianny.png
new file mode 100644
index 000000000..f6fe1ef61
--- /dev/null
+++ b/packages/website/public/images/team/xianny.png
Binary files differ
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index dfe8926b0..81a3f59e1 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -248,6 +248,14 @@ const teamRow9: ProfileInfo[] = [
linkedIn: 'https://www.linkedin.com/in/steveklebanoff/',
github: 'https://github.com/steveklebanoff',
},
+ {
+ name: 'Xianny Ng',
+ title: 'Engineer',
+ description: `Developer Experience. Previously telemetry at Mapbox and platform engineering at Bench Accounting.`,
+ image: 'images/team/xianny.png',
+ linkedIn: 'https://www.linkedin.com/in/xianny/',
+ github: 'https://github.com/xianny',
+ },
];
const advisors1: ProfileInfo[] = [