aboutsummaryrefslogtreecommitdiffstats
path: root/packages/react-shared
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2019-01-09 22:19:59 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2019-01-09 22:19:59 +0800
commit39786c3ad53c1579c4f22bd19f519589b9646287 (patch)
tree2aa8485525267ab6bd879465197d124d06bae36e /packages/react-shared
parent7f2727236dc13b1053463b3dd48103b6532e1698 (diff)
parent5b7eff217e9c8d09d64ff8721d7a16e1df8a7c58 (diff)
downloaddexon-sol-tools-39786c3ad53c1579c4f22bd19f519589b9646287.tar
dexon-sol-tools-39786c3ad53c1579c4f22bd19f519589b9646287.tar.gz
dexon-sol-tools-39786c3ad53c1579c4f22bd19f519589b9646287.tar.bz2
dexon-sol-tools-39786c3ad53c1579c4f22bd19f519589b9646287.tar.lz
dexon-sol-tools-39786c3ad53c1579c4f22bd19f519589b9646287.tar.xz
dexon-sol-tools-39786c3ad53c1579c4f22bd19f519589b9646287.tar.zst
dexon-sol-tools-39786c3ad53c1579c4f22bd19f519589b9646287.zip
Merge development
Diffstat (limited to 'packages/react-shared')
-rw-r--r--packages/react-shared/CHANGELOG.json3
-rw-r--r--packages/react-shared/CHANGELOG.md4
-rw-r--r--packages/react-shared/package.json6
3 files changed, 9 insertions, 4 deletions
diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json
index 9ef0d079f..aaf2485d1 100644
--- a/packages/react-shared/CHANGELOG.json
+++ b/packages/react-shared/CHANGELOG.json
@@ -7,7 +7,8 @@
"Change implementation to use react-router-dom NavLink instead of Link. Expose `activeStyle` prop.",
"pr": 1448
}
- ]
+ ],
+ "timestamp": 1547040760
},
{
"version": "1.0.25",
diff --git a/packages/react-shared/CHANGELOG.md b/packages/react-shared/CHANGELOG.md
index 8afa94e04..a8f2764dd 100644
--- a/packages/react-shared/CHANGELOG.md
+++ b/packages/react-shared/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.1.0 - _January 9, 2019_
+
+ * Change implementation to use react-router-dom NavLink instead of Link. Expose `activeStyle` prop. (#1448)
+
## v1.0.25 - _December 13, 2018_
* Dependencies updated
diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json
index 942544685..5754e238b 100644
--- a/packages/react-shared/package.json
+++ b/packages/react-shared/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/react-shared",
- "version": "1.0.25",
+ "version": "1.1.0",
"engines": {
"node": ">=6.12"
},
@@ -25,7 +25,7 @@
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"devDependencies": {
- "@0x/dev-utils": "^1.0.21",
+ "@0x/dev-utils": "^1.0.22",
"@0x/tslint-config": "^2.0.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",
@@ -33,7 +33,7 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0x/types": "^1.4.1",
+ "@0x/types": "^1.5.0",
"@material-ui/core": "^3.0.1",
"@types/is-mobile": "0.3.0",
"@types/lodash": "4.14.104",