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

Shear UI #505

Merged
merged 75 commits into from
Jul 17, 2021
Merged

Shear UI #505

merged 75 commits into from
Jul 17, 2021

Commits on Mar 1, 2021

  1. bp shear

    @kwcantrell
    kwcantrell committed Mar 1, 2021
    Configuration menu
    Copy the full SHA
    cbf4060 View commit details
    Browse the repository at this point in the history

  2. style fix

    @kwcantrell
    kwcantrell committed Mar 1, 2021
    Configuration menu
    Copy the full SHA
    227ec29 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2021

  1. checkpoint

    @kwcantrell
    kwcantrell committed Mar 6, 2021
    Configuration menu
    Copy the full SHA
    66c2e56 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2021

  1. checkpoint

    @kwcantrell
    kwcantrell committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    1183aa7 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2021

  1. Finished TreeController

    @kwcantrell
    kwcantrell committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    eafbea3 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2021

  1. tree-controller

    @kwcantrell
    kwcantrell committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    7301e82 View commit details
    Browse the repository at this point in the history

  2. merged with master

    @kwcantrell
    kwcantrell committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    888cf72 View commit details
    Browse the repository at this point in the history

  3. fix doc issue

    @kwcantrell
    kwcantrell committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    f4f668f View commit details
    Browse the repository at this point in the history

  4. style fix

    @kwcantrell
    kwcantrell committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    a408326 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2021

  1. Apply suggestions from code review 

    merged @ElDeveloper's suggestions

Co-authored-by: Yoshiki Vázquez Baeza <[email protected]>
    @kwcantrell @ElDeveloper
    kwcantrell and ElDeveloper authored Mar 19, 2021
    Configuration menu
    Copy the full SHA
    b043826 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/biocore/empress into tree… 

    …-controller
    @kwcantrell
    kwcantrell committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    caa916e View commit details
    Browse the repository at this point in the history

  3. fix style

    @kwcantrell
    kwcantrell committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    f598928 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2021

  1. addressed comments

    @kwcantrell
    kwcantrell committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    5ca5809 View commit details
    Browse the repository at this point in the history

  2. removed shear

    @kwcantrell
    kwcantrell committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    89a4326 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2021

  1. start ui

    @kwcantrell
    kwcantrell committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    654df69 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2021

  1. finished basic shear ui

    @kwcantrell
    kwcantrell committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    d6aa515 View commit details
    Browse the repository at this point in the history

  2. fixed test issue

    @kwcantrell
    kwcantrell committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    de01d93 View commit details
    Browse the repository at this point in the history

  3. removed old comments

    @kwcantrell
    kwcantrell committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    fcb6b5b View commit details
    Browse the repository at this point in the history

  4. merged master

    @kwcantrell
    kwcantrell committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    55f6f7e View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2021

  1. Apply suggestions from code review 

    added some suggestions by @ElDeveloper and @fedarko

