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

Merge v1.1.3 (Publically Released Version) to Master #8

Merged
merged 87 commits into from Jul 12, 2018
Merged

Merge v1.1.3 (Publically Released Version) to Master #8

merged 87 commits into from Jul 12, 2018

Commits on May 24, 2018

  1. wip

    @crishellco
    crishellco committed May 24, 2018
    Copy the full SHA
    3cbdb2a View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2018

  1. wip

    @crishellco
    crishellco committed Jun 11, 2018
    Copy the full SHA
    013ab3d View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2018

  1. wip

    @crishellco
    crishellco committed Jun 12, 2018
    Copy the full SHA
    1eed173 View commit details
    Browse the repository at this point in the history

  2. remove .history

    @crishellco
    crishellco committed Jun 12, 2018
    Copy the full SHA
    47e0fe8 View commit details
    Browse the repository at this point in the history

  3. updates gitignore

    @crishellco
    crishellco committed Jun 12, 2018
    Copy the full SHA
    b0815ba View commit details
    Browse the repository at this point in the history

  4. wip

    @crishellco
    crishellco committed Jun 12, 2018
    Copy the full SHA
    06a4254 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2018

  1. wip

    @crishellco
    crishellco committed Jun 13, 2018
    Copy the full SHA
    1d497a6 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2018

  1. Get things building for my testing.

    Jeff Solinsky committed Jun 14, 2018
    Copy the full SHA
    a677fe1 View commit details
    Browse the repository at this point in the history

  2. wip

    @crishellco
    crishellco committed Jun 14, 2018
    Copy the full SHA
    7b80baa View commit details
    Browse the repository at this point in the history

  3. wip

    @crishellco
    crishellco committed Jun 14, 2018
    Copy the full SHA
    52ce391 View commit details
    Browse the repository at this point in the history

  4. lint

    @crishellco
    crishellco committed Jun 14, 2018
    Copy the full SHA
    ef60dfb View commit details
    Browse the repository at this point in the history

  5. wip

    @crishellco
    crishellco committed Jun 14, 2018
    Copy the full SHA
    6823a0f View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2018

  1. wip

    @crishellco
    crishellco committed Jun 15, 2018
    Copy the full SHA
    4bcb731 View commit details
    Browse the repository at this point in the history

  2. wip

    @crishellco
    crishellco committed Jun 15, 2018
    Copy the full SHA
    9a5da40 View commit details
    Browse the repository at this point in the history

  3. wip

    @crishellco
    crishellco committed Jun 15, 2018
    Copy the full SHA
    9cf2ce1 View commit details
    Browse the repository at this point in the history

  4. wip

    @crishellco
    crishellco committed Jun 15, 2018
    Copy the full SHA
    f7c6ff5 View commit details
    Browse the repository at this point in the history

  5. wip

    @crishellco
    crishellco committed Jun 15, 2018
    Copy the full SHA
    4f97cbd View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2018

  1. wip

    @crishellco
    crishellco committed Jun 16, 2018
    Copy the full SHA
    8b63d18 View commit details
    Browse the repository at this point in the history

  2. wip

    @crishellco
    crishellco committed Jun 16, 2018
    Copy the full SHA
    b51b510 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2018

  1. wip

    @crishellco
    crishellco committed Jun 17, 2018
    Copy the full SHA
    9ae222b View commit details
    Browse the repository at this point in the history

  2. wip

    @crishellco
    crishellco committed Jun 17, 2018
    Copy the full SHA
    9f2d786 View commit details
    Browse the repository at this point in the history

  3. wip

    @crishellco
    crishellco committed Jun 17, 2018
    Copy the full SHA
    df5d243 View commit details
    Browse the repository at this point in the history

  4. wip

    @crishellco
    crishellco committed Jun 17, 2018
    Copy the full SHA
    2538a72 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2018

  1. wip

    @crishellco
    crishellco committed Jun 19, 2018
    Copy the full SHA
    9527fcf View commit details
    Browse the repository at this point in the history

  2. wip

    @crishellco
    crishellco committed Jun 19, 2018
    Copy the full SHA
    7128a48 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2018

  1. wip

    @crishellco
    crishellco committed Jun 20, 2018
    Copy the full SHA
    abc6cb2 View commit details
    Browse the repository at this point in the history

  2. wip

    @crishellco
    crishellco committed Jun 20, 2018
    Copy the full SHA
    732b16a View commit details
    Browse the repository at this point in the history

  3. wip

    @crishellco
    crishellco committed Jun 20, 2018
    Copy the full SHA
    05c54e0 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2018

  1. wip

    @crishellco
    crishellco committed Jun 21, 2018
    Copy the full SHA
    4447d1a View commit details
    Browse the repository at this point in the history

  2. wip

    @crishellco
    crishellco committed Jun 21, 2018
    Copy the full SHA
    9506ebd View commit details
    Browse the repository at this point in the history

  3. wip

    @crishellco
    crishellco committed Jun 21, 2018
    Copy the full SHA
    6521d85 View commit details
    Browse the repository at this point in the history

  4. wip

    @crishellco
    crishellco committed Jun 21, 2018
    Copy the full SHA
    20beb60 View commit details
    Browse the repository at this point in the history

  5. wip

    @crishellco
    crishellco committed Jun 21, 2018
    Copy the full SHA
    6affa02 View commit details
    Browse the repository at this point in the history

  6. wip

    @crishellco
    crishellco committed Jun 21, 2018
    Copy the full SHA
    0117fc7 View commit details
    Browse the repository at this point in the history

  7. wip

    @crishellco
    crishellco committed Jun 21, 2018
    Copy the full SHA
    7eb5c7e View commit details
    Browse the repository at this point in the history

  8. wip

    @crishellco
    crishellco committed Jun 21, 2018
    Copy the full SHA
    1dca911 View commit details
    Browse the repository at this point in the history

  9. wip

    @crishellco
    crishellco committed Jun 21, 2018
    Copy the full SHA
    7a5da40 View commit details
    Browse the repository at this point in the history

  10. Get things building for my testing.

    Jeff Solinsky committed Jun 21, 2018
    Copy the full SHA
    24fb3c6 View commit details
    Browse the repository at this point in the history

  11. Minor adjustments to build cleanly.

    Jeff Solinsky committed Jun 21, 2018
    Copy the full SHA
    354025d View commit details
    Browse the repository at this point in the history

  12. Merge branch 'jeff' of https://github.com/aphtoken/aph-mobile-wallet … 

    …into jeff

