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

September grab bag #819

Merged
merged 19 commits into from
Oct 6, 2020
Merged

September grab bag #819

merged 19 commits into from
Oct 6, 2020

Commits on Sep 22, 2020

  1. fixed bug in processing NV collection api call. Create DateTag in hel… 

    …per components. Use tag for status and report tabs.
    @rwblair
    rwblair committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    3b681bd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'sept_small_fixes' of github.com:neuroscout/neuroscout i… 

    …nto sept_small_fixes
    @rwblair
    rwblair committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    8e4e1d9 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2020

  1. if user has no predictor collections api returns empty object not an … 

    …empty array, check for this in initial user load.
    @rwblair
    rwblair committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    478b522 View commit details
    Browse the repository at this point in the history

  2. Event files not image file

    @adelavega
    adelavega committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    ad2384a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'sept_small_fixes' of github.com:neuroscout/neuroscout i… 

    …nto sept_small_fixes
    @adelavega
    adelavega committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    c01b6a0 View commit details
    Browse the repository at this point in the history

  4. Remove predictor_collection from user profile (use seperate route)

    @adelavega
    adelavega committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    e39f814 View commit details
    Browse the repository at this point in the history

  5. Dont exclude pc

    @adelavega
    adelavega committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    2f252d5 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2020

  1. Separate pc by id route and add user pc list route

    @adelavega
    adelavega committed Sep 29, 2020
    Configuration menu
    Copy the full SHA
    875d0e1 View commit details
    Browse the repository at this point in the history

  2. Pc many=true

    @adelavega
    adelavega committed Sep 29, 2020
    Configuration menu
    Copy the full SHA
    24e3203 View commit details
    Browse the repository at this point in the history

  3. Add user collections to route list

    @adelavega
    adelavega committed Sep 29, 2020
    Configuration menu
    Copy the full SHA
    5a8a2a3 View commit details
    Browse the repository at this point in the history

  4. User PC move to user section in swagger

    @adelavega
    adelavega committed Sep 29, 2020
    Configuration menu
    Copy the full SHA
    6c892fb View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into sept_small_fixes

    @adelavega
    adelavega committed Sep 29, 2020
    Configuration menu
    Copy the full SHA
    fe77f8f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'sept_small_fixes' of github.com:neuroscout/neuroscout i… 

    …nto sept_small_fixes
    @adelavega
    adelavega committed Sep 29, 2020
    Configuration menu
    Copy the full SHA
    e0af620 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2020

  1. Many files in nested NV field

    @adelavega
    adelavega committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    33cdffb View commit details
    Browse the repository at this point in the history

  2. update how/where frontend gets predictor collections. Make neurovault… 

    … status more resilliant to backend not returning any files being uploaded.
    @rwblair
    rwblair committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    e331be1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'sept_small_fixes' of github.com:neuroscout/neuroscout i… 

    …nto sept_small_fixes
    @rwblair
    rwblair committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    52604aa View commit details
    Browse the repository at this point in the history

  4. load user predictors during call to load predictors in analysis builder.

    @rwblair
    rwblair committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    eb7ae3f View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2020

  1. Fix predictor collection test

    @adelavega
    adelavega committed Oct 6, 2020
    Configuration menu
    Copy the full SHA
    e8b31ec View commit details
    Browse the repository at this point in the history

  2. Merge branch 'sept_small_fixes' of github.com:neuroscout/neuroscout i… 

    …nto sept_small_fixes
    @adelavega
    adelavega committed Oct 6, 2020
    Configuration menu
    Copy the full SHA
    b8c74b8 View commit details
    Browse the repository at this point in the history