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

Study and StudyPerson object #70

Merged
merged 71 commits into from
Jun 12, 2014
Merged

Study and StudyPerson object #70

merged 71 commits into from
Jun 12, 2014

Commits on May 1, 2014

  1. inital study create function

    @squirrelo
    squirrelo committed May 1, 2014
    Configuration menu
    Copy the full SHA
    b926cf3 View commit details
    Browse the repository at this point in the history

  2. fixed return and SQL

    @squirrelo
    squirrelo committed May 1, 2014
    Configuration menu
    Copy the full SHA
    406e5c1 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2014

  1. break dict info checks out to util.py funcs

    @squirrelo
    squirrelo committed May 19, 2014
    Configuration menu
    Copy the full SHA
    5acb8c1 View commit details
    Browse the repository at this point in the history

  2. initial fleshout of properties

    @squirrelo
    squirrelo committed May 19, 2014
    Configuration menu
    Copy the full SHA
    e1f0d27 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2014

  1. Merge remote-tracking branch 'upstream/master' into addstudy

    @squirrelo
    squirrelo committed May 20, 2014
    Configuration menu
    Copy the full SHA
    6f857b9 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2014

  1. updating populate_test_db and teardown_qiita_schema

    @squirrelo
    squirrelo committed May 21, 2014
    Configuration menu
    Copy the full SHA
    1443068 View commit details
    Browse the repository at this point in the history

  2. pep8 cleanup

    @squirrelo
    squirrelo committed May 21, 2014
    Configuration menu
    Copy the full SHA
    62bfcd8 View commit details
    Browse the repository at this point in the history

  3. added clean_sql-results

    @squirrelo
    squirrelo committed May 21, 2014
    Configuration menu
    Copy the full SHA
    bea579c View commit details
    Browse the repository at this point in the history

  4. fleshing out the study object

    @squirrelo
    squirrelo committed May 21, 2014
    Configuration menu
    Copy the full SHA
    34b5a96 View commit details
    Browse the repository at this point in the history

  5. docstrings

    @squirrelo
    squirrelo committed May 21, 2014
    Configuration menu
    Copy the full SHA
    04acc84 View commit details
    Browse the repository at this point in the history

  6. fleshing out tests

    @squirrelo
    squirrelo committed May 21, 2014
    Configuration menu
    Copy the full SHA
    d53b091 View commit details
    Browse the repository at this point in the history

  7. add study test info

    @squirrelo
    squirrelo committed May 21, 2014
    Configuration menu
    Copy the full SHA
    8507bb1 View commit details
    Browse the repository at this point in the history

  8. study test changes

    @squirrelo
    squirrelo committed May 21, 2014
    Configuration menu
    Copy the full SHA
    cbf8509 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2014

  1. Merge branch 'master' of github.com:biocore/qiita into addstudy

    @squirrelo
    squirrelo committed May 23, 2014
    Configuration menu
    Copy the full SHA
    207bd93 View commit details
    Browse the repository at this point in the history

  2. added efo addition for study

    @squirrelo
    squirrelo committed May 23, 2014
    Configuration menu
    Copy the full SHA
    cb606d5 View commit details
    Browse the repository at this point in the history

  3. fix check_table_cols function

    @squirrelo
    squirrelo committed May 23, 2014
    Configuration menu
    Copy the full SHA
    84163ef View commit details
    Browse the repository at this point in the history

  4. study insert now works

    @squirrelo
    squirrelo committed May 23, 2014
    Configuration menu
    Copy the full SHA
    bc18758 View commit details
    Browse the repository at this point in the history

  5. check errors raised properly

    @squirrelo
    squirrelo committed May 23, 2014
    Configuration menu
    Copy the full SHA
    b0ef52e View commit details
    Browse the repository at this point in the history

  6. more tests added

    @squirrelo
    squirrelo committed May 23, 2014
    Configuration menu
    Copy the full SHA
    f2f805d View commit details
    Browse the repository at this point in the history

