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

Improve importer #997

Closed
wants to merge 9 commits into from
Closed

Improve importer #997

wants to merge 9 commits into from

Commits on Dec 22, 2016

  1. initial commit

    Luca Zeug authored and Luca Zeug committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    945b335 View commit details
    Browse the repository at this point in the history

  2. rename 'presaleFile' IPC actions to generic 'walletFile'

    Luca Zeug authored and Luca Zeug committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    4e2f76a View commit details
    Browse the repository at this point in the history

  3. update the import-screen depending on wallet type

    Luca Zeug authored and Luca Zeug committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    33ea5ab View commit details
    Browse the repository at this point in the history

  4. leverage ethereum-keyfile-recognizer

    Luca Zeug committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    80d8465 View commit details
    Browse the repository at this point in the history

  5. update yarn.lock

    Luca Zeug committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    435a59f View commit details
    Browse the repository at this point in the history

  6. fix merge relic

    Luca Zeug committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    cb3eab5 View commit details
    Browse the repository at this point in the history

  7. [ESLint]

    Luca Zeug committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    5e1451e View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2017

  1. polish

    Luca Zeug committed Jan 17, 2017
    Configuration menu
    Copy the full SHA
    466f857 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/origin/develop' 

    Conflicts:
	interface/client/templates/popupWindows/onboardingScreen.html
	interface/client/templates/popupWindows/onboardingScreen.js
    Luca Zeug committed Jan 17, 2017
    Configuration menu
    Copy the full SHA
    d119073 View commit details
    Browse the repository at this point in the history