Skip to content

Commit

Permalink
Merge branch 'main' into 0.5.6-relnotes-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jni authored Jan 21, 2025
2 parents 4225538 + fde730c commit e2370b7
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions docs/community/governance.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ developer community (including the SC members) fails to reach such a consensus
in a reasonable timeframe, the SC is the entity that resolves the issue.

Members of the SC also have the "owner" role within the [napari GitHub organization](https://github.com/napari)
and are ultimately responsible for managing the napari GitHub account, the [@napari_imaging](https://x.com/napari_imaging)
twitter account, the [napari website](https://napari.org), and other similar napari owned resources.
and are ultimately responsible for managing the napari GitHub account, the [@napari@fosstodon.org](https://fosstodon.org/@napari)
Mastodon account, the [napari website](https://napari.org), and other similar napari owned resources.

The SC will be no less than three members and no more than five members,
with a strong preference for an odd number to ensure a simple majority vote
Expand Down
4 changes: 2 additions & 2 deletions docs/community/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ you can visit ![forum image.sc logo](../images/image_sc_logo.png) [forum.image.s
## News and updates

To trace latest news from napari you may follow us on:
* ![twitter logo](../images/twitter_logo.svg) twitter/X [napari_imaging](https://x.com/napari_imaging/)
* ![mastodon logo](../images/mastodon_logo.svg) mastodon [fosstodon.org/@napari](https://fosstodon.org/@napari)
* ![mastodon logo](../images/mastodon_logo.svg) mastodon [@napari@fosstodon.org](https://fosstodon.org/@napari)
* ![bluesky logo](../images/Bluesky_Logo.svg) BlueSky [napari.fosstodon.org.ap.brid.gy](https://bsky.app/profile/napari.fosstodon.org.ap.brid.gy)


## Contributing and Bug reporting
Expand Down
2 changes: 1 addition & 1 deletion docs/community/team.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ You can read a full history of the project’s founding and early development in

Over time, napari has grown to over 80 direct contributors. Talley Lambert, from Harvard Medical School, began contributing around the time of Juan's blog post, and has been a critical driver of napari's development ever since. We have core developers located in three continents and three biweekly community calls spread across the day to try to accommodate users and contributors in any time zone.

Read more about napari’s [mission and values](https://napari.org/stable/community/mission_and_values.html), how to get started as a [contributor](https://napari.org/stable/developers/contributing.html) or join us in our [zulip chat](https://napari.zulipchat.com/login/) for a more synchronous conversation. You can also follow us on [twitter](https://x.com/napari_imaging).
Read more about napari’s [mission and values](https://napari.org/stable/community/mission_and_values.html), how to get started as a [contributor](https://napari.org/stable/developers/contributing.html) or join us in our [zulip chat](https://napari.zulipchat.com/login/) for a more synchronous conversation. You can also follow us on [mastodon](https://fosstodon.org/@napari).

## Institutional and funding Partners

Expand Down
2 changes: 1 addition & 1 deletion docs/developers/coredev/core_dev_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ As a core member, you should be familiar with the following napari guides:
### Social resources

- [#napari on image.sc](https://forum.image.sc/tag/napari).
- [#napari](https://x.com/search?q=%23napari&f=live) and [@napari_imaging](https://x.com/napari_imaging) on twitter.
- [#napari](https://fosstodon.org/tags/napari) and [@napari@fosstodon.org](https://fosstodon.org/@napari) on mastodon.
- [napari zulip](https://napari.zulipchat.com/) community chat channel.

You are not required to monitor the social resources.
Expand Down
4 changes: 4 additions & 0 deletions docs/images/Bluesky_Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions docs/images/twitter_logo.svg

This file was deleted.

0 comments on commit e2370b7

Please sign in to comment.