Co-authored-by: Marcus Fedarko <[email protected]>
Co-authored-by: Yoshiki Vázquez Baeza <[email protected]>
    @kwcantrell @fedarko @ElDeveloper
    3 people authored Mar 30, 2021
    Configuration menu
    Copy the full SHA
    b3acbd1 View commit details
    Browse the repository at this point in the history

  2. started addressing PR suggestions

    @kwcantrell
    kwcantrell committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    263dd6a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'shear-ui' of https://github.com/kwcantrell/empress into… 

    … shear-ui
    @kwcantrell
    kwcantrell committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    5bb8729 View commit details
    Browse the repository at this point in the history

  4. fixed style

    @kwcantrell
    kwcantrell committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    68d0d63 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2021

  1. still addressing comments

    @kwcantrell
    kwcantrell committed Apr 1, 2021
    Configuration menu
    Copy the full SHA
    603bf97 View commit details
    Browse the repository at this point in the history

  2. fixed style

    @kwcantrell
    kwcantrell committed Apr 1, 2021
    Configuration menu
    Copy the full SHA
    31b5af3 View commit details
    Browse the repository at this point in the history

  3. fix unselect all

    @kwcantrell
    kwcantrell committed Apr 1, 2021
    Configuration menu
    Copy the full SHA
    7f56e68 View commit details
    Browse the repository at this point in the history

  4. Fixed unselect all for circ layout

    @kwcantrell
    kwcantrell committed Apr 1, 2021
    Configuration menu
    Copy the full SHA
    9a9bb75 View commit details
    Browse the repository at this point in the history

  5. fixed issue were tree disappears if all tips sheared

    @kwcantrell
    kwcantrell committed Apr 1, 2021
    Configuration menu
    Copy the full SHA
    9dc26bc View commit details
    Browse the repository at this point in the history

  6. check point

    @kwcantrell
    kwcantrell committed Apr 1, 2021
    Configuration menu
    Copy the full SHA
    4445ebd View commit details
    Browse the repository at this point in the history

  7. fixed clade collapse

    @kwcantrell
    kwcantrell committed Apr 1, 2021
    Configuration menu
    Copy the full SHA
    15f81ab View commit details
    Browse the repository at this point in the history

  8. fixed style

    @kwcantrell
    kwcantrell committed Apr 1, 2021
    Configuration menu
    Copy the full SHA
    4630689 View commit details
    Browse the repository at this point in the history

  9. fixed test

    @kwcantrell
    kwcantrell committed Apr 1, 2021
    Configuration menu
    Copy the full SHA
    73892fd View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2021

  1. fixed no biom error

    @kwcantrell
    kwcantrell committed Apr 2, 2021
    Configuration menu
    Copy the full SHA
    3ca595e View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2021

  1. checkpoint

    @kwcantrell
    kwcantrell committed Apr 6, 2021
    Configuration menu
    Copy the full SHA
    66e5ded View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2021

  1. performance improvemens

    @kwcantrell
    kwcantrell committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    9eb4243 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2021

  1. merged master

    @kwcantrell
    kwcantrell committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    e3d128f View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2021

  1. finished documenting

    @kwcantrell
    kwcantrell committed Apr 9, 2021
    Configuration menu
    Copy the full SHA
    4b4d8e3 View commit details
    Browse the repository at this point in the history

  2. style fix

    @kwcantrell
    kwcantrell committed Apr 9, 2021
    Configuration menu
    Copy the full SHA
    3d05f17 View commit details
    Browse the repository at this point in the history

  3. added warning to shear

    @kwcantrell
    kwcantrell committed Apr 9, 2021
    Configuration menu
    Copy the full SHA
    d909e83 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2021

  1. Major performance increase!

    @kwcantrell
    kwcantrell committed Apr 11, 2021
    Configuration menu
    Copy the full SHA
    3b6d854 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2021

  1. Apply suggestions from code review 

    added @ElDeveloper's suggestions

Co-authored-by: Yoshiki Vázquez Baeza <[email protected]>
    @kwcantrell @ElDeveloper
    kwcantrell and ElDeveloper authored Apr 12, 2021
    Configuration menu
    Copy the full SHA
    0803dc0 View commit details
    Browse the repository at this point in the history

  2. fix style

    @kwcantrell
    kwcantrell committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    cc754e9 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2021

  1. Add warning message to shear panel

    @kwcantrell
    kwcantrell committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    3a2eede View commit details
    Browse the repository at this point in the history

Commits on May 4, 2021

  1. starting addressing @fedarko's comments

    @kwcantrell
    kwcantrell committed May 4, 2021
    Configuration menu
    Copy the full SHA
    95392a5 View commit details
    Browse the repository at this point in the history

  2. addressed @fedarko's comments

    @kwcantrell
    kwcantrell committed May 4, 2021
    Configuration menu
    Copy the full SHA
    45e2d49 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/biocore/empress into shea… 

    …r-ui
    @kwcantrell
    kwcantrell committed May 4, 2021
    Configuration menu
    Copy the full SHA
    3570a19 View commit details
    Browse the repository at this point in the history

  4. fix test

    @kwcantrell
    kwcantrell committed May 4, 2021
    Configuration menu
    Copy the full SHA
    e78ecd1 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2021

  1. Apply suggestions from code review 

    add suggestion from @fedarko

Co-authored-by: Marcus Fedarko <[email protected]>
    @kwcantrell @fedarko
    kwcantrell and fedarko authored May 17, 2021
    Configuration menu
    Copy the full SHA
    c95adf8 View commit details
    Browse the repository at this point in the history

  2. added more @fedarko's suggestions + stle fix

    @kwcantrell
    kwcantrell committed May 17, 2021
    Configuration menu
    Copy the full SHA
    af71569 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2021

  1. Merge branch 'master' of https://github.com/biocore/empress into shea… 

    …r-ui
    @kwcantrell
    kwcantrell committed May 28, 2021
    Configuration menu
    Copy the full SHA
    35a2aa9 View commit details
    Browse the repository at this point in the history

  2. address @fedarko's PR comments

    @kwcantrell
    kwcantrell committed May 28, 2021
    Configuration menu
    Copy the full SHA
    928a2ce View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2021

  1. Merge branch 'master' of https://github.com/biocore/empress into shea… 

    …r-ui
    @kwcantrell
    kwcantrell committed Jun 6, 2021
    Configuration menu
    Copy the full SHA
    6d4571a View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2021

  1. fixed collapse issue

    @kwcantrell
    kwcantrell committed Jun 10, 2021
    Configuration menu
    Copy the full SHA
    6074e5d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/biocore/empress into shea… 

    …r-ui
    @kwcantrell
    kwcantrell committed Jun 10, 2021
    Configuration menu
    Copy the full SHA
    0b081ca View commit details
    Browse the repository at this point in the history

  3. Apply suggestions from code review 

    added @fedarko's suggestions

