-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into correct_annot_export
- Loading branch information
Showing
21 changed files
with
673 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| { | ||
| "merge_commit_sha": "a1a05ae11234929f0608d5a6b4fc30206af89031", | ||
| "authors": [ | ||
| { | ||
| "n": "Daniel McCloy", | ||
| "e": null | ||
| }, | ||
| { | ||
| "n": "Britta Westner", | ||
| "e": "[email protected]" | ||
| } | ||
| ], | ||
| "changes": { | ||
| "doc/changes/devel/12896.other.rst": { | ||
| "a": 1, | ||
| "d": 0 | ||
| }, | ||
| "doc/development/governance.rst": { | ||
| "a": 251, | ||
| "d": 187 | ||
| }, | ||
| "doc/overview/people.rst": { | ||
| "a": 18, | ||
| "d": 11 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "merge_commit_sha": "d987c2793148eb855e04e3ae9d4871e486d01e46", | ||
| "authors": [ | ||
| { | ||
| "n": "Stefan Appelhoff", | ||
| "e": "[email protected]" | ||
| } | ||
| ], | ||
| "changes": { | ||
| "mne/_fiff/meas_info.py": { | ||
| "a": 2, | ||
| "d": 1 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| { | ||
| "merge_commit_sha": "ec77e7c36ce4a2d7897122513395b0e2418ea151", | ||
| "authors": [ | ||
| { | ||
| "n": "Stefan Appelhoff", | ||
| "e": "[email protected]" | ||
| } | ||
| ], | ||
| "changes": { | ||
| "mne/io/ant/ant.py": { | ||
| "a": 1, | ||
| "d": 1 | ||
| }, | ||
| "mne/io/kit/kit.py": { | ||
| "a": 1, | ||
| "d": 1 | ||
| }, | ||
| "mne/io/snirf/_snirf.py": { | ||
| "a": 1, | ||
| "d": 1 | ||
| }, | ||
| "mne/io/tests/test_raw.py": { | ||
| "a": 4, | ||
| "d": 4 | ||
| }, | ||
| "mne/preprocessing/ica.py": { | ||
| "a": 1, | ||
| "d": 1 | ||
| }, | ||
| "mne/preprocessing/tests/test_ica.py": { | ||
| "a": 2, | ||
| "d": 2 | ||
| }, | ||
| "mne/viz/raw.py": { | ||
| "a": 1, | ||
| "d": 1 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "merge_commit_sha": "0e09163e80013a426d419bda0c560ff3d48209bb", | ||
| "authors": [ | ||
| { | ||
| "n": "Stefan Appelhoff", | ||
| "e": "[email protected]" | ||
| } | ||
| ], | ||
| "changes": { | ||
| "tutorials/forward/35_eeg_no_mri.py": { | ||
| "a": 9, | ||
| "d": 13 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| { | ||
| "merge_commit_sha": "096243fe43c936587190a8e9e8e86b155446800e", | ||
| "authors": [ | ||
| { | ||
| "n": "github-actions[bot]", | ||
| "e": "41898282+github-actions[bot]@users.noreply.github.com" | ||
| } | ||
| ], | ||
| "changes": { | ||
| "doc/sphinxext/prs/12931.json": { | ||
| "a": 35, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12935.json": { | ||
| "a": 135, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12936.json": { | ||
| "a": 19, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12937.json": { | ||
| "a": 19, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12938.json": { | ||
| "a": 23, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12941.json": { | ||
| "a": 15, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12942.json": { | ||
| "a": 15, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12947.json": { | ||
| "a": 35, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12948.json": { | ||
| "a": 15, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12951.json": { | ||
| "a": 59, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12955.json": { | ||
| "a": 43, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12957.json": { | ||
| "a": 15, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12958.json": { | ||
| "a": 15, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12960.json": { | ||
| "a": 19, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12962.json": { | ||
| "a": 35, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12966.json": { | ||
| "a": 35, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12967.json": { | ||
| "a": 43, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12968.json": { | ||
| "a": 19, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12970.json": { | ||
| "a": 15, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12971.json": { | ||
| "a": 19, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12972.json": { | ||
| "a": 15, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12973.json": { | ||
| "a": 15, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12975.json": { | ||
| "a": 15, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12976.json": { | ||
| "a": 23, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12978.json": { | ||
| "a": 23, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12983.json": { | ||
| "a": 15, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12984.json": { | ||
| "a": 19, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12986.json": { | ||
| "a": 27, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12988.json": { | ||
| "a": 231, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/prs/12991.json": { | ||
| "a": 27, | ||
| "d": 0 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| { | ||
| "merge_commit_sha": "ed2fd8da1e16e449cdfe779491542fecad6ecbcb", | ||
| "authors": [ | ||
| { | ||
| "n": "dependabot[bot]", | ||
| "e": "49699333+dependabot[bot]@users.noreply.github.com" | ||
| }, | ||
| { | ||
| "n": "Eric Larson", | ||
| "e": "[email protected]" | ||
| } | ||
| ], | ||
| "changes": { | ||
| ".github/workflows/autofix.yml": { | ||
| "a": 1, | ||
| "d": 1 | ||
| }, | ||
| ".mailmap": { | ||
| "a": 3, | ||
| "d": 0 | ||
| }, | ||
| "doc/sphinxext/credit_tools.py": { | ||
| "a": 9, | ||
| "d": 5 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| { | ||
| "merge_commit_sha": "53792b12a2d60229ada3c946987a184f3915c535", | ||
| "authors": [ | ||
| { | ||
| "n": "Daniel McCloy", | ||
| "e": null | ||
| }, | ||
| { | ||
| "n": "Eric Larson", | ||
| "e": "[email protected]" | ||
| } | ||
| ], | ||
| "changes": { | ||
| "azure-pipelines.yml": { | ||
| "a": 1, | ||
| "d": 1 | ||
| }, | ||
| "doc/sphinxext/mne_doc_utils.py": { | ||
| "a": 0, | ||
| "d": 2 | ||
| }, | ||
| "pyproject.toml": { | ||
| "a": 1, | ||
| "d": 1 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "merge_commit_sha": "b19ac58598f55975ca7f6458fa7bfa7d21e00ae0", | ||
| "authors": [ | ||
| { | ||
| "n": "pre-commit-ci[bot]", | ||
| "e": "66853113+pre-commit-ci[bot]@users.noreply.github.com" | ||
| }, | ||
| { | ||
| "n": "Eric Larson", | ||
| "e": "[email protected]" | ||
| } | ||
| ], | ||
| "changes": { | ||
| ".pre-commit-config.yaml": { | ||
| "a": 1, | ||
| "d": 1 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| { | ||
| "merge_commit_sha": "7071a0e24e121b28c851565f2e64a0128941e83a", | ||
| "authors": [ | ||
| { | ||
| "n": "Eric Larson", | ||
| "e": "[email protected]" | ||
| }, | ||
| { | ||
| "n": "autofix-ci[bot]", | ||
| "e": "114827586+autofix-ci[bot]@users.noreply.github.com" | ||
| }, | ||
| { | ||
| "n": "Stefan Appelhoff", | ||
| "e": "[email protected]" | ||
| } | ||
| ], | ||
| "changes": { | ||
| "doc/changes/devel/13003.newfeature.rst": { | ||
| "a": 1, | ||
| "d": 0 | ||
| }, | ||
| "mne/_fiff/_digitization.py": { | ||
| "a": 24, | ||
| "d": 5 | ||
| }, | ||
| "mne/_fiff/write.py": { | ||
| "a": 5, | ||
| "d": 1 | ||
| }, | ||
| "mne/channels/montage.py": { | ||
| "a": 36, | ||
| "d": 12 | ||
| }, | ||
| "mne/channels/tests/test_montage.py": { | ||
| "a": 33, | ||
| "d": 14 | ||
| }, | ||
| "mne/viz/tests/test_montage.py": { | ||
| "a": 1, | ||
| "d": 1 | ||
| }, | ||
| "tutorials/forward/35_eeg_no_mri.py": { | ||
| "a": 1, | ||
| "d": 1 | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.