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

Nilearn sprint example consolidation #2013

Merged
merged 51 commits into from
Apr 18, 2019
Merged

Nilearn sprint example consolidation #2013

merged 51 commits into from
Apr 18, 2019

Commits on Apr 15, 2019

  1. Added packages to requirements-build-docs

    @illdopejake
    illdopejake committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    2fc660e View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2019

  1. added reduced confounds to development_fmri

    @fliem
    fliem committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    949ba85 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/nilearn/nilearn into sele… 

    …cted_confounds
    @fliem
    fliem committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    9348909 View commit details
    Browse the repository at this point in the history

  3. fix savetxt to work with other versions

    @fliem
    fliem committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    7b96dd3 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/nilearn/nilearn into sele… 

    …cted_confounds
    @fliem
    fliem committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    28efb4e View commit details
    Browse the repository at this point in the history

  5. merged CanICA and compare_decomp notebooks

    @illdopejake
    illdopejake committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    989ee60 View commit details
    Browse the repository at this point in the history

  6. removed encoding flag

    @fliem
    fliem committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    4d63944 View commit details
    Browse the repository at this point in the history

  7. a few minor changes

    @illdopejake
    illdopejake committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    73b0d66 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2019

  1. reduced confounds filename more bidsy

    @fliem
    fliem committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    3abe7f8 View commit details
    Browse the repository at this point in the history

  2. fixed indent

    @fliem
    fliem committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    4dfef55 View commit details
    Browse the repository at this point in the history

  3. fixed links and small errors

    @illdopejake
    illdopejake committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    6feb546 View commit details
    Browse the repository at this point in the history

  4. fixed renaming

    @fliem
    fliem committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    23440b4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/nilearn/nilearn into sele… 

    …cted_confounds
    @fliem
    fliem committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    cf3f56d View commit details
    Browse the repository at this point in the history

  6. merged with nilearn master

    @illdopejake
    illdopejake committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    5a5c79e View commit details
    Browse the repository at this point in the history

  7. returning conf.py to its defaut state

    @illdopejake
    illdopejake committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    b894424 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/nilearn/nilearn into sele… 

    …cted_confounds
    @fliem
    fliem committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    e6413a3 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'nimaster' into nilearn-sprint-example-consolidation

    @illdopejake
    illdopejake committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    3fa63ee View commit details
    Browse the repository at this point in the history

  10. fix t_r to 2

    @fliem
    fliem committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    af64a6d View commit details
    Browse the repository at this point in the history

  11. Renaming stand-alone _unmask function for SpaceNet to _unmask_from_to… 

    …_3d_array and moving it in nilearn/masking.py with the relevant tests and import changes
    BAZEILLE Thomas committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    dcc12e5 View commit details
    Browse the repository at this point in the history

  12. Incorporated text editing suggestions from PR review

    @illdopejake
    illdopejake committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    e6912c8 View commit details
    Browse the repository at this point in the history

  13. Update examples/03_connectivity/plot_compare_decomposition.py 

    Co-Authored-By: illdopejake <jacobwvogel@gmail.com>
    @GaelVaroquaux @illdopejake
    GaelVaroquaux and illdopejake committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    083340a View commit details
    Browse the repository at this point in the history

  14. Update examples/03_connectivity/plot_compare_decomposition.py 

    Co-Authored-By: illdopejake <jacobwvogel@gmail.com>
    @GaelVaroquaux @illdopejake
    GaelVaroquaux and illdopejake committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    681f9f3 View commit details
    Browse the repository at this point in the history

  15. got rid of extra show() line

    @illdopejake
    illdopejake committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    e87fb11 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'nilearn-sprint-example-consolidation' of https://github… 

    ….com/illdopejake/nilearn into nilearn-sprint-example-consolidation
    @illdopejake
    illdopejake committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    e970f81 View commit details
    Browse the repository at this point in the history

  17. Remove Python2 testing from appveyor

    @kchawla-pi
    kchawla-pi committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    2a740eb View commit details
    Browse the repository at this point in the history

  18. changed info about rsfmri_dev to a topic

    @illdopejake
    illdopejake committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    b7fd92c View commit details
    Browse the repository at this point in the history

  19. fixed indent issue with topic

    @illdopejake
    illdopejake committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    ed08cb9 View commit details
    Browse the repository at this point in the history

  20. Merge pull request nilearn#2015 from thomasbazeille/move_rename_space… 

    …_net_unmask

