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

Map responds to controls #253

Merged
merged 20 commits into from
Mar 17, 2017
Merged

Map responds to controls #253

merged 20 commits into from
Mar 17, 2017

Commits on Mar 13, 2017

  1. add history and redux to package json

    @colinmegill
    colinmegill committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    5df5e84 View commit details
    Browse the repository at this point in the history

  2. cleanup white space

    @colinmegill
    colinmegill committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    defe1a5 View commit details
    Browse the repository at this point in the history

  3. map listens to tip visibility

    @colinmegill
    colinmegill committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    61a9d5e View commit details
    Browse the repository at this point in the history

  4. tip visibility passed to lat longs

    @colinmegill
    colinmegill committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    1c92b5e View commit details
    Browse the repository at this point in the history

  5. tip visibility arg to lat longs

    @colinmegill
    colinmegill committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    6dc8550 View commit details
    Browse the repository at this point in the history

  6. tips listen for 'hidden' state in nodes

    @colinmegill
    colinmegill committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    d4180aa View commit details
    Browse the repository at this point in the history

  7. transmissions listen for 'hidden' state in children

    @colinmegill
    colinmegill committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    ade263d View commit details
    Browse the repository at this point in the history

  8. simplify / abstract d3 dom removal code

    @colinmegill
    colinmegill committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    a838345 View commit details
    Browse the repository at this point in the history

  9. abstract and simply conditions on which we draw demes

    @colinmegill
    colinmegill committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    e06c630 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2017

  1. tipVisibility valid for internal nodes & so are transmissions

    @jameshadfield
    jameshadfield committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    7dc1244 View commit details
    Browse the repository at this point in the history

  2. branch thicknesses only if visibile

    @jameshadfield
    jameshadfield committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    144592a View commit details
    Browse the repository at this point in the history

  3. tipVisibility is now visibility as it applies to internal nodes as well

    @jameshadfield
    jameshadfield committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    04da1f0 View commit details
    Browse the repository at this point in the history

  4. filtering traces branches to root, dates are slice-like 

    The filtering (e.g. author) takes all tips in view and traces them to the root. Dmin/DMax are hard slices - they cut off branches outside of these bounds. This naturally affects transmissions & demes on the map
    @jameshadfield
    jameshadfield committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    f997d14 View commit details
    Browse the repository at this point in the history

  5. clean up treeHelpers (comments etc)

    @jameshadfield
    jameshadfield committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    5741b19 View commit details
    Browse the repository at this point in the history

  6. visibility fixed for tip selected modal

    @jameshadfield
    jameshadfield committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    ed8296c View commit details
    Browse the repository at this point in the history

  7. node attr "tip-visible" removed

    @jameshadfield
    jameshadfield committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    7e5461f View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2017

  1. debugging console.log statements

    @jameshadfield
    jameshadfield committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    07b7c29 View commit details
    Browse the repository at this point in the history

  2. use prevprops rather than version, change every time

    @colinmegill
    colinmegill committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    df0b6ef View commit details
    Browse the repository at this point in the history

  3. Revert "debugging console.log statements" 

    This reverts commit 07b7c29.
    @jameshadfield
    jameshadfield committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    74f032e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into controls-to-map 

    * master:
  Fix bug with display of genotype colorby control
  tip modal click behavior. closes #252
  Map colors by genotype. Fixes #220.
  version bump to 1.1.2 for release
  add gates tweet
    @jameshadfield
    jameshadfield committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    c92b0fd View commit details
    Browse the repository at this point in the history