Conflicts:
	package-lock.json
	src/components/login/Saved.vue
    Jeff Solinsky committed Jun 21, 2018
    Copy the full SHA
    504b6c4 View commit details
    Browse the repository at this point in the history

  13. Fix one more compile error.

    Jeff Solinsky committed Jun 21, 2018
    Copy the full SHA
    522207d View commit details
    Browse the repository at this point in the history

  14. Poll recent transactions during Gas claim

    @jameswhollister
    jameswhollister committed Jun 21, 2018
    Copy the full SHA
    db87de0 View commit details
    Browse the repository at this point in the history

  15. wip

    @crishellco
    crishellco committed Jun 21, 2018
    Copy the full SHA
    4656705 View commit details
    Browse the repository at this point in the history

  16. wip

    @crishellco
    crishellco committed Jun 21, 2018
    Copy the full SHA
    9c87cbe View commit details
    Browse the repository at this point in the history

  17. wip

    @crishellco
    crishellco committed Jun 21, 2018
    Copy the full SHA
    9e2ae56 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'cm' into jeff

    Jeff Solinsky committed Jun 21, 2018
    Copy the full SHA
    41b3740 View commit details
    Browse the repository at this point in the history

  19. Revert "Poll recent transactions during Gas claim" 

    This reverts commit db87de0.
    Jeff Solinsky committed Jun 21, 2018
    Copy the full SHA
    5acbcbc View commit details
    Browse the repository at this point in the history

  20. wip

    @crishellco
    crishellco committed Jun 21, 2018
    Copy the full SHA
    a8353f0 View commit details
    Browse the repository at this point in the history

  21. wip

    @crishellco
    crishellco committed Jun 21, 2018
    Copy the full SHA
    521b83d View commit details
    Browse the repository at this point in the history

  22. Merge branch 'cm' into jeff

    Jeff Solinsky committed Jun 21, 2018
    Copy the full SHA
    f3f5d1a View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2018

  1. wip

    @crishellco
    crishellco committed Jun 22, 2018
    Copy the full SHA
    1ca3fa2 View commit details
    Browse the repository at this point in the history

  2. wip

    @crishellco
    crishellco committed Jun 22, 2018
    Copy the full SHA
    3e3f6f3 View commit details
    Browse the repository at this point in the history

  3. wip

    @crishellco
    crishellco committed Jun 22, 2018
    Copy the full SHA
    f2a9197 View commit details
    Browse the repository at this point in the history

  4. wip

    @crishellco
    crishellco committed Jun 22, 2018
    Copy the full SHA
    e35419a View commit details
    Browse the repository at this point in the history

  5. wip

    @crishellco
    crishellco committed Jun 22, 2018
    Copy the full SHA
    3bffd76 View commit details
    Browse the repository at this point in the history

  6. wip

    @crishellco
    crishellco committed Jun 22, 2018
    Copy the full SHA
    650f2d0 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'cm' into jeff 

    Conflicts:
	package-lock.json
    Jeff Solinsky committed Jun 22, 2018
    Copy the full SHA
    fd54aae View commit details
    Browse the repository at this point in the history

  8. Fix lint.

    Jeff Solinsky committed Jun 22, 2018
    Copy the full SHA
    3e54f01 View commit details
    Browse the repository at this point in the history

  9. Update package-lock.json

    Jeff Solinsky committed Jun 22, 2018
    Copy the full SHA
    96ec8d9 View commit details
    Browse the repository at this point in the history

  10. Fix disabling send button and reset the send dialog for the next send.

    Jeff Solinsky committed Jun 22, 2018
    Copy the full SHA
    dbfad71 View commit details
    Browse the repository at this point in the history

  11. Start adding support for switch to log in with a different wallet on … 

    …start-up.
    Jeff Solinsky committed Jun 22, 2018
    Copy the full SHA
    3c6e941 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #2 from aphtoken/jeff 

    Fix disabling send button and other lint fixes
    @crishellco
    crishellco committed Jun 22, 2018
    Copy the full SHA
    158c671 View commit details
    Browse the repository at this point in the history

  13. wip

    @crishellco
    crishellco committed Jun 22, 2018
    Copy the full SHA
    7faf8d0 View commit details
    Browse the repository at this point in the history

  14. wip

    @crishellco
    crishellco committed Jun 22, 2018
    Copy the full SHA
    6bb5cfd View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2018

  1. Clean up handling of tokens, balances and transaction details.

    Jeff Solinsky committed Jun 23, 2018
    Copy the full SHA
    89feb5b View commit details
    Browse the repository at this point in the history

  2. Update version.

    Jeff Solinsky committed Jun 23, 2018
    Copy the full SHA
    058c82c View commit details
    Browse the repository at this point in the history

  3. wip

    @crishellco
    crishellco committed Jun 23, 2018
    Copy the full SHA
    f3617ab View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2018

  1. Merge branch 'cm' of https://github.com/aphtoken/aph-mobile-wallet in… 

    …to cm
    @crishellco
    crishellco committed Jun 24, 2018
    Copy the full SHA
    ff4499e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from aphtoken/cm 

    CM Branch
    @crishellco
    crishellco committed Jun 24, 2018
    Copy the full SHA
    3eea692 View commit details
    Browse the repository at this point in the history

  3. fixes holding @click handler

    @crishellco
    crishellco committed Jun 24, 2018
    Copy the full SHA
    dc0708d View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2018

  1. wip

    @crishellco
    crishellco committed Jun 25, 2018
    Copy the full SHA
    9af63cc View commit details
    Browse the repository at this point in the history

  2. wip

    @crishellco
    crishellco committed Jun 25, 2018
    Copy the full SHA
    b40123e View commit details
    Browse the repository at this point in the history

  3. wip

    @crishellco
    crishellco committed Jun 25, 2018
    Copy the full SHA
    12cf8b1 View commit details
    Browse the repository at this point in the history

  4. wip

    @crishellco
    crishellco committed Jun 25, 2018
    Copy the full SHA
    4c8580e View commit details
    Browse the repository at this point in the history

  5. fixes copy text z-index

    @crishellco
    crishellco committed Jun 25, 2018
    Copy the full SHA
    7e16a62 View commit details
    Browse the repository at this point in the history

  6. fixes backup wallet showing on reload

    @crishellco
    crishellco committed Jun 25, 2018
    Copy the full SHA
    db26796 View commit details
    Browse the repository at this point in the history

  7. delete wallet

    @crishellco
    crishellco committed Jun 25, 2018
    Copy the full SHA
    a81f95a View commit details
    Browse the repository at this point in the history

  8. actions overflow and border-radius

    @crishellco
    crishellco committed Jun 25, 2018
    Copy the full SHA
    44addb0 View commit details
    Browse the repository at this point in the history

  9. version bumpt o 1.1.0

    Jeff Solinsky committed Jun 25, 2018
    Copy the full SHA
    2b1eb4f View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2018

  1. Eager Load Background Images (#4)

    @crishellco
    crishellco committed Jun 27, 2018
    Copy the full SHA
    97e07a2 View commit details
    Browse the repository at this point in the history

  2. [Import] Passphrase Confirm (#5)

    @crishellco
    crishellco committed Jun 27, 2018
    Copy the full SHA
    c908c2f View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2018

  1. [Import] Passphrase Confirm (#6)

    @crishellco
    crishellco committed Jun 28, 2018
    Copy the full SHA
    6750183 View commit details
    Browse the repository at this point in the history

  2. Cut 1.1.1

    Jeff Solinsky committed Jun 28, 2018
    Copy the full SHA
    6246a28 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2018

  1. Fix tokenExists method of tokens.js and improve performance of fetchN… 

    …ep5Tokens(). (#7)
    @jsolman
    jsolman committed Jul 3, 2018
    Copy the full SHA
    ad42621 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2018

  1. Fetch tokens when switching networks. Fix bug when fetching tokens.

    Jeff Solinsky committed Jul 4, 2018
    Copy the full SHA
    4090ea1 View commit details
    Browse the repository at this point in the history

  2. Cut 1.1.2

    Jeff Solinsky committed Jul 4, 2018
    Copy the full SHA
    4f9b4d7 View commit details
    Browse the repository at this point in the history

  3. Fix Fetching Nep5Tokens on switching networks. Cut 1.1.3

    Jeff Solinsky committed Jul 4, 2018
    Copy the full SHA
    3231a67 View commit details
    Browse the repository at this point in the history