Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	lerna.json
#	package.json
#	packages/extension-chains/package.json
#	packages/extension-dapp/package.json
#	packages/extension-inject/package.json
#	packages/extension-ui/package.json
#	packages/extension/package.json
  • Loading branch information
vanruch committed Dec 18, 2019
2 parents dc1ad62 + cb13202 commit a065fc8
Show file tree
Hide file tree
Showing 10 changed files with 175 additions and 139 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 0.14.1

- Support for Kusama CC3
- Implement ability to sign raw messages (Thanks to https://github.com/c410-f3r)
- Allow the use of hex seeds as part of account creation

# 0.13.1

- Account export functionality (Thanks to https://github.com/Anze1m)
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
"packages": [
"packages/*"
],
"version": "0.14.0-beta.10"
"version": "0.14.1"
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.14.0-beta.10",
"version": "0.14.1",
"description": "A sample signer extension for the @polkadot/api",
"repository": "https://github.com/polkadot-js/extension",
"author": "Jaco Greeff <jacogr@gmail.com>",
Expand All @@ -12,9 +12,9 @@
"yarn": "^1.10.1"
},
"resolutions": {
"@polkadot/api": "^0.99.0-beta.4",
"@polkadot/api": "^0.99.0-beta.13",
"@polkadot/keyring": "^1.7.1",
"@polkadot/types": "^0.99.0-beta.4",
"@polkadot/types": "^0.99.0-beta.13",
"@polkadot/util": "^1.7.1",
"@polkadot/util-crypto": "^1.7.1",
"babel-core": "^7.0.0-bridge.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-chains/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@polkadot/extension-chains",
"description": "Definitions for all known chains as exposed by the extension.",
"version": "0.14.0-beta.10",
"version": "0.14.1",
"author": "Jaco Greeff <jacogr@gmail.com>",
"license": "Apache-2",
"dependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/extension-chains/src/kusama-cc3.ts

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/extension-dapp/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@polkadot/extension-dapp",
"description": "Provides an interfaces around the injected globals for ease of access by dapp developers.",
"version": "0.14.0-beta.10",
"version": "0.14.1",
"author": "Jaco Greeff <jacogr@gmail.com>",
"license": "Apache-2",
"dependencies": {
"@babel/runtime": "^7.7.5",
"@polkadot/extension-inject": "^0.14.0-beta.10"
"@polkadot/extension-inject": "^0.14.1"
},
"peerDependencies": {
"@polkadot/api": "*"
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-inject/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@polkadot/extension-inject",
"description": "A generic injector (usable to any extension), that populates the base exposed interfaces to be used by dapps.",
"version": "0.14.0-beta.10",
"version": "0.14.1",
"author": "Jaco Greeff <jacogr@gmail.com>",
"license": "Apache-2",
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@polkadot/extension-ui",
"description": "A sample signer extension for the @polkadot/api",
"version": "0.14.0-beta.10",
"version": "0.14.1",
"author": "Jaco Greeff <jacogr@gmail.com>",
"license": "Apache-2",
"dependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/extension/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@polkadot/extension",
"description": "A sample signer extension for the @polkadot/api",
"version": "0.14.0-beta.10",
"version": "0.14.1",
"author": "Jaco Greeff <jacogr@gmail.com>",
"license": "Apache-2",
"dependencies": {
"@polkadot/api": "^0.99.0-beta.4",
"@polkadot/extension-ui": "^0.14.0-beta.10",
"@polkadot/api": "^0.99.0-beta.13",
"@polkadot/extension-ui": "^0.14.1",
"@polkadot/ui-keyring": "^0.48.0-beta.1"
},
"devDependencies": {
Expand Down
Loading

0 comments on commit a065fc8

Please sign in to comment.