Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Devop/merge longest branches #53

Merged
merged 271 commits into from
Aug 30, 2018
Merged
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Aug 9, 2018

  1. 1 Configuration menu
    Copy the full SHA
    e524f6b View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2018

  1. 1 Configuration menu
    Copy the full SHA
    f972aef View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6875413 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'origin/feature/contracts' into override…

    …-web3-methods
    
    # Conflicts:
    #	package-lock.json
    #	src/App.vue
    SteveMieskoski committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    1a76a88 View commit details
    Browse the repository at this point in the history
  4. 1 Configuration menu
    Copy the full SHA
    e8521b9 View commit details
    Browse the repository at this point in the history
  5. 1 Configuration menu
    Copy the full SHA
    2ad3913 View commit details
    Browse the repository at this point in the history
  6. update changelog

    SteveMieskoski committed Aug 10, 2018
    1 Configuration menu
    Copy the full SHA
    50d02f7 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    fc290f4 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2018

  1. Configuration menu
    Copy the full SHA
    3bcd506 View commit details
    Browse the repository at this point in the history
  2. some clean-up

    SteveMieskoski committed Aug 12, 2018
    Configuration menu
    Copy the full SHA
    a9917be View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fc04df2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    db5e542 View commit details
    Browse the repository at this point in the history
  5. 1 Configuration menu
    Copy the full SHA
    7af0d60 View commit details
    Browse the repository at this point in the history
  6. clean-up

    SteveMieskoski committed Aug 12, 2018
    Configuration menu
    Copy the full SHA
    ecca142 View commit details
    Browse the repository at this point in the history
  7. clean-up

    SteveMieskoski committed Aug 12, 2018
    Configuration menu
    Copy the full SHA
    20042c6 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    f4d38a0 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2018

  1. Configuration menu
    Copy the full SHA
    b702af9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    455d32a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2835305 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2018

  1. Configuration menu
    Copy the full SHA
    5d2708f View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2018

  1. Merge branch 'develop' of https://github.com/MyEtherWallet/MyEtherWallet

     into feature/MEWconnect-integration
    SteveMieskoski committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    ec6b873 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2018

  1. Configuration menu
    Copy the full SHA
    e0d0be5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9a643dc View commit details
    Browse the repository at this point in the history
  3. Add nodes from mew

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    488fadc View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    58fa874 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d40987d View commit details
    Browse the repository at this point in the history
  6. Update changelog

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    c76f7e2 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    b732e5a View commit details
    Browse the repository at this point in the history
  8. Rebuild

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    6602bff View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    098e92a View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    3bb1360 View commit details
    Browse the repository at this point in the history
  11. Package-json.lock update

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    71d85db View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    e2ee4ff View commit details
    Browse the repository at this point in the history
  13. Add kosala fixes

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    55b5b07 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    2730d3e View commit details
    Browse the repository at this point in the history
  15. Add ETHO and PIRL nodes

    gamalielhere committed Aug 16, 2018
    1 Configuration menu
    Copy the full SHA
    69b569c View commit details
    Browse the repository at this point in the history
  16. Initial setup

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    0d0e8f1 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    0d476c0 View commit details
    Browse the repository at this point in the history
  18. Keep gas before signing

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    39ce559 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    f01d12a View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    c4c2a14 View commit details
    Browse the repository at this point in the history
  21. Progress

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    f3854a0 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    c28c42a View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    d617312 View commit details
    Browse the repository at this point in the history
  24. Implement read functions

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    09e5019 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    e5a5f1f View commit details
    Browse the repository at this point in the history
  26. Update changelog

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    899ec74 View commit details
    Browse the repository at this point in the history
  27. add port to network url

    kvhnuke authored and gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    175a377 View commit details
    Browse the repository at this point in the history
  28. better network host handling

    kvhnuke authored and gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    acc0e3f View commit details
    Browse the repository at this point in the history
  29. 1 Configuration menu
    Copy the full SHA
    d3c302c View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    985bd20 View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    206ada7 View commit details
    Browse the repository at this point in the history
  32. Add nodes from mew

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    1062bcf View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    11d0817 View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    99028a7 View commit details
    Browse the repository at this point in the history
  35. Update changelog

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    5e073cd View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    d6031df View commit details
    Browse the repository at this point in the history
  37. Rebuild

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    b8b5d91 View commit details
    Browse the repository at this point in the history
  38. Configuration menu
    Copy the full SHA
    bcb119b View commit details
    Browse the repository at this point in the history
  39. Configuration menu
    Copy the full SHA
    2012b1a View commit details
    Browse the repository at this point in the history
  40. Package-json.lock update

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    afdd3b9 View commit details
    Browse the repository at this point in the history
  41. Configuration menu
    Copy the full SHA
    46e45bf View commit details
    Browse the repository at this point in the history
  42. Add kosala fixes

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    b04984e View commit details
    Browse the repository at this point in the history
  43. Configuration menu
    Copy the full SHA
    4e4be70 View commit details
    Browse the repository at this point in the history
  44. Add ETHO and PIRL nodes

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    6665131 View commit details
    Browse the repository at this point in the history
  45. Add network logos

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    002ca31 View commit details
    Browse the repository at this point in the history
  46. Configuration menu
    Copy the full SHA
    0511c28 View commit details
    Browse the repository at this point in the history
  47. Update changelog

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    915c883 View commit details
    Browse the repository at this point in the history
  48. Update changelog link

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    83e0957 View commit details
    Browse the repository at this point in the history
  49. Configuration menu
    Copy the full SHA
    f97391b View commit details
    Browse the repository at this point in the history
  50. Remove recommended

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    15fac72 View commit details
    Browse the repository at this point in the history
  51. Cleanup linter errors

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    5956603 View commit details
    Browse the repository at this point in the history
  52. Start work on verifymsg

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    18fe26f View commit details
    Browse the repository at this point in the history
  53. Add toBuffer function

    gamalielhere committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    7e21712 View commit details
    Browse the repository at this point in the history
  54. checkpoint

    SteveMieskoski committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    6218165 View commit details
    Browse the repository at this point in the history
  55. Merge branch 'develop' of https://github.com/MyEtherWallet/MyEtherWallet

     into feature/ledger-integration
    SteveMieskoski committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    4479039 View commit details
    Browse the repository at this point in the history
  56. Merge branch 'feature/ledger-integration' into feature/trezor-integra…

    …tion
    
    # Conflicts:
    #	src/layouts/AccessWalletLayout/components/HardwareModal/HardwareModal.vue
    #	src/layouts/AccessWalletLayout/components/NetworkAndAddressModal/NetworkAndAddressModal.vue
    SteveMieskoski committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    f28c1b1 View commit details
    Browse the repository at this point in the history
  57. Merge branch 'feature/trezor-integration' into feature/MEWconnect-int…

    …egration
    
    # Conflicts:
    #	src/containers/ConfirmationContainer/ConfirmationContainer.vue
    #	src/layouts/AccessWalletLayout/components/HardwareModal/HardwareModal.vue
    #	src/layouts/AccessWalletLayout/components/NetworkAndAddressModal/NetworkAndAddressModal.vue
    #	src/layouts/AccessWalletLayout/containers/AccessMyWalletContainer/AccessMyWalletContainer.vue
    SteveMieskoski committed Aug 16, 2018
    1 Configuration menu
    Copy the full SHA
    e38b928 View commit details
    Browse the repository at this point in the history
  58. Conslidate web3-override, ledger-integration, trezor-integration, and…

    … MEWconnect-integration into one branch.
    SteveMieskoski committed Aug 16, 2018
    1 Configuration menu
    Copy the full SHA
    0a2d734 View commit details
    Browse the repository at this point in the history
  59. Let user verify

    gamalielhere committed Aug 16, 2018
    1 Configuration menu
    Copy the full SHA
    cb373cd View commit details
    Browse the repository at this point in the history
  60. Update changelog

    gamalielhere committed Aug 16, 2018
    1 Configuration menu
    Copy the full SHA
    0af9cc9 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2018

  1. 1 Configuration menu
    Copy the full SHA
    b7d2aeb View commit details
    Browse the repository at this point in the history
  2. Fix Es Lint Errors

    SteveMieskoski committed Aug 17, 2018
    1 Configuration menu
    Copy the full SHA
    ed7bbdb View commit details
    Browse the repository at this point in the history
  3. Fix Es Lint Errors

    SteveMieskoski committed Aug 17, 2018
    2 Configuration menu
    Copy the full SHA
    3a14af1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    df97b2e View commit details
    Browse the repository at this point in the history
  5. 1 Configuration menu
    Copy the full SHA
    d9b46c4 View commit details
    Browse the repository at this point in the history
  6. pre-mega merge

    SteveMieskoski committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    be33fd4 View commit details
    Browse the repository at this point in the history
  7. Merge remote-tracking branch 'origin/feature/verify-message' into dev…

    …op/mergeLongestBranches
    
    # Conflicts:
    #	CHANGELOG.md
    #	package-lock.json
    #	src/App.vue
    #	src/configs/networks/nodes/index.js
    #	src/configs/networks/types/index.js
    #	src/contracts/contract-abi-rop.json
    #	src/layouts/InterfaceLayout/InterfaceLayout.vue
    #	src/layouts/InterfaceLayout/components/InterfaceNetworkModal/InterfaceNetworkModal.vue
    #	src/layouts/InterfaceLayout/containers/VerifyMessageContainer/VerifyMessageContainer.scss
    #	src/tokens/tokens-eth.json
    #	src/tokens/tokens-rop.json
    SteveMieskoski committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    3d726fc View commit details
    Browse the repository at this point in the history
  8. post-mega merge

    SteveMieskoski committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    6545718 View commit details
    Browse the repository at this point in the history
  9. Merge remote-tracking branch 'origin/feature/contracts' into devop/me…

    …rgeLongestBranches
    
    # Conflicts:
    #	CHANGELOG.md
    #	src/App.vue
    #	src/components/Notification/Notification.vue
    #	src/containers/ConfirmationContainer/components/ConfirmModal/ConfirmModal.vue
    #	src/contracts/contract-abi-rop.json
    #	src/helpers/index.js
    #	src/layouts/InterfaceLayout/InterfaceLayout.vue
    #	src/layouts/InterfaceLayout/components/CurrencyPicker/CurrencyPicker.vue
    #	src/layouts/InterfaceLayout/components/InterfaceNetworkModal/InterfaceNetworkModal.vue
    #	src/layouts/InterfaceLayout/containers/DeployContractContainer/DeployContractContainer.vue
    #	src/layouts/InterfaceLayout/containers/SendCurrencyContainer/SendCurrencyContainer.vue
    #	src/store/mutations.js
    #	src/tokens/tokens-eth.json
    SteveMieskoski committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    df8ec14 View commit details
    Browse the repository at this point in the history
  10. Fix notification and blockie not appearing after wallet unlock, and l…

    …ocalstorage not having a locale item
    SteveMieskoski committed Aug 17, 2018
    1 Configuration menu
    Copy the full SHA
    aa3a25a View commit details
    Browse the repository at this point in the history
  11. Update CHANGELOG.md

    gamalielhere authored Aug 17, 2018
    1 Configuration menu
    Copy the full SHA
    2b3ffa7 View commit details
    Browse the repository at this point in the history
  12. 1 Configuration menu
    Copy the full SHA
    566f4e0 View commit details
    Browse the repository at this point in the history
  13. Merge pull request #55 from MyEtherWallet/greenkeeper/eslint-plugin-p…

    …romise-4.0.0
    
    Update eslint-plugin-promise to the latest version 🚀
    gamalielhere authored Aug 17, 2018
    1 Configuration menu
    Copy the full SHA
    a056d07 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2018

  1. added prettier and husky

    kvhnuke authored and gamalielhere committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    7002483 View commit details
    Browse the repository at this point in the history
  2. Fix lint errors

    gamalielhere committed Aug 21, 2018
    1 Configuration menu
    Copy the full SHA
    6ed9910 View commit details
    Browse the repository at this point in the history
  3. Update changelog

    gamalielhere committed Aug 21, 2018
    1 Configuration menu
    Copy the full SHA
    747a875 View commit details
    Browse the repository at this point in the history
  4. 2 Configuration menu
    Copy the full SHA
    6f3936a View commit details
    Browse the repository at this point in the history
  5. Merge pull request #54 from MyEtherWallet/devop/code-qc

    devop/code-qc
    gamalielhere authored Aug 21, 2018
    1 Configuration menu
    Copy the full SHA
    6581383 View commit details
    Browse the repository at this point in the history
  6. checkpoint

    SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    18c3904 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    691a81f View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    0f99457 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    5cc5477 View commit details
    Browse the repository at this point in the history
  10. checkpoint

    SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    f85b2b6 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    e9250da View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    188f63b View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    4fc17ba View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    516c6bd View commit details
    Browse the repository at this point in the history
  15. Add nodes from mew

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    7813475 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    52dc08e View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    36f476b View commit details
    Browse the repository at this point in the history
  18. Update changelog

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    8f39104 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    040a741 View commit details
    Browse the repository at this point in the history
  20. Rebuild

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    876e8b2 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    ccbe0ed View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    a654595 View commit details
    Browse the repository at this point in the history
  23. Package-json.lock update

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    c5262e0 View commit details
    Browse the repository at this point in the history
  24. Initial setup

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    66ffe20 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    9a407bb View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    7950726 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    fb8ae70 View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    95cacf1 View commit details
    Browse the repository at this point in the history
  29. update changelog

    SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    de95241 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    45dc89c View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    313b18d View commit details
    Browse the repository at this point in the history
  32. some clean-up

    SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    232e2ad View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    9b3ae3c View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    542ab29 View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    7209c98 View commit details
    Browse the repository at this point in the history
  36. clean-up

    SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    9dddec2 View commit details
    Browse the repository at this point in the history
  37. clean-up

    SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    9d27d5d View commit details
    Browse the repository at this point in the history
  38. Configuration menu
    Copy the full SHA
    1a767ee View commit details
    Browse the repository at this point in the history
  39. Configuration menu
    Copy the full SHA
    a8f3204 View commit details
    Browse the repository at this point in the history
  40. Configuration menu
    Copy the full SHA
    e11d5ab View commit details
    Browse the repository at this point in the history
  41. Configuration menu
    Copy the full SHA
    a38940b View commit details
    Browse the repository at this point in the history
  42. Configuration menu
    Copy the full SHA
    4b21ca6 View commit details
    Browse the repository at this point in the history
  43. Configuration menu
    Copy the full SHA
    4522ce8 View commit details
    Browse the repository at this point in the history
  44. Update changelog

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    691c710 View commit details
    Browse the repository at this point in the history
  45. Configuration menu
    Copy the full SHA
    91cf2a6 View commit details
    Browse the repository at this point in the history
  46. Configuration menu
    Copy the full SHA
    2b8f808 View commit details
    Browse the repository at this point in the history
  47. Configuration menu
    Copy the full SHA
    f203f74 View commit details
    Browse the repository at this point in the history
  48. Add kosala fixes

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    c7d5d1a View commit details
    Browse the repository at this point in the history
  49. Configuration menu
    Copy the full SHA
    b1a76be View commit details
    Browse the repository at this point in the history
  50. Add ETHO and PIRL nodes

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    04da898 View commit details
    Browse the repository at this point in the history
  51. Initial setup

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    fba31b4 View commit details
    Browse the repository at this point in the history
  52. Configuration menu
    Copy the full SHA
    dcc2ffa View commit details
    Browse the repository at this point in the history
  53. Keep gas before signing

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    d5700a3 View commit details
    Browse the repository at this point in the history
  54. Configuration menu
    Copy the full SHA
    5210ceb View commit details
    Browse the repository at this point in the history
  55. Configuration menu
    Copy the full SHA
    6613b90 View commit details
    Browse the repository at this point in the history
  56. Progress

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    7b1b21e View commit details
    Browse the repository at this point in the history
  57. Render inputs when needed

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    39600b2 View commit details
    Browse the repository at this point in the history
  58. Configuration menu
    Copy the full SHA
    a416121 View commit details
    Browse the repository at this point in the history
  59. Implement read functions

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    1f7c75d View commit details
    Browse the repository at this point in the history
  60. Configuration menu
    Copy the full SHA
    9645df3 View commit details
    Browse the repository at this point in the history
  61. Update changelog

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    348851f View commit details
    Browse the repository at this point in the history
  62. Configuration menu
    Copy the full SHA
    b41faad View commit details
    Browse the repository at this point in the history
  63. Configuration menu
    Copy the full SHA
    71aa924 View commit details
    Browse the repository at this point in the history
  64. Configuration menu
    Copy the full SHA
    4a664ef View commit details
    Browse the repository at this point in the history
  65. Configuration menu
    Copy the full SHA
    483007b View commit details
    Browse the repository at this point in the history
  66. Add network logos

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    460a286 View commit details
    Browse the repository at this point in the history
  67. Configuration menu
    Copy the full SHA
    b03749e View commit details
    Browse the repository at this point in the history
  68. Configuration menu
    Copy the full SHA
    239582a View commit details
    Browse the repository at this point in the history
  69. Remove recommended

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    a6526ef View commit details
    Browse the repository at this point in the history
  70. Cleanup linter errors

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    26d9de0 View commit details
    Browse the repository at this point in the history
  71. Start work on verifymsg

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    0451205 View commit details
    Browse the repository at this point in the history
  72. Add toBuffer function

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    748f267 View commit details
    Browse the repository at this point in the history
  73. Let user verify

    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    07198fd View commit details
    Browse the repository at this point in the history
  74. Configuration menu
    Copy the full SHA
    82b7fda View commit details
    Browse the repository at this point in the history
  75. Fix Es Lint Errors

    SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    4a0571d View commit details
    Browse the repository at this point in the history
  76. Fix Es Lint Errors

    SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    182937e View commit details
    Browse the repository at this point in the history
  77. Configuration menu
    Copy the full SHA
    a6ede96 View commit details
    Browse the repository at this point in the history
  78. Configuration menu
    Copy the full SHA
    3ab69e8 View commit details
    Browse the repository at this point in the history
  79. pre-mega merge

    SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    97c3b0f View commit details
    Browse the repository at this point in the history
  80. Fix notification and blockie not appearing after wallet unlock, and l…

    …ocalstorage not having a locale item
    SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    bcdd082 View commit details
    Browse the repository at this point in the history
  81. Configuration menu
    Copy the full SHA
    39fb85a View commit details
    Browse the repository at this point in the history
  82. Configuration menu
    Copy the full SHA
    94a6a5d View commit details
    Browse the repository at this point in the history
  83. Configuration menu
    Copy the full SHA
    fbb774a View commit details
    Browse the repository at this point in the history
  84. bloody git

    SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    642658f View commit details
    Browse the repository at this point in the history
  85. bloody git

    SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    c565cae View commit details
    Browse the repository at this point in the history
  86. bloody git 3

    SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    030a4ee View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2018

  1. 1 Configuration menu
    Copy the full SHA
    bf15c4b View commit details
    Browse the repository at this point in the history
  2. 1 Configuration menu
    Copy the full SHA
    a9e2e3e View commit details
    Browse the repository at this point in the history
  3. Implement ens resolver

    gamalielhere committed Aug 22, 2018
    Configuration menu
    Copy the full SHA
    28b06f9 View commit details
    Browse the repository at this point in the history
  4. Update changelog

    gamalielhere committed Aug 22, 2018
    Configuration menu
    Copy the full SHA
    416ff5e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f108508 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2018

  1. revert

    SteveMieskoski committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    cd472bc View commit details
    Browse the repository at this point in the history
  2. clean

    SteveMieskoski committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    4c92fe3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6959ba2 View commit details
    Browse the repository at this point in the history
  4. 1 Configuration menu
    Copy the full SHA
    31bb628 View commit details
    Browse the repository at this point in the history
  5. Rerun build

    gamalielhere committed Aug 23, 2018
    1 Configuration menu
    Copy the full SHA
    94ca00f View commit details
    Browse the repository at this point in the history
  6. 1 Configuration menu
    Copy the full SHA
    24d96b0 View commit details
    Browse the repository at this point in the history
  7. 1 Configuration menu
    Copy the full SHA
    2baa47d View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    3736863 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2018

  1. checkpoint

    SteveMieskoski committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    f9a51eb View commit details
    Browse the repository at this point in the history
  2. address pagination

    SteveMieskoski committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    5f5ef51 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    59965d4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    cd8147a View commit details
    Browse the repository at this point in the history
  5. 1 Configuration menu
    Copy the full SHA
    0fda6d8 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9b81f8f View commit details
    Browse the repository at this point in the history
  7. Rewrite networks

    gamalielhere committed Aug 24, 2018
    1 Configuration menu
    Copy the full SHA
    06f0f50 View commit details
    Browse the repository at this point in the history
  8. 1 Configuration menu
    Copy the full SHA
    de50020 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2018

  1. Configuration menu
    Copy the full SHA
    b70db45 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'feature/comlete-networkAndAddressModal' into temp

    # Conflicts:
    #	src/layouts/AccessWalletLayout/components/NetworkAndAddressModal/NetworkAndAddressModal.vue
    #	src/wallets/hardware/ledger/ledgerWallet.js
    SteveMieskoski committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    be7ed5d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    025bd06 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'origin/devop/refactor-parts' into featu…

    …re/complete-networkAndAddressModal-functionality
    SteveMieskoski committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    40f0b89 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2018

  1. Configuration menu
    Copy the full SHA
    427d119 View commit details
    Browse the repository at this point in the history
  2. 1 Configuration menu
    Copy the full SHA
    82d5a65 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fd9f52c View commit details
    Browse the repository at this point in the history
  4. Merge pull request #60 from MyEtherWallet/greenkeeper/style-loader-0.…

    …23.0
    
    Update style-loader to the latest version 🚀
    gamalielhere authored Aug 27, 2018
    1 Configuration menu
    Copy the full SHA
    2917d45 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2018

  1. Merge pull request #56 from MyEtherWallet/feature/ens-resolver

    Feature/ens resolver
    gamalielhere authored Aug 28, 2018
    1 Configuration menu
    Copy the full SHA
    cb1b8b7 View commit details
    Browse the repository at this point in the history
  2. 1 Configuration menu
    Copy the full SHA
    829def3 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #62 from MyEtherWallet/greenkeeper/babel-eslint-9.0.0

    Update babel-eslint to the latest version 🚀
    gamalielhere authored Aug 28, 2018
    1 Configuration menu
    Copy the full SHA
    41eb72d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    bc4414f View commit details
    Browse the repository at this point in the history
  5. Merge pull request #63 from MyEtherWallet/greenkeeper/babel-loader-8.0.0

    Update babel-loader to the latest version 🚀
    gamalielhere authored Aug 28, 2018
    Configuration menu
    Copy the full SHA
    832d969 View commit details
    Browse the repository at this point in the history
  6. Revert to 7.1.5

    gamalielhere committed Aug 28, 2018
    1 Configuration menu
    Copy the full SHA
    8c01c43 View commit details
    Browse the repository at this point in the history
  7. Update changelog

    gamalielhere committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    25162fd View commit details
    Browse the repository at this point in the history
  8. Update changelog link

    gamalielhere committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    38dc60a View commit details
    Browse the repository at this point in the history
  9. 1 Configuration menu
    Copy the full SHA
    cd7c060 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2018

  1. Configuration menu
    Copy the full SHA
    6e05f02 View commit details
    Browse the repository at this point in the history
  2. 1 Configuration menu
    Copy the full SHA
    464337c View commit details
    Browse the repository at this point in the history
  3. Add stale config

    gamalielhere committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    e9074e9 View commit details
    Browse the repository at this point in the history
  4. Update changelog

    gamalielhere committed Aug 29, 2018
    1 Configuration menu
    Copy the full SHA
    e5324da View commit details
    Browse the repository at this point in the history
  5. Merge pull request #70 from MyEtherWallet/devop/setup-stale

    Devop/setup stale
    gamalielhere authored Aug 29, 2018
    1 Configuration menu
    Copy the full SHA
    fecde9e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    64e1dab View commit details
    Browse the repository at this point in the history
  7. clean

    SteveMieskoski committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    2fa9399 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    1f0c694 View commit details
    Browse the repository at this point in the history
  9. refactor to use vue-cli 3.0

    kvhnuke authored and gamalielhere committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    a9ecbb5 View commit details
    Browse the repository at this point in the history
  10. build using relative path

    kvhnuke authored and gamalielhere committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    4251bfc View commit details
    Browse the repository at this point in the history
  11. update npm in travis

    kvhnuke authored and gamalielhere committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    d3c1402 View commit details
    Browse the repository at this point in the history
  12. fix heap oom -try 1

    kvhnuke authored and gamalielhere committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    f3d25d0 View commit details
    Browse the repository at this point in the history
  13. add test coverage

    kvhnuke authored and gamalielhere committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    57e1b19 View commit details
    Browse the repository at this point in the history
  14. fix wallet download

    kvhnuke authored and gamalielhere committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    3e0b702 View commit details
    Browse the repository at this point in the history
  15. Add default index.html page

    kvhnuke authored and gamalielhere committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    9d572f9 View commit details
    Browse the repository at this point in the history
  16. fix build, remove console.log

    kvhnuke authored and gamalielhere committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    baa8561 View commit details
    Browse the repository at this point in the history
  17. clean and huskiefy

    SteveMieskoski committed Aug 29, 2018
    1 Configuration menu
    Copy the full SHA
    5028627 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    d2d7fd1 View commit details
    Browse the repository at this point in the history
  19. Rename some components

    gamalielhere committed Aug 29, 2018
    1 Configuration menu
    Copy the full SHA
    c085322 View commit details
    Browse the repository at this point in the history
  20. Merge remote-tracking branch 'origin/devop/mergeLongestBranches' into…

    … feature/additional-hw-wallets
    
    # Conflicts:
    #	package-lock.json
    #	src/App.vue
    #	src/components/Blockie/Blockie.vue
    #	src/layouts/InterfaceLayout/InterfaceLayout.vue
    #	src/layouts/InterfaceLayout/components/GenerateTx/GenerateTx.vue
    #	src/layouts/InterfaceLayout/containers/SendCurrencyContainer/SendCurrencyContainer.vue
    #	src/main.js
    SteveMieskoski committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    71d46cf View commit details
    Browse the repository at this point in the history
  21. Merge pull request #68 from MyEtherWallet/refactor/vue-cli

    Refactor/vue cli
    gamalielhere authored Aug 29, 2018
    1 Configuration menu
    Copy the full SHA
    985de31 View commit details
    Browse the repository at this point in the history
  22. 1 Configuration menu
    Copy the full SHA
    3c3590f View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2018

  1. Merge remote-tracking branch 'origin/devop/mergeLongestBranches' into…

    … feature/additional-hw-wallets
    SteveMieskoski committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    c158c8d View commit details
    Browse the repository at this point in the history
  2. Fix linting errors

    gamalielhere committed Aug 30, 2018
    1 Configuration menu
    Copy the full SHA
    120bcc1 View commit details
    Browse the repository at this point in the history
  3. Fix conflicts

    gamalielhere committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    ac4bb45 View commit details
    Browse the repository at this point in the history
  4. Fix conflict

    gamalielhere committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    9cfda57 View commit details
    Browse the repository at this point in the history
  5. Recompile and fix build

    gamalielhere committed Aug 30, 2018
    1 Configuration menu
    Copy the full SHA
    cf415b6 View commit details
    Browse the repository at this point in the history
  6. Fix sign message

    gamalielhere committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    0341795 View commit details
    Browse the repository at this point in the history
  7. Fix sign

    gamalielhere committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    26ee0c2 View commit details
    Browse the repository at this point in the history
  8. Fix sign

    gamalielhere committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    83ef90a View commit details
    Browse the repository at this point in the history
  9. Add websocket package

    gamalielhere committed Aug 30, 2018
    1 Configuration menu
    Copy the full SHA
    4861706 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #57 from MyEtherWallet/feature/additional-hw-wallets

    Feature/additional hw wallets
    SteveMieskoski authored Aug 30, 2018
    1 Configuration menu
    Copy the full SHA
    a2424b7 View commit details
    Browse the repository at this point in the history