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

Backports to master #2530

Merged
merged 2 commits into from
Oct 8, 2016
Merged

Backports to master #2530

merged 2 commits into from
Oct 8, 2016

Conversation

arkpar
Copy link
Collaborator

@arkpar arkpar commented Oct 8, 2016

No description provided.

@arkpar arkpar added the A8-backport 🕸 Pull request is already reviewed well in another branch. label Oct 8, 2016
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) to 86.434% when pulling 352dea2 on master-backport into 72ec936 on master.

@arkpar arkpar merged commit f200eb2 into master Oct 8, 2016
jacogr added a commit that referenced this pull request Oct 8, 2016
* commit 'f200eb2cfe80f409603b14baf1341632ad18b1b2':
  Backports to master (#2530)
jacogr added a commit that referenced this pull request Oct 8, 2016
* js:
  registration in place
  Backports to master (#2530)
  lookup hash
  ethcore_hashContent call
  single input for commit/filename
  basic githubhint layout
jacogr added a commit that referenced this pull request Oct 8, 2016
* js: (228 commits)
  registration in place
  Backports to master (#2530)
  lookup hash
  ethcore_hashContent call
  single input for commit/filename
  basic githubhint layout
  Handle reorganizations in the state cache (#2490)
  terminate after 30 seconds (#2513)
  allow updates of the secure token
  Using pending block only if not old (#2514)
  Caching optimizations (#2505)
  rework connection display
  basic test for manual token
  Fixed overflow panic in handshake_panic (#2495)
  Trim password from file (#2503)
  Fixing RPC Filter conversion to EthFilter (#2500)
  init token updates take place
  initial token connection - WIP
  Fixing error message for transactions (#2496)
  Adjustable stack size for EVM (#2483)
  ...

# Conflicts:
#	js/src/dapps/registry/Application/application.js
#	js/src/dapps/registry/Container.js
#	js/src/dapps/registry/actions.js
#	js/src/dapps/registry/reducers.js
jacogr added a commit that referenced this pull request Oct 8, 2016
* js: (23 commits)
  alignment back to normal
  Print backtrace on panic (#2535)
  NEVER export class instance functions
  stop wrongly using main app IdentityIcon
  pass value through as-is
  events is using a proper table
  fixes
  registration in place
  Backports to master (#2530)
  lookup hash
  ethcore_hashContent call
  single input for commit/filename
  basic githubhint layout
  Handle reorganizations in the state cache (#2490)
  terminate after 30 seconds (#2513)
  registry: fix setting A records
  registry: reducer returned invalid state
  registry: don't hash for A records
  registry: sha3 value first
  registry: connect record management component
  ...
@gavofyork gavofyork deleted the master-backport branch November 3, 2016 11:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-backport 🕸 Pull request is already reviewed well in another branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants