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

#465 remove transwiser reference #475

Merged
merged 17 commits into from
Oct 1, 2017
Merged

#465 remove transwiser reference #475

merged 17 commits into from
Oct 1, 2017

Commits on Jul 17, 2017

  1. Update README.md

    @happyconcepts
    happyconcepts authored Jul 17, 2017
    Configuration menu
    Copy the full SHA
    0c5270b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from happyconcepts/happyconcepts-patch-1 

    Update README.md - correct spelling of webpack dependency
    @happyconcepts
    happyconcepts authored Jul 17, 2017
    Configuration menu
    Copy the full SHA
    c55e8eb View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2017

  1. Merge branch 'bitshares' of https://github.com/bitshares/bitshares-ui … 

    …into bitshares
    @happyconcepts
    happyconcepts committed Aug 23, 2017
    Configuration menu
    Copy the full SHA
    7aa09f7 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2017

  1. Merge remote-tracking branch 'upstream/bitshares' into bitshares

    @happyconcepts
    happyconcepts committed Aug 24, 2017
    Configuration menu
    Copy the full SHA
    b353d34 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2017

  1. Merge branch 'bitshares' of https://github.com/bitshares/bitshares-ui … 

    …into bitshares
    @happyconcepts
    happyconcepts committed Aug 29, 2017
    Configuration menu
    Copy the full SHA
    3c0c8f6 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2017

  1. Merge remote-tracking branch 'upstream/bitshares' into bitshares

    @happyconcepts
    happyconcepts committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    3df0286 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2017

  1. Merge branch 'bitshares' of https://github.com/bitshares/bitshares-ui … 

    …into bitshares
    @happyconcepts
    happyconcepts committed Sep 6, 2017
    Configuration menu
    Copy the full SHA
    2ae4336 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/bitshares' into bitshares

    @happyconcepts
    happyconcepts committed Sep 6, 2017
    Configuration menu
    Copy the full SHA
    c67c2b1 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2017

  1. Merge branch 'bitshares' of https://github.com/bitshares/bitshares-ui … 

    …into bitshares
    @happyconcepts
    happyconcepts committed Sep 11, 2017
    Configuration menu
    Copy the full SHA
    9d090d2 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2017

  1. Issue 315 - Add Chart Clamp To Settings Dropdown (bitshares#373) 

    * Add Chart Clamp To Settings Dropdown

* Removed Unused Variable

Merging as is and then we'll see about handling the redraw bug in the next sprint.
    @fletchertyler914 @svk31
    fletchertyler914 authored and svk31 committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    4b5e84c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bitshares' of https://github.com/bitshares/bitshares-ui … 

    …into bitshares
    @happyconcepts
    happyconcepts committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    a6dfafb View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/bitshares/bitshares-ui

    @happyconcepts
    happyconcepts committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    9929753 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2017

  1. Merge branch 'staging' of https://github.com/bitshares/bitshares-ui i… 

    …nto staging
    @happyconcepts
    happyconcepts committed Sep 19, 2017
    Configuration menu
    Copy the full SHA
    ecbf26c View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2017

  1. Sync/Merge branch 'staging' of https://github.com/bitshares/bitshares-ui 

     into staging
    @happyconcepts
    happyconcepts committed Sep 21, 2017
    Configuration menu
    Copy the full SHA
    d6b99d4 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2017

  1. Merge branch 'staging' of https://github.com/bitshares/bitshares-ui i… 

    …nto staging
    @happyconcepts
    happyconcepts committed Sep 26, 2017
    Configuration menu
    Copy the full SHA
    cfe729f View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2017

  1. Merge branch 'staging' of https://github.com/bitshares/bitshares-ui i… 

    …nto staging
    @happyconcepts
    happyconcepts committed Oct 1, 2017
    Configuration menu
    Copy the full SHA
    6900473 View commit details
    Browse the repository at this point in the history

  2. remove Transwiser reference per bitshares#465

    @happyconcepts
    happyconcepts committed Oct 1, 2017
    Configuration menu
    Copy the full SHA
    6053bca View commit details
    Browse the repository at this point in the history