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

Merge main into watters branch #15

Closed
wants to merge 30 commits into from
Closed

Merge main into watters branch #15

wants to merge 30 commits into from

Commits on Dec 6, 2023

  1. vprobe locations

    @luiztauffer
    luiztauffer committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    46ddf0a View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Use set_probe and simplify interface by using BinaryRecording

    @alejoe91
    alejoe91 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    be698aa View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2023

  1. Fix WattersInterface

    @alejoe91
    alejoe91 committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    7d00403 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. Merge branch 'main' into vprobe-electrodes-locations

    @CodyCBakerPhD
    CodyCBakerPhD authored Dec 18, 2023
    Configuration menu
    Copy the full SHA
    39e1b2f View commit details
    Browse the repository at this point in the history

  2. fix session ID for automatic upload

    @CodyCBakerPhD
    CodyCBakerPhD authored Dec 18, 2023
    Configuration menu
    Copy the full SHA
    0b2b11a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into fix_session_id

    @CodyCBakerPhD
    CodyCBakerPhD authored Dec 18, 2023
    Configuration menu
    Copy the full SHA
    867f698 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into vprobe-electrodes-locations

    @CodyCBakerPhD
    CodyCBakerPhD authored Dec 18, 2023
    Configuration menu
    Copy the full SHA
    9d3d2cf View commit details
    Browse the repository at this point in the history

  5. Merge pull request #11 from catalystneuro/fix_session_id 

    Fix session ID for automatic upload
    @CodyCBakerPhD
    CodyCBakerPhD authored Dec 18, 2023
    Configuration menu
    Copy the full SHA
    3557448 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into vprobe-electrodes-locations

    @CodyCBakerPhD
    CodyCBakerPhD authored Dec 18, 2023
    Configuration menu
    Copy the full SHA
    c3eb205 View commit details
    Browse the repository at this point in the history

  7. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    ecb63d6 View commit details
    Browse the repository at this point in the history

  8. Nick's changes.

    Nicholas Watters committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    c030943 View commit details
    Browse the repository at this point in the history

  9. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    5f55560 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. Update session_id.

    Nicholas Watters authored and Nicholas Watters committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    6a27f4c View commit details
    Browse the repository at this point in the history

  2. fix circular import error

    @luiztauffer
    luiztauffer committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    a826f30 View commit details
    Browse the repository at this point in the history

  3. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    8d0700d View commit details
    Browse the repository at this point in the history

  4. Merge pull request #8 from catalystneuro/vprobe-electrodes-locations 

    vprobe electrodes locations
    @CodyCBakerPhD
    CodyCBakerPhD authored Dec 19, 2023
    Configuration menu
    Copy the full SHA
    60464d4 View commit details
    Browse the repository at this point in the history

  5. resolve conflicts

    @CodyCBakerPhD
    CodyCBakerPhD committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    4db621d View commit details
    Browse the repository at this point in the history

  6. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    b8a4b9f View commit details
    Browse the repository at this point in the history

  7. Incorporate V-Probe coordinates.

    Nicholas Watters authored and Nicholas Watters committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    004b37f View commit details
    Browse the repository at this point in the history

  8. Merge with branch updates.

    Nicholas Watters authored and Nicholas Watters committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    fbf1ada View commit details
    Browse the repository at this point in the history

  9. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    36c53bb View commit details
    Browse the repository at this point in the history

  10. Remove watters_convert_session.py that is no longer in use.

    Nicholas Watters authored and Nicholas Watters committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    1c110b2 View commit details
    Browse the repository at this point in the history

  11. Merge auto-formatting changes.

    Nicholas Watters authored and Nicholas Watters committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    c5714fc View commit details
    Browse the repository at this point in the history

  12. Remove duplicate file timeseries_interfaces.py.

    Nicholas Watters authored and Nicholas Watters committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    055c715 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #13 from catalystneuro/nwatters 

    Nick's pull request for a version that works on openmind
    @nwatters01
    nwatters01 authored Dec 19, 2023
    Configuration menu
    Copy the full SHA
    3b8fbe0 View commit details
    Browse the repository at this point in the history

  14. Filename updates to make dandi uploading work.

    Nicholas Watters authored and Nicholas Watters committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    3245d46 View commit details
    Browse the repository at this point in the history

  15. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    4f2e291 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #14 from catalystneuro/nwatters 

    Filename updates to make dandi uploading work.
    @CodyCBakerPhD
    CodyCBakerPhD authored Dec 19, 2023
    Configuration menu
    Copy the full SHA
    101a2da View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. Update timezone info and minor cleanups.

    Nicholas Watters authored and Nicholas Watters committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    7eb0f4f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'nwatters' into main

    @nwatters01
    nwatters01 authored Dec 20, 2023
    Configuration menu
    Copy the full SHA
    54b431b View commit details
    Browse the repository at this point in the history