[MRG] Moving nilearn.decoding.objective_functions._unmask to nilearn.masking._unmask_from_to_3d_array
    @GaelVaroquaux
    GaelVaroquaux committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    13096c4 View commit details
    Browse the repository at this point in the history

  21. Merge pull request nilearn#1999 from fliem/selected_confounds 

    [ENH] Selected confounds
    @GaelVaroquaux
    GaelVaroquaux committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    f861974 View commit details
    Browse the repository at this point in the history

  22. First draft of merge of 8.4.8 and 8.4.11

    @illdopejake
    illdopejake committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    37a0908 View commit details
    Browse the repository at this point in the history

  23. Change n_subjects to 1

    @illdopejake
    illdopejake committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    1a41553 View commit details
    Browse the repository at this point in the history

  24. Merge pull request nilearn#2016 from fliem/dev_tr 

    [FIX] t_r in examples using the development dataset
    @GaelVaroquaux
    GaelVaroquaux committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    c97dee0 View commit details
    Browse the repository at this point in the history

  25. small changes

    @illdopejake
    illdopejake committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    26874ea View commit details
    Browse the repository at this point in the history

  26. PR nilearn#2017: Remove Python2 testing from appveyor 

    Remove Python2 testing from appveyor
    @kchawla-pi
    kchawla-pi committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    ee0b59d View commit details
    Browse the repository at this point in the history

  27. added blank line after note call to surmount build error

    @illdopejake
    illdopejake committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    7aac0f5 View commit details
    Browse the repository at this point in the history

  28. fixed broken links

    @illdopejake
    illdopejake committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    3988130 View commit details
    Browse the repository at this point in the history

  29. merged with nilearn master

    @illdopejake
    illdopejake committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    a918570 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2019

  1. Update examples/03_connectivity/plot_compare_decomposition.py 

    Co-Authored-By: illdopejake <jacobwvogel@gmail.com>
    @GaelVaroquaux @illdopejake
    GaelVaroquaux and illdopejake committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    28d8906 View commit details
    Browse the repository at this point in the history

  2. Update examples/03_connectivity/plot_compare_decomposition.py 

    Co-Authored-By: illdopejake <jacobwvogel@gmail.com>
    @GaelVaroquaux @illdopejake
    GaelVaroquaux and illdopejake committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    a583830 View commit details
    Browse the repository at this point in the history

  3. minor html fixes

    @illdopejake
    illdopejake committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    e70f386 View commit details
    Browse the repository at this point in the history

  4. fixed bullet indentation and removed extra citation

    @illdopejake
    illdopejake committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    6fc1a90 View commit details
    Browse the repository at this point in the history

  5. removed plot_adhd_spheres

    @illdopejake
    illdopejake committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    4f8a147 View commit details
    Browse the repository at this point in the history

  6. removed movie-watching

    @illdopejake
    illdopejake committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    0fc899a View commit details
    Browse the repository at this point in the history

  7. Update examples/03_connectivity/plot_sphere_based_connectome.py 

    Co-Authored-By: illdopejake <jacobwvogel@gmail.com>
    @GaelVaroquaux @illdopejake
    GaelVaroquaux and illdopejake committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    869a3f8 View commit details
    Browse the repository at this point in the history

  8. Update examples/03_connectivity/plot_sphere_based_connectome.py 

    Co-Authored-By: illdopejake <jacobwvogel@gmail.com>
    @GaelVaroquaux @illdopejake
    GaelVaroquaux and illdopejake committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    fb78da7 View commit details
    Browse the repository at this point in the history

  9. Update examples/03_connectivity/plot_sphere_based_connectome.py 

    Co-Authored-By: illdopejake <jacobwvogel@gmail.com>
    @GaelVaroquaux @illdopejake
    GaelVaroquaux and illdopejake committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    9f65054 View commit details
    Browse the repository at this point in the history

  10. Update examples/03_connectivity/plot_sphere_based_connectome.py 

    Co-Authored-By: illdopejake <jacobwvogel@gmail.com>
    @GaelVaroquaux @illdopejake
    GaelVaroquaux and illdopejake committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    953ad6a View commit details
    Browse the repository at this point in the history

  11. fixed tiny note bug

    @illdopejake
    illdopejake committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    531220c View commit details
    Browse the repository at this point in the history

  12. Merge branch 'nilearn-sprint-example-consolidation_spheres' into nile… 

    …arn-sprint-example-consolidation
    @illdopejake
    illdopejake committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    48da288 View commit details
    Browse the repository at this point in the history

  13. more rst errors

    @illdopejake
    illdopejake committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    2fa2196 View commit details
    Browse the repository at this point in the history

  14. hopefully finally fixed html bug

    @illdopejake
    illdopejake committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    9a49022 View commit details
    Browse the repository at this point in the history