Skip to content

Commit

Permalink
Merge branch 'datalad-handbook:main' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
jcolomb authored Dec 18, 2023
2 parents 85e8e5e + 3c94689 commit 2ed4587
Show file tree
Hide file tree
Showing 396 changed files with 5,100 additions and 3,444 deletions.
28 changes: 28 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,34 @@
"bug",
"maintenance"
]
},
{
"login": "jkuhl-uni",
"name": "Justus Kuhlmann",
"avatar_url": "https://avatars.githubusercontent.com/u/82444481?v=4",
"profile": "https://github.com/jkuhl-uni",
"contributions": [
"content"
]
},
{
"login": "melanieganz",
"name": "melanieganz",
"avatar_url": "https://avatars.githubusercontent.com/u/25242978?v=4",
"profile": "https://sites.google.com/view/melanieganz/home",
"contributions": [
"bug"
]
},
{
"login": "damienfrancois",
"name": "Damien François",
"avatar_url": "https://avatars.githubusercontent.com/u/1721582?v=4",
"profile": "http://www.uclouvain.be/damien.francois",
"contributions": [
"bug",
"content"
]
}
],
"contributorsPerLine": 7,
Expand Down
10 changes: 10 additions & 0 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,16 @@
"affiliation": "National Eye Institute, National Institutes of Health, USA",
"orcid": "0000-0002-4579-003X"
},
{
"name": "Kuhlmann, Justus Theodor",
"affiliation": "Universität Münster",
"orcid": "0000-0001-5291-1939"
},
{
"name": "François, Damian",
"affiliation": "Université catholique de Louvain",
"orcid": "0000-0001-5131-9431"
},
{
"name": "Hanke, Michael",
"affiliation": "Institute of Neuroscience and Medicine, Brain & Behaviour (INM-7), Research Centre Jülich, Jülich, Germany and Institute of Systems Neuroscience, Medical Faculty, Heinrich Heine University Düsseldorf, Düsseldorf, Germany",
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ All over the handbook, version notes or information relating to datalad versions
#### Advanced

#### Usecases
- A new usecase about encrypted workflows is now part of the handbook ([#895][])
- A new use case about encrypted workflows is now part of the handbook ([#895][])

#### Miscellaneous additions
- The Makefile in the source repository received a more intuitive and fine-grained structure ([#901][])
Expand Down Expand Up @@ -100,7 +100,7 @@ It includes contributions the new contributors @eort, @mslw, @tguiot, @jhpb7 and

- The GitHub project of the handbook now uses templates for easier issue generation. ([#768][])
- A number of CSS improvements fix the rendering of bullet points ([#770][])
- The ML usecase was minified to speed up builds ([#790][])
- The ML use case was minified to speed up builds ([#790][])
- A new code list for the DGPA workshop was added ([#820][])

## v0.15 (November 25 2021) -- LaTeX improvements
Expand Down
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[![Build status](https://ci.appveyor.com/api/projects/status/v8o167109n3irf5c/branch/main?svg=true)](https://ci.appveyor.com/project/mih/book/branch/main)
[![Monthly link check](https://github.com/datalad-handbook/book/actions/workflows/linkcheck.yml/badge.svg)](https://github.com/datalad-handbook/book/actions/workflows/linkcheck.yml)
[![Documentation Status](https://readthedocs.org/projects/datalad-handbook/badge/?version=latest)](http://handbook.datalad.org/en/latest/?badge=latest)
[![Documentation Status](https://readthedocs.org/projects/datalad-handbook/badge/?version=latest)](https://handbook.datalad.org/en/latest/?badge=latest)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3608611.svg)](https://doi.org/10.5281/zenodo.3608611)
[![made-with-datalad](https://www.datalad.org/badges/made_with.svg)](https://datalad.org)
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-57-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-59-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

# The DataLad handbook :orange_book:
Expand Down Expand Up @@ -69,7 +69,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://github.com/kyleam"><img src="https://avatars2.githubusercontent.com/u/1297788?v=4?s=100" width="100px;" alt="Kyle Meyer"/><br /><sub><b>Kyle Meyer</b></sub></a><br /><a href="https://github.com/datalad-handbook/book/issues?q=author%3Akyleam" title="Bug reports">🐛</a> <a href="https://github.com/datalad-handbook/book/pulls?q=is%3Apr+reviewed-by%3Akyleam" title="Reviewed Pull Requests">👀</a> <a href="#question-kyleam" title="Answering Questions">💬</a> <a href="#content-kyleam" title="Content">🖋</a> <a href="#ideas-kyleam" title="Ideas, Planning, & Feedback">🤔</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/marisaheckner"><img src="https://avatars2.githubusercontent.com/u/52243533?v=4?s=100" width="100px;" alt="Marisa Heckner"/><br /><sub><b>Marisa Heckner</b></sub></a><br /><a href="#ideas-marisaheckner" title="Ideas, Planning, & Feedback">🤔</a> <a href="#userTesting-marisaheckner" title="User Testing">📓</a> <a href="https://github.com/datalad-handbook/book/issues?q=author%3Amarisaheckner" title="Bug reports">🐛</a> <a href="#content-marisaheckner" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bpoldrack"><img src="https://avatars2.githubusercontent.com/u/10498301?v=4?s=100" width="100px;" alt="Benjamin Poldrack"/><br /><sub><b>Benjamin Poldrack</b></sub></a><br /><a href="#question-bpoldrack" title="Answering Questions">💬</a> <a href="#ideas-bpoldrack" title="Ideas, Planning, & Feedback">🤔</a> <a href="#example-bpoldrack" title="Examples">💡</a> <a href="#tutorial-bpoldrack" title="Tutorials">✅</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://www.onerussian.com"><img src="https://avatars3.githubusercontent.com/u/39889?v=4?s=100" width="100px;" alt="Yaroslav Halchenko"/><br /><sub><b>Yaroslav Halchenko</b></sub></a><br /><a href="https://github.com/datalad-handbook/book/pulls?q=is%3Apr+reviewed-by%3Ayarikoptic" title="Reviewed Pull Requests">👀</a> <a href="#content-yarikoptic" title="Content">🖋</a> <a href="#ideas-yarikoptic" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/datalad-handbook/book/issues?q=author%3Ayarikoptic" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://www.oneukrainian.com"><img src="https://avatars3.githubusercontent.com/u/39889?v=4?s=100" width="100px;" alt="Yaroslav Halchenko"/><br /><sub><b>Yaroslav Halchenko</b></sub></a><br /><a href="https://github.com/datalad-handbook/book/pulls?q=is%3Apr+reviewed-by%3Ayarikoptic" title="Reviewed Pull Requests">👀</a> <a href="#content-yarikoptic" title="Content">🖋</a> <a href="#ideas-yarikoptic" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/datalad-handbook/book/issues?q=author%3Ayarikoptic" title="Bug reports">🐛</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/effigies"><img src="https://avatars0.githubusercontent.com/u/83442?v=4?s=100" width="100px;" alt="Chris Markiewicz"/><br /><sub><b>Chris Markiewicz</b></sub></a><br /><a href="https://github.com/datalad-handbook/book/issues?q=author%3Aeffigies" title="Bug reports">🐛</a></td>
Expand Down Expand Up @@ -136,6 +136,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="http://dannygarside.co.uk"><img src="https://avatars.githubusercontent.com/u/3739866?v=4?s=100" width="100px;" alt="Danny Garside"/><br /><sub><b>Danny Garside</b></sub></a><br /><a href="https://github.com/datalad-handbook/book/issues?q=author%3Ada5nsy" title="Bug reports">🐛</a> <a href="#maintenance-da5nsy" title="Maintenance">🚧</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jkuhl-uni"><img src="https://avatars.githubusercontent.com/u/82444481?v=4?s=100" width="100px;" alt="Justus Kuhlmann"/><br /><sub><b>Justus Kuhlmann</b></sub></a><br /><a href="#content-jkuhl-uni" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://sites.google.com/view/melanieganz/home"><img src="https://avatars.githubusercontent.com/u/25242978?v=4?s=100" width="100px;" alt="melanieganz"/><br /><sub><b>melanieganz</b></sub></a><br /><a href="https://github.com/datalad-handbook/book/issues?q=author%3Amelanieganz" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://www.uclouvain.be/damien.francois"><img src="https://avatars.githubusercontent.com/u/1721582?v=4?s=100" width="100px;" alt="Damien François"/><br /><sub><b>Damien François</b></sub></a><br /><a href="https://github.com/datalad-handbook/book/issues?q=author%3Adamienfrancois" title="Bug reports">🐛</a> <a href="#content-damienfrancois" title="Content">🖋</a></td>
</tr>
</tbody>
</table>
Expand Down
12 changes: 6 additions & 6 deletions artwork/OHBM_2020.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions dataladhandbook_support/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ def setup(app):
directives.setup(app)


from ._version import get_versions
__version__ = get_versions()['version']
del get_versions
from . import _version
__version__ = _version.get_versions()['version']
Loading

0 comments on commit 2ed4587

Please sign in to comment.