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

Mccalluc/merge facets #2073

Merged
merged 9 commits into from
Sep 5, 2017
Merged

Mccalluc/merge facets #2073

merged 9 commits into from
Sep 5, 2017

Commits on Sep 1, 2017

  1. TODOs for #2069

    @mccalluc
    mccalluc committed Sep 1, 2017
    Configuration menu
    Copy the full SHA
    f9d8176 View commit details
    Browse the repository at this point in the history

  2. Test!

    @mccalluc
    mccalluc committed Sep 1, 2017
    Configuration menu
    Copy the full SHA
    391199a View commit details
    Browse the repository at this point in the history

  3. More tests of existing behavior

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

  4. checkpoint: still need to figure out hash merging

    @mccalluc
    mccalluc committed Sep 1, 2017
    Configuration menu
    Copy the full SHA
    d526bb1 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2017

  1. checkpoint: (some) tests pass

    @mccalluc
    mccalluc committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    40ed29d View commit details
    Browse the repository at this point in the history

  2. Another test

    @mccalluc
    mccalluc committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    e7897ce View commit details
    Browse the repository at this point in the history

  3. another test: mergeAndAddNameValues

    @mccalluc
    mccalluc committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    ac1b4f0 View commit details
    Browse the repository at this point in the history

  4. And all the tests work

    @mccalluc
    mccalluc committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    0fe1731 View commit details
    Browse the repository at this point in the history

  5. just a note

    @mccalluc
    mccalluc committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    1119e60 View commit details
    Browse the repository at this point in the history