Commits on May 25, 2014

  1. Added StudyPerson object

    @squirrelo
    squirrelo committed May 25, 2014
    Configuration menu
    Copy the full SHA
    caa68ac View commit details
    Browse the repository at this point in the history

  2. make study creation/update check for objects and pull ids

    @squirrelo
    squirrelo committed May 25, 2014
    Configuration menu
    Copy the full SHA
    a0b3b09 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2014

  1. merged upstream

    @squirrelo
    squirrelo committed May 29, 2014
    Configuration menu
    Copy the full SHA
    ae7707f View commit details
    Browse the repository at this point in the history

  2. everything but delete written

    @squirrelo
    squirrelo committed May 29, 2014
    Configuration menu
    Copy the full SHA
    1df40c5 View commit details
    Browse the repository at this point in the history

  3. more tests

    @squirrelo
    squirrelo committed May 29, 2014
    Configuration menu
    Copy the full SHA
    741de07 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:biocore/qiita into addstudy

    @squirrelo
    squirrelo committed May 29, 2014
    Configuration menu
    Copy the full SHA
    89a7275 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2014

  1. Merge branch 'master' of github.com:biocore/qiita into addstudy

    @squirrelo
    squirrelo committed May 30, 2014
    Configuration menu
    Copy the full SHA
    0f0edb2 View commit details
    Browse the repository at this point in the history

  2. More test and study updates for bugfixes

    @squirrelo
    squirrelo committed May 30, 2014
    Configuration menu
    Copy the full SHA
    ee9b677 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2014

  1. Merge remote-tracking branch 'upstream/master' into addstudy

    @squirrelo
    squirrelo committed Jun 2, 2014
    Configuration menu
    Copy the full SHA
    d128aa1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:biocore/qiita into addstudy

    @squirrelo
    squirrelo committed Jun 2, 2014
    Configuration menu
    Copy the full SHA
    4b92c89 View commit details
    Browse the repository at this point in the history

  3. more test code and bugfixes

    @squirrelo
    squirrelo committed Jun 2, 2014
    Configuration menu
    Copy the full SHA
    7748910 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:biocore/qiita into addstudy

    @squirrelo
    squirrelo committed Jun 2, 2014
    Configuration menu
    Copy the full SHA
    69ff05e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of github.com:biocore/qiita into addstudy

    @squirrelo
    squirrelo committed Jun 2, 2014
    Configuration menu
    Copy the full SHA
    67acbdc View commit details
    Browse the repository at this point in the history

  6. initial complete study object

    @squirrelo
    squirrelo committed Jun 2, 2014
    Configuration menu
    Copy the full SHA
    843c458 View commit details
    Browse the repository at this point in the history

  7. More tests, 99% coverage

    @squirrelo
    squirrelo committed Jun 2, 2014
    Configuration menu
    Copy the full SHA
    6d144b4 View commit details
    Browse the repository at this point in the history

  8. Docstring stuff

    @squirrelo
    squirrelo committed Jun 2, 2014
    Configuration menu
    Copy the full SHA
    61ed70b View commit details
    Browse the repository at this point in the history

  9. ALL THE DOCSTRINGS

    @squirrelo
    squirrelo committed Jun 2, 2014
    Configuration menu
    Copy the full SHA
    7f8bfb3 View commit details
    Browse the repository at this point in the history

  10. EVEN MORE DOCSTRINGS

    @squirrelo
    squirrelo committed Jun 2, 2014
    Configuration menu
    Copy the full SHA
    ac49f38 View commit details
    Browse the repository at this point in the history

  11. slight fix

    @squirrelo
    squirrelo committed Jun 2, 2014
    Configuration menu
    Copy the full SHA
    db5eaff View commit details
    Browse the repository at this point in the history

  12. fix copy/paste issue

    @squirrelo
    squirrelo committed Jun 2, 2014
    Configuration menu
    Copy the full SHA
    17e8220 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2014

  1. Take care of @josenavas suggestions

    @squirrelo
    squirrelo committed Jun 3, 2014
    Configuration menu
    Copy the full SHA
    3c24b1d View commit details
    Browse the repository at this point in the history

  2. A bit more docstring

    @squirrelo
    squirrelo committed Jun 3, 2014
    Configuration menu
    Copy the full SHA
    10c4c04 View commit details
    Browse the repository at this point in the history

  3. pep8 fixes

    @squirrelo
    squirrelo committed Jun 3, 2014
    Configuration menu
    Copy the full SHA
    b061b2e View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2014

  1. import THE FUTURE

    @squirrelo
    squirrelo committed Jun 4, 2014
    Configuration menu
    Copy the full SHA
    51da641 View commit details
    Browse the repository at this point in the history

  2. import THE FUTURE AGAIN

    @squirrelo
    squirrelo committed Jun 4, 2014
    Configuration menu
    Copy the full SHA
    0d755d0 View commit details
    Browse the repository at this point in the history

  3. moving the future

    @squirrelo
    squirrelo committed Jun 4, 2014
    Configuration menu
    Copy the full SHA
    7bfa663 View commit details
    Browse the repository at this point in the history

  4. addressing @wasade comments

    @squirrelo
    squirrelo committed Jun 4, 2014
    Configuration menu
    Copy the full SHA
    e506ccf View commit details
    Browse the repository at this point in the history

  5. cleaner join in info.setter

    @squirrelo
    squirrelo committed Jun 4, 2014
    Configuration menu
    Copy the full SHA
    0e691b4 View commit details
    Browse the repository at this point in the history

  6. pep8 test_util

    @squirrelo
    squirrelo committed Jun 4, 2014
    Configuration menu
    Copy the full SHA
    678df7a View commit details
    Browse the repository at this point in the history

  7. add lock on setters for public study

    @squirrelo
    squirrelo committed Jun 4, 2014
    Configuration menu
    Copy the full SHA
    352dbda View commit details
    Browse the repository at this point in the history

  8. fix docstring

    @squirrelo
    squirrelo committed Jun 4, 2014
    Configuration menu
    Copy the full SHA
    e29947c View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' of github.com:biocore/qiita into addstudy

    @squirrelo
    squirrelo committed Jun 4, 2014
    Configuration menu
    Copy the full SHA
    e41bc7c View commit details
    Browse the repository at this point in the history

  10. fix tests for new test data

    @squirrelo
    squirrelo committed Jun 4, 2014
    Configuration menu
    Copy the full SHA
    136007d View commit details
    Browse the repository at this point in the history

  11. fix pep8

    @squirrelo
    squirrelo committed Jun 4, 2014
    Configuration menu
    Copy the full SHA
    f5c333e View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2014

  1. fixing more code

    @squirrelo
    squirrelo committed Jun 9, 2014
    Configuration menu
    Copy the full SHA
    69af985 View commit details
    Browse the repository at this point in the history

  2. merging upstream/master

    @squirrelo
    squirrelo committed Jun 9, 2014
    Configuration menu
    Copy the full SHA
    b99c43b View commit details
    Browse the repository at this point in the history

  3. fix some travis failures

    @squirrelo
    squirrelo committed Jun 9, 2014
    Configuration menu
    Copy the full SHA
    95c4629 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2014

  1. some more changes

    @squirrelo
    squirrelo committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    ea5973a View commit details
    Browse the repository at this point in the history

  2. calm before the storm

    @squirrelo
    squirrelo committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    5a09f9e View commit details
    Browse the repository at this point in the history

  3. merge upstream/master

    @squirrelo
    squirrelo committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    5f86893 View commit details
    Browse the repository at this point in the history

  4. remote testcode

    @squirrelo
    squirrelo committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    fadcaa7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of github.com:biocore/qiita into addstudy

    @squirrelo
    squirrelo committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    28eea2f View commit details
    Browse the repository at this point in the history

  6. fixing tests

    @squirrelo
    squirrelo committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    ddb9972 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2014

  1. fix _non_info bug, comments

    @squirrelo
    squirrelo committed Jun 12, 2014
    Configuration menu
    Copy the full SHA
    3a1df46 View commit details
    Browse the repository at this point in the history

  2. fix the last bits....hopefully

    @squirrelo
    squirrelo committed Jun 12, 2014
    Configuration menu
    Copy the full SHA
    6503a78 View commit details
    Browse the repository at this point in the history

  3. merge upstream/master

    @squirrelo
    squirrelo committed Jun 12, 2014
    Configuration menu
    Copy the full SHA
    2332ba1 View commit details
    Browse the repository at this point in the history

  4. 100%

    @squirrelo
    squirrelo committed Jun 12, 2014
    Configuration menu
    Copy the full SHA
    9007a91 View commit details
    Browse the repository at this point in the history

  5. fix some merge conflict issues

    @squirrelo
    squirrelo committed Jun 12, 2014
    Configuration menu
    Copy the full SHA
    18c2edf View commit details
    Browse the repository at this point in the history

  6. Taking care of @adamrp suggestions

    @squirrelo
    squirrelo committed Jun 12, 2014
    Configuration menu
    Copy the full SHA
    c4a2234 View commit details
    Browse the repository at this point in the history

  7. applying @josenavas sugestions

    @squirrelo
    squirrelo committed Jun 12, 2014
    Configuration menu
    Copy the full SHA
    e03e612 View commit details
    Browse the repository at this point in the history

  8. empty efo fix

    @squirrelo
    squirrelo committed Jun 12, 2014
    Configuration menu
    Copy the full SHA
    e06472b View commit details
    Browse the repository at this point in the history

  9. move efo checks

    @squirrelo
    squirrelo committed Jun 12, 2014
    Configuration menu
    Copy the full SHA
    4d74534 View commit details
    Browse the repository at this point in the history