Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Console now has admin #4220

Merged
merged 1 commit into from
Jan 19, 2017
Merged

Console now has admin #4220

merged 1 commit into from
Jan 19, 2017

Conversation

gavofyork
Copy link
Contributor

Fixes #4210

@gavofyork gavofyork added A2-insubstantial 👶 Pull request requires no code review (e.g., a sub-repository hash update). M8-dapp 💎 Decentralized applications. B0-patch labels Jan 19, 2017
@@ -18,6 +18,7 @@
// TODO: Fix linting issues

if (typeof(window.parity) == 'object')
window.api = window.parent.secureApi;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We now do have 2 separate instances in here, one via HTTP & one via WS.

Would make sense to have a follow-on where we converge on the secure only. i.e. The next line and friends should be changed to api.subscribe and the parity.js import can be removed.

@jacogr
Copy link
Contributor

jacogr commented Jan 19, 2017

One small comment that we can address in a seperate ticket. (To not blow this one up before release)

@jacogr jacogr added the A6-mustntgrumble 💦 Pull request has areas for improvement. The author need not address them before merging. label Jan 19, 2017
@gavofyork gavofyork merged commit 0826bf7 into master Jan 19, 2017
@gavofyork gavofyork deleted the console-admin branch January 19, 2017 09:24
arkpar pushed a commit that referenced this pull request Jan 19, 2017
arkpar added a commit that referenced this pull request Jan 19, 2017
* JsonRPC bump for IPC fix

* Fixing etherscan price parsing (#4202)

* Fixing etherscan price parsing

* Handling all errors

* Fixed --base-path on windows (#4193)

* Fixed --base-path on windows

* Add support for optional args with default text

* Fixing minimal transaction queue price (#4204)

* Fixing minimal transaction queue price

* Fixing tests

* verification: add mainnet BadgeReg ids (#4190)

* verification: mainnet BadgeReg ids

* verification: fetch contracts by name

* verification: better wording

* typo

* reregistered badges

* Console now has admin (#4220)

Fixes #4210

* Non-secure for DappReg (#4216)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A2-insubstantial 👶 Pull request requires no code review (e.g., a sub-repository hash update). A6-mustntgrumble 💦 Pull request has areas for improvement. The author need not address them before merging. M8-dapp 💎 Decentralized applications.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants