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

Feature/merge configuration files #316

Merged
merged 12 commits into from
Apr 17, 2018
Merged

Feature/merge configuration files #316

merged 12 commits into from
Apr 17, 2018

Commits on Apr 13, 2018

  1. #296 renamed configuration.json to ocelot.json in preparation

    @TomPallister
    TomPallister committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    cbaa2c3 View commit details
    Browse the repository at this point in the history

  2. removed things we dont need for tests

    @TomPallister
    TomPallister committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    698541e View commit details
    Browse the repository at this point in the history

  3. another file we dont need

    @TomPallister
    TomPallister committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    060dd1d View commit details
    Browse the repository at this point in the history

  4. removed some async we dont need

    @TomPallister
    TomPallister committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    f88e1f6 View commit details
    Browse the repository at this point in the history

  5. refactoring to consolidate configuration code

    @TomPallister
    TomPallister committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    fe5662f View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2018

  1. removed another pointless abstraction

    @TomPallister
    TomPallister committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    fe9bca7 View commit details
    Browse the repository at this point in the history

  2. #296 started writing merge code

    @TomPallister
    TomPallister committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    7ca8288 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2018

  1. #296 coming up with ideas for this config merging

    @TomPallister
    TomPallister committed Apr 15, 2018
    Configuration menu
    Copy the full SHA
    3ae2b28 View commit details
    Browse the repository at this point in the history

  2. #296 still hacking this idea around

    Tom Gardham-Pallister committed Apr 15, 2018
    Configuration menu
    Copy the full SHA
    c5aa11f View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2018

  1. #296 will now do a crappy merge on the configuration

    Tom Gardham-Pallister committed Apr 16, 2018
    Configuration menu
    Copy the full SHA
    2ed37cb View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2018

  1. #296 merged develop into this branch

    Tom Gardham-Pallister committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    b7ff737 View commit details
    Browse the repository at this point in the history

  2. #296 change so tests pass on windows

    @TomPallister
    TomPallister committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    e94df47 View commit details
    Browse the repository at this point in the history