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

Enable HTTP RPC sockets #871

Merged
merged 21 commits into from
Aug 3, 2016
Merged

Enable HTTP RPC sockets #871

merged 21 commits into from
Aug 3, 2016

Commits on Jun 16, 2016

  1. fixed eth start, but crash is not graceful

    @frozeman
    frozeman committed Jun 16, 2016
    Configuration menu
    Copy the full SHA
    e8d6801 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2016

  1. better socket connection logic, remove master ps logic for eth

    @hiddentao
    hiddentao committed Jun 17, 2016
    Configuration menu
    Copy the full SHA
    7997034 View commit details
    Browse the repository at this point in the history

  2. fix splash screen display of state text for eth

    @hiddentao
    hiddentao committed Jun 17, 2016
    Configuration menu
    Copy the full SHA
    dcab76f View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2016

  1. better gulp download plugin, remove master passwd stuff once and for all

    @hiddentao
    hiddentao committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    ec1f4f9 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2016

  1. Merge branch 'develop' into fixEthStart 

    # Conflicts:
#	interface/client/templates/popupWindows/onboardingScreen.js
    @hiddentao
    hiddentao committed Jun 21, 2016
    Configuration menu
    Copy the full SHA
    cf440b9 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2016

  1. HTTP socket working

    @hiddentao
    hiddentao committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    1c49c38 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fixEthStart' into http_rpc 

    # Conflicts:
#	modules/ethereumNode.js
#	modules/settings.js
#	modules/sockets.js
    @hiddentao
    hiddentao committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    7fb485f View commit details
    Browse the repository at this point in the history

  3. minor warning

    @hiddentao
    hiddentao committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    4be0ebf View commit details
    Browse the repository at this point in the history

  4. minor refactor

    @hiddentao
    hiddentao committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    1072eda View commit details
    Browse the repository at this point in the history

  5. had accidentally deleted stuff from fixEthStart merge

    @hiddentao
    hiddentao committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    c18eb83 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2016

  1. Merge branch 'develop' into http_rpc

    @hiddentao
    hiddentao committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    f912009 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2016

  1. Merge branch 'develop' into http_rpc

    @hiddentao
    hiddentao committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    282b642 View commit details
    Browse the repository at this point in the history

  2. show dialog msg if using http rpc

    @hiddentao
    hiddentao committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    5e40de4 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2016

  1. update dialog text

    @hiddentao
    hiddentao committed Jun 30, 2016
    Configuration menu
    Copy the full SHA
    112abdf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into http_rpc 

    # Conflicts:
#	modules/ethereumNode.js
#	modules/settings.js
#	modules/sockets.js
    @hiddentao
    hiddentao committed Jun 30, 2016
    Configuration menu
    Copy the full SHA
    7be7ce6 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2016

  1. Merge branch 'develop' into http_rpc

    @hiddentao
    hiddentao committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    d3a983b View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2016

  1. remove git conflict markers

    @hiddentao
    hiddentao committed Jul 12, 2016
    Configuration menu
    Copy the full SHA
    f0013a5 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2016

  1. Merge remote-tracking branch 'mist/develop' into http_rpc

    @hiddentao
    hiddentao committed Jul 13, 2016
    Configuration menu
    Copy the full SHA
    a1bef69 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2016

  1. Merge branch 'develop' into http_rpc 

    # Conflicts:
#	main.js
#	modules/ipc/getIpcPath.js
#	modules/settings.js
    @hiddentao
    hiddentao committed Jul 17, 2016
    Configuration menu
    Copy the full SHA
    51b25c5 View commit details
    Browse the repository at this point in the history

  2. fix merge

    @hiddentao
    hiddentao committed Jul 17, 2016
    Configuration menu
    Copy the full SHA
    d5e7bf0 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2016

  1. Merge branch 'develop' into http_rpc 

    # Conflicts:
#	modules/ethereumNode.js
#	modules/settings.js
    @hiddentao
    hiddentao committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    c3cfce6 View commit details
    Browse the repository at this point in the history