This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'js' into jr-registry-manage-records
* 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
- Loading branch information
Showing
425 changed files
with
14,543 additions
and
3,999 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.