diff options
author | Fabio Berger <me@fabioberger.com> | 2018-08-14 09:49:35 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-08-14 09:49:35 +0800 |
commit | 10dc3ea81c1780c0b694fdf5f0864e3b281da566 (patch) | |
tree | da451f191268cee02114dd90bdcda721d37d0820 /packages/json-schemas | |
parent | c320c8742e140f00d93a82ade91c01e6602b861d (diff) | |
parent | fadd292ecf367e42154856509d0ea0c20b23f2f1 (diff) | |
download | dexon-sol-tools-10dc3ea81c1780c0b694fdf5f0864e3b281da566.tar dexon-sol-tools-10dc3ea81c1780c0b694fdf5f0864e3b281da566.tar.gz dexon-sol-tools-10dc3ea81c1780c0b694fdf5f0864e3b281da566.tar.bz2 dexon-sol-tools-10dc3ea81c1780c0b694fdf5f0864e3b281da566.tar.lz dexon-sol-tools-10dc3ea81c1780c0b694fdf5f0864e3b281da566.tar.xz dexon-sol-tools-10dc3ea81c1780c0b694fdf5f0864e3b281da566.tar.zst dexon-sol-tools-10dc3ea81c1780c0b694fdf5f0864e3b281da566.zip |
Fix merge
Diffstat (limited to 'packages/json-schemas')
-rw-r--r-- | packages/json-schemas/CHANGELOG.json | 3 | ||||
-rw-r--r-- | packages/json-schemas/CHANGELOG.md | 10 | ||||
-rw-r--r-- | packages/json-schemas/package.json | 10 |
3 files changed, 15 insertions, 8 deletions
diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json index 5af23dbe9..d78a1c11e 100644 --- a/packages/json-schemas/CHANGELOG.json +++ b/packages/json-schemas/CHANGELOG.json @@ -14,7 +14,8 @@ "note": "Upgrade Relayer API schemas for relayer API V2", "pr": 916 } - ] + ], + "timestamp": 1534210131 }, { "version": "1.0.1-rc.3", diff --git a/packages/json-schemas/CHANGELOG.md b/packages/json-schemas/CHANGELOG.md index 442e40a2f..0ebc3d237 100644 --- a/packages/json-schemas/CHANGELOG.md +++ b/packages/json-schemas/CHANGELOG.md @@ -5,6 +5,12 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.1-rc.4 - _August 13, 2018_ + + * Allow for additional properties in txData schema (#938) + * Change hexSchema to match `0x` (#937) + * Upgrade Relayer API schemas for relayer API V2 (#916) + ## v1.0.1-rc.3 - _July 26, 2018_ * Dependencies updated @@ -21,7 +27,7 @@ CHANGELOG * Dependencies updated -## v1.0.0-rc.1 - _July 20, 2018_ +## v1.0.0-rc.1 - _July 19, 2018_ * Update schemas for V2 or 0x Protocol (#615) * Added CallData schema (#821) @@ -47,7 +53,7 @@ CHANGELOG * Dependencies updated -## v0.7.23 - _May 5, 2018_ +## v0.7.23 - _May 4, 2018_ * Dependencies updated diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index e56ad53dd..40cb71c18 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/json-schemas", - "version": "1.0.1-rc.3", + "version": "1.0.1-rc.4", "engines": { "node": ">=6.12" }, @@ -47,15 +47,15 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/json-schemas/README.md", "dependencies": { - "@0xproject/typescript-typings": "^1.0.3", + "@0xproject/typescript-typings": "^1.0.4", "@types/node": "^8.0.53", "jsonschema": "^1.2.0", "lodash.values": "^4.3.0" }, "devDependencies": { - "@0xproject/monorepo-scripts": "^1.0.4", - "@0xproject/tslint-config": "^1.0.4", - "@0xproject/utils": "^1.0.4", + "@0xproject/monorepo-scripts": "^1.0.5", + "@0xproject/tslint-config": "^1.0.5", + "@0xproject/utils": "^1.0.5", "@types/lodash.foreach": "^4.5.3", "@types/lodash.values": "^4.3.3", "@types/mocha": "^2.2.42", |