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.

Sign up for GitHub

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

Jump to bottom

Feature/additional hw wallets #57

Merged
merged 116 commits into from
Aug 30, 2018
Merged

Feature/additional hw wallets #57

merged 116 commits into from
Aug 30, 2018

Commits on Aug 21, 2018

  1. checkpoint

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

  2. custom node works, transactions are sending

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

  3. move store logic to actions

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

  4. override specific web3 methods

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

  5. checkpoint

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

  6. Override specific web3 methods and begin integrating ledger support

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

  7. implement an event hub for web3 related notifications

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

  8. chore(package): update postcss-loader to version 3.0.0

    @greenkeeper @SteveMieskoski
    greenkeeper[bot] authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    4fc17ba View commit details
    Browse the repository at this point in the history

  9. Add network types, fetch tokens and contracts on build

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    516c6bd View commit details
    Browse the repository at this point in the history

  10. Add nodes from mew

    @gamalielhere @SteveMieskoski
    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

  11. fix for contracts single quote invalid json

    @kvhnuke @SteveMieskoski
    kvhnuke authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    52dc08e View commit details
    Browse the repository at this point in the history

  12. revert, fixed json files at ethereum-lists

    @kvhnuke @SteveMieskoski
    kvhnuke authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    36f476b View commit details
    Browse the repository at this point in the history

  13. Update changelog

    @gamalielhere @SteveMieskoski
    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

  14. Move contracts and tokens into source, use @ for path, use es6 import

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    040a741 View commit details
    Browse the repository at this point in the history

  15. Rebuild

    @gamalielhere @SteveMieskoski
    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

  16. Rename akroma file, import arrays instead of modules

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    ccbe0ed View commit details
    Browse the repository at this point in the history

  17. Remove hardcoded token, clean up

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    a654595 View commit details
    Browse the repository at this point in the history

  18. Package-json.lock update

    @gamalielhere @SteveMieskoski
    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

  19. Initial setup

    @gamalielhere @SteveMieskoski
    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

  20. eventHub to intercept signing actions and display confirm modal

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

  21. web3 eth.sign, eth.signTransaction, and related in wallet overridden

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

  22. merged in feature/contract

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

  23. signTransaction and signMessage working with Ledger

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

  24. update changelog

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

  25. cleanup of ledgerWallet and web3-wallet-adapter. Add HwWallet interface

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

  26. retrieve Trezor addresses, and signTransaction functioning

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

  27. some clean-up

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

  28. retrieve, display, select a existing derivation path basic operation

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

  29. sign message with trezor

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

  30. sign message with trezor

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

  31. clean-up

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

  32. clean-up

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

  33. begin mewConnect Integration

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

  34. setup mewConnect instance, display qrcode

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

  35. MEWconnect signTransaction works

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

  36. investigate signMessage failure

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

  37. confirm dialog on signMessage

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

  38. Add network types, fetch tokens and contracts on build

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    4522ce8 View commit details
    Browse the repository at this point in the history

  39. Update changelog

    @gamalielhere @SteveMieskoski
    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

  40. Move contracts and tokens into source, use @ for path, use es6 import

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    91cf2a6 View commit details
    Browse the repository at this point in the history

  41. Rename akroma file, import arrays instead of modules

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    2b8f808 View commit details
    Browse the repository at this point in the history

  42. chore(package): update postcss-url to version 8.0.0

    @greenkeeper @SteveMieskoski
    greenkeeper[bot] authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    f203f74 View commit details
    Browse the repository at this point in the history

  43. Add kosala fixes

    @gamalielhere @SteveMieskoski
    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

  44. Minor refactor on some functions

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    b1a76be View commit details
    Browse the repository at this point in the history

  45. Add ETHO and PIRL nodes

    @gamalielhere @SteveMieskoski
    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

  46. Initial setup

    @gamalielhere @SteveMieskoski
    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

  47. Deploy contract done, some minor catches

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    dcc2ffa View commit details
    Browse the repository at this point in the history

  48. Keep gas before signing

    @gamalielhere @SteveMieskoski
    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

  49. Some cleanup for notifications, Initial interact with contract

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    5210ceb View commit details
    Browse the repository at this point in the history

  50. Add abi validations, add outside click directive

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    6613b90 View commit details
    Browse the repository at this point in the history

  51. Progress

    @gamalielhere @SteveMieskoski
    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

  52. Render inputs when needed

    @gamalielhere @SteveMieskoski
    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

  53. Finish input rendering, start actual method calls

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    a416121 View commit details
    Browse the repository at this point in the history

  54. Implement read functions

    @gamalielhere @SteveMieskoski
    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

  55. Implement interacting with contract

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    9645df3 View commit details
    Browse the repository at this point in the history

  56. Update changelog

    @gamalielhere @SteveMieskoski
    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

  57. Hide read button when no input, leave example

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    b41faad View commit details
    Browse the repository at this point in the history

  58. Add network types, fetch tokens and contracts on build

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    71aa924 View commit details
    Browse the repository at this point in the history

  59. Move contracts and tokens into source, use @ for path, use es6 import

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    4a664ef View commit details
    Browse the repository at this point in the history

  60. Rename akroma file, import arrays instead of modules

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    483007b View commit details
    Browse the repository at this point in the history

  61. Add network logos

    @gamalielhere @SteveMieskoski
    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

  62. Change dot colors based on brand color

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    b03749e View commit details
    Browse the repository at this point in the history

  63. Include recommended on eslint config

    @gamalielhere @SteveMieskoski
    gamalielhere authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    239582a View commit details
    Browse the repository at this point in the history

  64. Remove recommended

    @gamalielhere @SteveMieskoski
    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

  65. Cleanup linter errors

    @gamalielhere @SteveMieskoski
    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

  66. Start work on verifymsg

    @gamalielhere @SteveMieskoski
    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

  67. Add toBuffer function

    @gamalielhere @SteveMieskoski
    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

  68. Let user verify

    @gamalielhere @SteveMieskoski
    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

  69. Move Confirmation, and Success Modals into ConfirmationContainer, add… 

    … sign message modal
    @SteveMieskoski
    SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    82b7fda View commit details
    Browse the repository at this point in the history

  70. Fix Es Lint Errors

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

  71. Fix Es Lint Errors

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

  72. persistent ledger connection

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

  73. ledger does not emit when device is disconnected, unless a call is made

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

  74. pre-mega merge

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

  75. Fix notification and blockie not appearing after wallet unlock, and l… 

    …ocalstorage not having a locale item
    @SteveMieskoski
    SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    bcdd082 View commit details
    Browse the repository at this point in the history

  76. chore(package): update eslint-plugin-promise to version 4.0.0

    @greenkeeper @SteveMieskoski
    greenkeeper[bot] authored and SteveMieskoski committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    39fb85a View commit details
    Browse the repository at this point in the history

  77. remove console logs, commented code, get gas lmt before cntrct deply

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

  78. clean up Mnemonic wallet

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

  79. bloody git

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

  80. bloody git

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

  81. bloody git 3

    @SteveMieskoski
    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. rectify issues from rebase

    @SteveMieskoski
    SteveMieskoski committed Aug 22, 2018
    1 Configuration menu
    Copy the full SHA
    a9e2e3e View commit details
    Browse the repository at this point in the history

  2. trying to get bitbox for dev

    @SteveMieskoski
    SteveMieskoski committed Aug 22, 2018
    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
    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
    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. Fix error with bn.js when getting initial Balance for custom token

    @SteveMieskoski
    SteveMieskoski committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    6959ba2 View commit details
    Browse the repository at this point in the history

  4. add custom dpath, restructure network distribution and path identific… 

    …ation
    @SteveMieskoski
    SteveMieskoski committed Aug 23, 2018
    1 Configuration menu
    Copy the full SHA
    31bb628 View commit details
    Browse the repository at this point in the history

  5. generateTX confirm message without success modal

    @SteveMieskoski
    SteveMieskoski committed Aug 23, 2018
    1 Configuration menu
    Copy the full SHA
    2baa47d View commit details
    Browse the repository at this point in the history

  6. check ledger version with non-standard chains

    @SteveMieskoski
    SteveMieskoski committed Aug 23, 2018
    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
    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
    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. Move u2f to utils, implement secalot hw

    @gamalielhere
    gamalielhere committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    59965d4 View commit details
    Browse the repository at this point in the history

  4. address pagination and check

    @SteveMieskoski
    SteveMieskoski committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    cd8147a View commit details
    Browse the repository at this point in the history

  5. Finish Secalot setup, use Buffer.alloc in proper ctx

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

  6. update deterministic paths

    @SteveMieskoski
    SteveMieskoski committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    9b81f8f View commit details
    Browse the repository at this point in the history

  7. Rewrite networks

    @gamalielhere
    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. Cleanup on secalot implementation

    @gamalielhere
    gamalielhere committed Aug 24, 2018
    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. update deterministic paths, click on address select, separate out cus… 

    …tom networks
    @SteveMieskoski
    SteveMieskoski committed Aug 26, 2018
    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
    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. pagination buttons operating properly

    @SteveMieskoski
    SteveMieskoski committed Aug 26, 2018
    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
    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. Built out of network and address modal features

    @SteveMieskoski
    SteveMieskoski committed Aug 27, 2018
    Configuration menu
    Copy the full SHA
    427d119 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2018

  1. clean and prepare for merge

    @SteveMieskoski
    SteveMieskoski committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    6e05f02 View commit details
    Browse the repository at this point in the history

  2. clean and prepare for merge

    @SteveMieskoski
    SteveMieskoski committed Aug 29, 2018
    1 Configuration menu
    Copy the full SHA
    464337c View commit details
    Browse the repository at this point in the history

  3. clean and 'merge' longest branch

    @SteveMieskoski
    SteveMieskoski committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    64e1dab View commit details
    Browse the repository at this point in the history

  4. clean

    @SteveMieskoski
    SteveMieskoski committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    2fa9399 View commit details
    Browse the repository at this point in the history

  5. clean and huskiefy

    @SteveMieskoski
    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

  6. 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
    SteveMieskoski committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    71d46cf View commit details
    Browse the repository at this point in the history

  7. merge in longest branch

    @SteveMieskoski
    SteveMieskoski committed Aug 29, 2018
    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
    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
    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 conflict

    @gamalielhere
    gamalielhere committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    9cfda57 View commit details
    Browse the repository at this point in the history

  4. Fix sign message

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

  5. Fix sign

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

  6. Fix sign

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

  7. Add websocket package

    @gamalielhere
    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