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

flexible config.py #146

Merged
merged 10 commits into from
Mar 11, 2016
Merged

flexible config.py #146

merged 10 commits into from
Mar 11, 2016

Commits on Feb 11, 2016

  1. change config.py to allow user provided config path 

    still must add path to config.py
    @juliambrown
    juliambrown committed Feb 11, 2016
    Configuration menu
    Copy the full SHA
    7a2cc63 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2016

  1. Update config.py

    @juliambrosman
    juliambrosman committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    f3c3941 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2016

  1. tab to space in config.py

    @juliambrown
    juliambrown committed Mar 3, 2016
    Configuration menu
    Copy the full SHA
    3b70502 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/julia_dev' into julia_dev 

    # Conflicts:
#	genologics/config.py
    @juliambrown
    juliambrown committed Mar 3, 2016
    Configuration menu
    Copy the full SHA
    bf8ac42 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2016

  1. changed config.py to allow for user to specify config file at module … 

    …startup
    @juliambrown
    juliambrown committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    7439f83 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'SciLifeLab/master' into julia_dev

    @juliambrown
    juliambrown committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    6b7c913 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2016

  1. config.py now behaves as it did before changes.

    @juliambrown
    juliambrown committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    bc68b8d View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2016

  1. config.py: change docstring, delete print

    @juliambrown
    juliambrown committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    7b342a5 View commit details
    Browse the repository at this point in the history

  2. docstring change

    @juliambrown
    juliambrown committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    1b5e258 View commit details
    Browse the repository at this point in the history

  3. update to version 0.2.7

    @juliambrown
    juliambrown committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    cbbff05 View commit details
    Browse the repository at this point in the history