Co-authored-by: Marcus Fedarko <[email protected]>
    @kwcantrell @fedarko
    kwcantrell and fedarko authored Jun 10, 2021
    Configuration menu
    Copy the full SHA
    0bd1160 View commit details
    Browse the repository at this point in the history

  4. fixed callback for emperor selections

    @kwcantrell
    kwcantrell committed Jun 10, 2021
    Configuration menu
    Copy the full SHA
    d3c2a61 View commit details
    Browse the repository at this point in the history

  5. fixed style

    @kwcantrell
    kwcantrell committed Jun 10, 2021
    Configuration menu
    Copy the full SHA
    ac544fb View commit details
    Browse the repository at this point in the history

  6. modified node circle text

    @kwcantrell
    kwcantrell committed Jun 10, 2021
    Configuration menu
    Copy the full SHA
    55ca475 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2021

  1. merged with master

    @kwcantrell
    kwcantrell committed Jun 11, 2021
    Configuration menu
    Copy the full SHA
    aedb860 View commit details
    Browse the repository at this point in the history

  2. disabled tabs during animation

    @kwcantrell
    kwcantrell committed Jun 11, 2021
    Configuration menu
    Copy the full SHA
    90571be View commit details
    Browse the repository at this point in the history

  3. fixed tests/lint issues

    @kwcantrell
    kwcantrell committed Jun 11, 2021
    Configuration menu
    Copy the full SHA
    149ecb5 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2021

  1. Apply suggestions from code review 

    added suggestions

Co-authored-by: Marcus Fedarko <[email protected]>
    @kwcantrell @fedarko
    kwcantrell and fedarko authored Jun 29, 2021
    Configuration menu
    Copy the full SHA
    288a140 View commit details
    Browse the repository at this point in the history

  2. modified message

    @kwcantrell
    kwcantrell committed Jun 29, 2021
    Configuration menu
    Copy the full SHA
    7faa70a View commit details
    Browse the repository at this point in the history

  3. addressed comments

    @kwcantrell
    kwcantrell committed Jun 29, 2021
    Configuration menu
    Copy the full SHA
    cb085ba View commit details
    Browse the repository at this point in the history

  4. fixed python test

    @kwcantrell
    kwcantrell committed Jun 29, 2021
    Configuration menu
    Copy the full SHA
    8af9b93 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2021

  1. Merge branch 'master' of https://github.com/biocore/empress into pr50… 

    …5-20210716
    @fedarko
    fedarko committed Jul 17, 2021
    Configuration menu
    Copy the full SHA
    c0fbd57 View commit details
    Browse the repository at this point in the history

  2. Remove extra " in side panel disabled message

    @fedarko
    fedarko committed Jul 17, 2021
    Configuration menu
    Copy the full SHA
    0505705 View commit details
    Browse the repository at this point in the history

  3. rm another extra "

    @fedarko
    fedarko committed Jul 17, 2021
    Configuration menu
    Copy the full SHA
    924b938 View commit details
    Browse the repository at this point in the history

  4. space after "

    @fedarko
    fedarko committed Jul 17, 2021
    Configuration menu
    Copy the full SHA
    0bae2ce View commit details
    Browse the repository at this point in the history

  5. fix problem i introduced in the last commit ._.

    @fedarko
    fedarko committed Jul 17, 2021
    Configuration menu
    Copy the full SHA
    953abd8 View commit details
    Browse the repository at this point in the history

  6. MNT: RM \t chars, make e-d-*.js docs consistent 

    Reason for removing \t characters is that these were the only files
in the Python / JS codebase that used literal tab characters (instead
of ordinary spaces).
    @fedarko
    fedarko committed Jul 17, 2021
    Configuration menu
    Copy the full SHA
    8767132 View commit details
    Browse the repository at this point in the history

  7. DOC: Adjust tab-disabled prefix using isEmpirePlot

    @fedarko
    fedarko committed Jul 17, 2021
    Configuration menu
    Copy the full SHA
    01d7022 View commit details
    Browse the repository at this point in the history

  8. DOC: Make uses of bold fonts consistent 

    The other tabs don't use bold for "This tab" and "To re-enable this
tab", so we don't use it here either.
    @fedarko
    fedarko committed Jul 17, 2021
    Configuration menu
    Copy the full SHA
    c57a5d2 View commit details
    Browse the repository at this point in the history

  9. STY: prettify

    @fedarko
    fedarko committed Jul 17, 2021
    Configuration menu
    Copy the full SHA
    00b7dee View commit details
    Browse the repository at this point in the history

  10. Cleaner toast msg for no-FM-b/c-shearing case

    @fedarko
    fedarko committed Jul 17, 2021
    Configuration menu
    Copy the full SHA
    b664bfd View commit details
    Browse the repository at this point in the history