From 92235ff86b7944c5e6e5c47f9968e4ae46f456e5 Mon Sep 17 00:00:00 2001 From: Kim Brose <2803622+HarHarLinks@users.noreply.github.com> Date: Thu, 8 Jan 2026 22:12:44 +0000 Subject: [PATCH] update GB bylaws and add working group charters (#2986) * add some working group charters Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> * apply style guide Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> * apply blockquote style globally Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> * add website & content wg charter Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> * apply style guide Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> * add T&S R&D charter Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> * format WG charters consistently Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> * add current activities of website & content Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> * add current activities of events Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> * fix up website and content charter Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> * Title Case Signed-off-by: Kim Brose <2803622+HarHarLinks@users.noreply.github.com> * Add missing chairs Signed-off-by: Kim Brose <2803622+HarHarLinks@users.noreply.github.com> * Update content/foundation/working-groups/room-directory.md Signed-off-by: Kim Brose <2803622+HarHarLinks@users.noreply.github.com> * update the GB bylaws Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> * tweaks from review Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> * move room directory policy to the WG charter page Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> --------- Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> Signed-off-by: Kim Brose <2803622+HarHarLinks@users.noreply.github.com> --- .../governing-board/bylaws/02-bylaws.md | 16 +- .../bylaws/03-social-contract.md | 4 + .../governing-board/bylaws/04-processes.md | 4 + content/foundation/governing-board/index.md | 4 +- content/foundation/working-groups/events.md | 15 ++ .../working-groups/room-directory.md | 36 ++++ .../trust-safety-research-documentation.md | 5 + .../working-groups/website-content.md | 12 ++ .../working-groups/working_groups.toml | 164 +++++++++++++++++- content/homeserver/room_directory.md | 30 +--- sass/_base.scss | 6 + sass/_blog.scss | 6 - sass/_working-groups.scss | 3 +- templates/governing-board/working_group.html | 74 ++++++++ templates/governing-board/working_groups.html | 5 +- 15 files changed, 332 insertions(+), 52 deletions(-) create mode 100644 content/foundation/working-groups/events.md create mode 100644 content/foundation/working-groups/room-directory.md create mode 100644 content/foundation/working-groups/trust-safety-research-documentation.md create mode 100644 content/foundation/working-groups/website-content.md create mode 100644 templates/governing-board/working_group.html diff --git a/content/foundation/governing-board/bylaws/02-bylaws.md b/content/foundation/governing-board/bylaws/02-bylaws.md index a881801e9..2dde10737 100644 --- a/content/foundation/governing-board/bylaws/02-bylaws.md +++ b/content/foundation/governing-board/bylaws/02-bylaws.md @@ -7,6 +7,10 @@ the Matrix Governing Board, including membership, meetings, elections, roles, responsibilities, and behavioral standards. All content must be consistent with the Terms of Reference (TOR). +The canonical version of this document are the markdown sources available +through the [matrix.org website’s git +repo](https://github.com/matrix-org/matrix.org/tree/main/content/foundation/governing-board/bylaws). + ## 1. Board Structure & Mandate The Governing Board is made up of members elected by the community. As a @@ -65,7 +69,10 @@ provisional Chair, creates a charter, and establishes a meeting or discussion cadence/process. New Committees are expected to be infrequent, and proposed by at least 3 Board members. Proposals for new Committees must include an initial draft charter and be presented in the Board Discussions forum; a simple -majority vote of the Board is sufficient to create a Committee. +majority vote of the Board is sufficient to create a Committee. Henceforth the +canonical versions of the Committee charters are maintained by the Governing +Board [via the matrix.org website git +repo](https://github.com/matrix-org/matrix.org/blob/main/content/foundation/governing-board/committees.md). Committees are primarily composed of Governing Board members (with rare exceptions). Their main role is to coordinate and provide strategic oversight @@ -121,12 +128,15 @@ several Committees. Working Groups must have a dedicated public Matrix room (which will be listed on -[the Working Groups webpage](https://matrix.org/foundation/working-groups/) +[the Working Groups webpage](@/foundation/working-groups/index.md) and the [Working Groups Matrix space](https://matrix.to/#/#matrix-wgs:matrix.org)) and have access to a Discourse category for communication with the Board, documentation, and voting. In order to ensure transparency and accountability, Working Groups should take notes in meetings and -generally do their best to make their work public where possible. +generally do their best to make their work public where possible. Similarly, +the Governing Board maintains the canonical charters of the Working Groups [in +the matrix.org website git +repo](https://github.com/matrix-org/matrix.org/blob/main/content/foundation/working-groups/working_groups.toml). ### Proposing New Working Groups diff --git a/content/foundation/governing-board/bylaws/03-social-contract.md b/content/foundation/governing-board/bylaws/03-social-contract.md index 10bdb688f..d32dd3356 100644 --- a/content/foundation/governing-board/bylaws/03-social-contract.md +++ b/content/foundation/governing-board/bylaws/03-social-contract.md @@ -7,6 +7,10 @@ productive, respectful, and transparent environment in which we can collaborate effectively. These social norms will guide our internal interactions and also set expectations for how we communicate externally. +The canonical version of this document are the markdown sources available +through the [matrix.org website’s git +repo](https://github.com/matrix-org/matrix.org/tree/main/content/foundation/governing-board/bylaws). + --- ## **Board-Internal Norms** diff --git a/content/foundation/governing-board/bylaws/04-processes.md b/content/foundation/governing-board/bylaws/04-processes.md index e232e4b3e..e8e21fecd 100644 --- a/content/foundation/governing-board/bylaws/04-processes.md +++ b/content/foundation/governing-board/bylaws/04-processes.md @@ -5,6 +5,10 @@ title = "Governing Board: Processes" This section describes the practical procedures for decision-making, proposals, conflict resolution, transparency, and other operational matters. +The canonical version of this document are the markdown sources available +through the [matrix.org website’s git +repo](https://github.com/matrix-org/matrix.org/tree/main/content/foundation/governing-board/bylaws). + ## Committee Creation Process Board members are encouraged to propose new committees, provided there is a diff --git a/content/foundation/governing-board/index.md b/content/foundation/governing-board/index.md index 88d242c7f..f5dcaf235 100644 --- a/content/foundation/governing-board/index.md +++ b/content/foundation/governing-board/index.md @@ -159,8 +159,8 @@ processes. The content is divided into the following sections: The Governance Committee is responsible for adapting these documents as needed, with the exception of the TOR, which requires formal amendment from the -Guardians. These documents are currently v1.1.0 and were last modified on -2025-07-31. The canonical versions of the bylaws and expectations, social contract, +Guardians. These documents are currently v1.2.0 and were last modified on +2025-11-24. The canonical versions of the bylaws and expectations, social contract, and processes are the markdown sources available through the matrix [website's git repo](https://github.com/matrix-org/matrix.org/tree/main/content/foundation/governing-board/bylaws). diff --git a/content/foundation/working-groups/events.md b/content/foundation/working-groups/events.md new file mode 100644 index 000000000..41a4e448b --- /dev/null +++ b/content/foundation/working-groups/events.md @@ -0,0 +1,15 @@ ++++ +title = "Events WG" +template = "governing-board/working_group.html" ++++ + +## Activities + +- [The Matrix Conference 2025](https://2025.matrix.org) +- [FOSDEM 2026](https://fosdem.org/2026/) + - [Decentralised Communication Devroom](https://fosdem.org/2026/schedule/track/decentralised-communication/) + - [Matrix stand](https://fosdem.org/2026/stands/) + - [Fringe event](https://fosdem.org/2026/fringe/) +- Matrix.org booth kit +- Support community events with merch and stickers + diff --git a/content/foundation/working-groups/room-directory.md b/content/foundation/working-groups/room-directory.md new file mode 100644 index 000000000..e6d3e8186 --- /dev/null +++ b/content/foundation/working-groups/room-directory.md @@ -0,0 +1,36 @@ ++++ +title = "Room Directory WG" +template = "governing-board/working_group.html" ++++ + +## Activities + +This working group's primary purpose is receiving and processing requests about the [room directory](@/homeserver/room_directory.md) of the matrix.org homeserver. + +## Room Directory Policy + +The formal policy developed by the Trust & Safety Committee of the [Governing Board](@/foundation/governing-board/index.md) is below. Interpretation and changes are managed by the Trust & Safety Committee and approved by the [Trust & Safety](@/foundation/about/index.md#the-staff-of-the-foundation) team, while implementation is managed by the [Room Directory Working Group](@/foundation/working-groups/index.md). + +1. The matrix.org public room directory is highly visible and serves as the main entrypoint into the Matrix ecosystem for many new users. To ensure trust and safety on matrix.org and maintain a good onboarding experience, The Matrix.org Foundation curates the room directory. +2. Rooms or spaces may be included in the room directory if they meet the following criteria. + 1. Rooms must be actively moderated. There must be active users with a moderator role, and spam and abuse should be removed within a reasonable time period. + 2. Room moderators must be reasonably responsive to Foundation staff in the case of questions or concerns. + 3. Rooms must comply with best practices for moderation of large public rooms, as determined by the Trust and Safety Committee of the Governing Board. + 4. Rooms named after a recognisable organisation or project must be sponsored by that project or be clearly marked as unofficial, while still having a positive relationship with the project. + 5. In the case of a space, all rooms under the space must comply with this policy, and the administrators of the space must provide assurance that this will continue to be the case. +3. Approval of rooms for inclusion in the room directory is at the discretion of the Room Directory Working Group. Generally, the Working Group expects to approve rooms that are related to Matrix, other open source projects or communities, or other well-defined topics that are of interest to the Matrix community. Because of the difficulty of reviewing and moderating “general” rooms with no specific focus, they will not generally be approved. + 1. The Room Directory Working Group will consult Foundation Trust & Safety staff prior to approving additions. In some cases, Trust & Safety staff may object to the addition of a room. +4. Administrators of rooms aligned with this policy may request that they be added to the room directory by sending an email to *TBD* with a general description of the room’s topic and its moderation practices. The Working Group may follow up with additional questions. +5. Staff at The Matrix.org Foundation may remove rooms from the room directory if they are found to be in violation of the code of conduct or this policy, or if removal is required to mitigate an ongoing incident. +6. The Room Directory Working Group will review the directory contents at least annually to determine if rooms should remain listed. + +**Interpretation notes** + +* Clause 2's use of "may" permits approval *and* denial. +* Clause 3 is permissive to "vaguely related to Matrix", but is intended to be kept relatively narrow to "Matrix-related" for now. This may change in the future. +* Clause 4 supports using forms instead of an email address. + +**Implementation details** + +* The working group is expected to maintain an appeals process/form. +* The working group is responsible for internal approval/denial processes, including how to get rooms actually (de)listed in the room directory. diff --git a/content/foundation/working-groups/trust-safety-research-documentation.md b/content/foundation/working-groups/trust-safety-research-documentation.md new file mode 100644 index 000000000..691b5206a --- /dev/null +++ b/content/foundation/working-groups/trust-safety-research-documentation.md @@ -0,0 +1,5 @@ ++++ +title = "Trust & Safety Research & Documentation WG" +template = "governing-board/working_group.html" ++++ + diff --git a/content/foundation/working-groups/website-content.md b/content/foundation/working-groups/website-content.md new file mode 100644 index 000000000..17e110b99 --- /dev/null +++ b/content/foundation/working-groups/website-content.md @@ -0,0 +1,12 @@ ++++ +title = "Website & Content WG" +template = "governing-board/working_group.html" ++++ + +## Activities + +- [matrix.org website](https://github.com/matrix-org/matrix.org) + - [contribution policies](https://github.com/matrix-org/matrix.org/blob/main/CONTRIBUTING.md) + - [content policies](https://github.com/matrix-org/matrix.org/blob/main/CONTENT.md) +- [This Week in Matrix](@/twim-guide.md) +- [The Matrix Conference website](https://github.com/matrix-org/matrix-conf-website) diff --git a/content/foundation/working-groups/working_groups.toml b/content/foundation/working-groups/working_groups.toml index 2b9ee2aed..0c0751d0c 100644 --- a/content/foundation/working-groups/working_groups.toml +++ b/content/foundation/working-groups/working_groups.toml @@ -1,17 +1,87 @@ [[working_groups]] -name = "Website and Content" +name = "Website & Content" summary = "Editoral and technical oversight of the main websites and socials" description = """ -The website and content working group is responsible for the editorial and technical oversight of the main Matrix websites and social media channels. +The Website and Content Working Group is responsible for the editorial and technical oversight of the main Matrix websites and social media channels. This includes the main [matrix.org website](/), [conference website](https://conference.matrix.org), and the various social media channels. The group is responsible for ensuring that the websites are up to date, accurate, and reflect the current state of the Matrix ecosystem. It also includes [preparing and publishing](/twim-guide) the weekly This Week in Matrix news digest. -The group is not responsible for domain-specific content of other teams like the [spec](https://spec.matrix.org) website, matrix.org Homeserver related configurations or the [legal](/legal) and [security](/security-disclosure-policy) sections of the website. +The group is not responsible for domain-specific content of other teams like the [spec](https://spec.matrix.org) website, matrix.org homeserver related configurations or the [legal](/legal) and [security](/security-disclosure-policy) sections of the website. Note that this is not the complete list of responsibilities, but a high level overview. """ +charter = """ +### Purpose + +Paramount to all these formalities we are introducing by creating a WG from a Foundation staffer with some volunteers, is to provide a framework that enables their work. This should particularly mean that everything we establish here should streamline things, avoid discussion by drawing clear lines, etc. and NOT drowning in bureaucracy. Some of these processes will necessarily introduce a bit of potential friction and we should be careful to design these parts as lightweight and streamlinable as possible. + +### Membership + +- the WG can let any community member in good standing join on its own judgement +- any GB member can join the WG +- the GB can recommend people to be considered for joining/removal + +### Powers and responsibilities + +- editorial rights to the matrix.org website repo, including blog & TWIM + - except + - security team has the security hall of fame subpage content + - legal team has legal content + - matrix.org homeserver team ("backend team") has things directly related to running the HS such as .well-known + - (SCT has [spec.matrix.org](https://spec.matrix.org)) + - create process around blog posts e.g. to coordinate publishing on certain time + - creates the responsibility of availability + - on certain topics might require more setup, e.g. blog posts on security issues + - this needs to be streamlined enough to avoid potential of e.g. too much nitpicking. for example pre-approving content, etc. + - the WG may decide to not publish things or ask for changes, according to the content policy/communication strategy (see below). changes to the content require the original author's approval before publishing. + - the WG can also delegate review approvals + - establish clear criteria about projects listed under /ecosystem (e.g. maturity status, featured), to be signed off by the GB + - create and maintain "core" content + - initially: improve documentation/onboarding experience for new users and communities (e.g. the /docs page) + - propose a list of things that are "core" content + - establish a policy/clean-up process for unverified content + - do docs authors have responsibility for their content? +- conference website, in agreement with the Events WG + - here, events WG would be responsible for content, and Website WG for tech + - process for joint responsibilities like this to be created by the joint WGs/teams +- TWIM helper/tooling repos +- administration of (deployed) tooling + - e.g. TWIM bot + - e.g. cloudflare + - processes around this to be created by the WG. e.g. delegation of admin tasks (-> currently by SRE team on Fdn k8s) +- Matrix Live + - for now, it seems to fit best in this WG + - content creation can be delegated + - review (content and technical e.g. editing) and publish it +- manage respective rooms: TWIM, TWIM offtopic, website, news room + - Manage the [#community:matrix.org](https://matrix.to/#/#community:matrix.org) space + - making this known and establishing processes for it + - shared with T&S +- socials + - YouTube: descriptions, playlists, comments, ... + - mastodon.matrix.org + - decide what is the commitment for the @matrix account here + - document some expectations to content posted/other interactions + - blog posts and other things published by the WG are posted + - set some baseline rules + - etc -> see list in the Fdn handbook + - see mastodon + - document any accounts and who has access +- help establish the communication strategy/content policy and review any activity in the repo & other outlets to make sure we follow it + - also see the existing proposals in the handbook + - e.g. set a (technical) policy for pushes to main that all contributions must follow + - e.g. m.org blog posts + - e.g. label appearances of non-Foundation entities clearly on Matrix Live (e.g. Element Demos) + - mark authors and explain their role +- technical oversight of shop.matrix.org + - access to administrate it + - ensuring that one can actually buy an article without the website exploding + - ability to update documentation, i.e. making sure the modalities are as clear and easy to find as possible + - this explicitly excludes decisions about the merchandise sold on the store and the financial aspects, but includes only the technical operation. +""" committee = "Community Committee" members = ["Thib", "HarHarLinks", "MTRNord"] +chairs = ["MTRNord"] sponsor = "HarHarLinks" meetings = "Thursdays, 16:00-17:00 Berlin time. Please reach out via our Matrix room to join." matrix_room_alias = "#matrix.org-website:matrix.org" @@ -21,10 +91,41 @@ email = "" name = "Events" summary = "Organising the Foundation's official events and appearances at conferences" description = """ -The Events working group is the main organising team of the official events hosted by the Foundation, such as the Matrix Conference or co-hosting FOSDEM Fringe, as well as official appearances at other conferences, e.g. the FOSDEM booth and devroom. The WG also acts as first contact point for similar community endeavours, e.g. inquiries related to the Matrix Community Summit, or the FrOSCon Matrix Community devroom, and aims to foster an ecosystem of decentralised events and user groups. +The Events Working Group is the main organising team of the official events hosted by the Foundation, such as The Matrix Conference or co-hosting FOSDEM Fringe, as well as official appearances at other conferences, e.g. the FOSDEM booth and devroom. The WG also acts as first contact point for similar community endeavours, e.g. inquiries related to the Matrix Community Summit, or the FrOSCon Matrix Community devroom, and tries to foster an ecosystem of decentralised events and user groups. +""" +charter = """ +### Purpose + +The Events Working Group is an outreach arm of The Matrix Foundation. +It is the main organising team of the official events hosted by the Foundation, such as [The Matrix Conference](https://conference.matrix.org) or co-hosting [FOSDEM Fringe](https://fosdem.org/2026/fringe/), as well as official appearances at other conferences, e.g. the [FOSDEM](https://fosdem.org) booth and devroom. +The WG also acts as first contact point for similar community endeavours, e.g. inquiries related to the [Matrix Community Summit](https://matrix-community.events), or the FrOSCon Matrix Community devroom, and tries to foster an ecosystem of decentralised events and user groups. + +### Typical Tasks + +- issue CfP, curation of talks, schedule building, pretalx +- call for volunteers to staff events, shift assignment +- merch + - [official merch](https://shop.matrix.org) available for sale/giveaway at event + - stickers available for giveaway + - event-specific, e.g. team shirts +- design input +- promotion & marketing, sponsoring, ticketing, pretix +- coordinate video recording, podcasting, etc. +- support community events + - Foundation-sponsored merch/stickers + - helpful hints how we handle running an event + - handling infrastructure support e.g. acting as financial entity +- keeping tabs on all events globally that might be relevant + - for our own events to not collide with them + - to potentially participate in the future + - their CfPs etc +- develop/maintain tooling/docs for running events on Matrix (pretix bot, FOSDEM widget, …) +- maintain a knowledgebase at +- make Matrix attractive to get invited to events """ committee = "Community Committee" members = ["Yan", "Nadine", "Thib", "HarHarLinks", "The one with the braid", "Dominik"] +chairs = ["HarHarLinks"] sponsor = "HarHarLinks" meetings = "Mondays, 16:00-17:00 Berlin time. Please reach out via our Matrix room." matrix_room_alias = "#events-wg:matrix.org" @@ -34,13 +135,47 @@ email = "events-wg@foundation.matrix.org" name = "Trust & Safety Research & Documentation" summary = "Documenting and Researching the state of Trust and Safety in the ecosystem" description = """ +To make appropriate decisions, the T&S Committee needs to know about the state of T&S in the wider ecosystem. It needs to have insights into current challenges, solutions and initiatives. +On the other hand the community can also benefit from having some of that information documented. +The T&S R&D WG is a tool to help with that. It includes a wider set of individuals and reports their research results to the T&S Committee. The WG is also encouraged to enhance the [documentation](/docs) on the matrix.org website to help communities and users on Matrix moderate their rooms. +The T&S Committee might sometimes ask the WG for help in researching specific topics in more detail to guide their decisions. +""" +charter = """ +### Purpose + To make appropriate decisions, the T&S committee needs to know about the state of T&S in the wider ecosystem. It needs to have insights into current challenges, solutions and initiatives. On the other hand the community can also benefit from having some of that information documented. -The T&S R&D WG is a tool to help with that. It includes a wider set of individuals and reports their research results to the T&S committee. The WG is also encouraged to enhance the [documentation](/docs) on the Matrix.org website to help communities and users on Matrix moderate their rooms. +The T&S R&D WG is a tool to help with that. It includes a wider set of individuals and reports their research results to the T&S committee. In some cases the WG is also encouraged to enhance the documentation on matrix.org to help communities and users on Matrix moderate their rooms. The T&S committee might sometimes ask the WG for help in researching specific topics in more detail to guide their decisions. + +### Pledge of Confidentiality + +The WG will sometimes have to deal or come in contact with confidential data, possibly +because of legal reasons, possibly because of active abuse concerns. While the +WG is encouraged to be open, there +will be times where the WG should keep certain information +confidential and only share it with specific individuals. As the WG we pledge +to keep information confidential when necessary while still being transparent +and open where possible. +The T&S committee may decide to remove members from the WG if it sees a member abusing their access to information or not acting in a trustworthy manner by sharing information the group agreed to keep confidential. This should be a last resort, needs a majority in the T&S committee and should be preceded by appropriate communication and warnings. + +### Typical Tasks + +- Gather information about current moderation challenges on Matrix and keep structured notes about them +- Maintain an overview of available moderation tools and their capabilities +- Create and maintain moderation guides on matrix.org in collaboration with the Website or Documentation WGs +- Reach out to moderators to gather feedback or offer advice +- Reports insights and opinions to the T&S committee and possibly other T&S working groups +- Potentially collaborate on proposals with the T&S committee or other WGs +- Turn some of their research into MSCs and collaboratively push them to completion as well as advise on other MSCs from a T&S perspective + +### Membership + +Interested members should be able to apply to the WG freely, but the WG and the T&S committee should do a short background check, if they are willing to give the applicant access to the information or if there are any active abuse concerns. This should be a low bar to clear, but is intended to keep malicious individuals out. """ committee = "Trust & Safety Committee" -members = ["Nico", "Cat", "Niko", "SFaulken", "Gnuxie"] +members = ["Nico", "Cat", "Niko", "SFaulken", "Gnuxie", "Sky", "Andy Balaam", "Tobias Fella"] +chairs = ["Niko", "Cat"] sponsor = "Nico" matrix_room_alias = "#tns-rnd-wg-office:neko.dev" email = "" @@ -49,12 +184,25 @@ email = "" name = "Room Directory" summary = "Help maintain the room directory on the matrix.org homeserver" description = """ -The purpose of the room directory working group is to implement the matrix.org room directory policy, as described in that policy. +The purpose of the room directory Working Group is to implement the matrix.org room directory policy, as described in that policy. -Additionally the working group might propose improvements to the policy, which the T&S committee will then vote on. +Additionally the Working Group might propose improvements to the policy, which the T&S Committee will then vote on. +""" +charter = """ +### Purpose + +The purpose of the Room Directory Working Group is to implement the matrix.org room directory policy, as described in that policy. + +Additionally the Working Group might propose improvements to the policy, which the T&S Committee will then vote on. + +### Membership + +The membership of the Room Directory Working Group will be determined by the [Trust & Safety Committee of the Governing Board](@/foundation/governing-board/committees.md#trust-safety). +Members may be added or removed by a majority vote of the T&S Committee. """ committee = "Trust & Safety Committee" members = ["Nico", "Sky", "mahdi", "Emma [it/its]", "Krille - Christian K."] +chairs = ["Sky"] sponsor = "Nico" matrix_room_alias = "#room-dir-wg-office:neko.dev" email = "" diff --git a/content/homeserver/room_directory.md b/content/homeserver/room_directory.md index d2a4d9fea..c86504c80 100644 --- a/content/homeserver/room_directory.md +++ b/content/homeserver/room_directory.md @@ -10,35 +10,7 @@ The Matrix.org Foundation offers a room directory as a public service via its ma The matrix.org public room directory is highly visible and widely used by users from across the federation. To give new users a safe way to find interesting rooms, The Matrix.org Foundation curates the directory. The management of the directory is handled by the [Room Directory Working Group](@/foundation/working-groups/index.md). -Currently, the Foundation aims to showcase rooms and communities related to Matrix and other open-source projects. If you’d like to have your room(s) listed in the directory, you can submit an application via [this form](https://cryptpad.fr/form/#/2/form/view/BIhKmupHthnfRK9e7rdJnG0ilU2k0dJtazvIMlfNCds/). +Currently, the Foundation aims to showcase rooms and communities related to Matrix and other open-source projects. If you’d like to have your room(s) listed in the directory, you can **submit an application via [this form](https://cryptpad.fr/form/#/2/form/view/BIhKmupHthnfRK9e7rdJnG0ilU2k0dJtazvIMlfNCds/)**. If you want to explore a even wider range of public Matrix rooms, you can also browse the directories of other homeservers or community projects such as [matrixrooms.info](https://matrixrooms.info) (these directories are independently operated and not affiliated with The Matrix.org Foundation). - -## Full policy - -The formal policy developed by the Trust & Safety Committee of the [Governing Board](@/foundation/governing-board/index.md) is below. Interpretation and changes are managed by the Trust & Safety Committee and approved by the [Trust & Safety](@/foundation/about/index.md#the-staff-of-the-foundation) team, while implementation is managed by the [Room Directory Working Group](@/foundation/working-groups/index.md). - -1. The matrix.org public room directory is highly visible and serves as the main entrypoint into the Matrix ecosystem for many new users. To ensure trust and safety on matrix.org and maintain a good onboarding experience, The Matrix.org Foundation curates the room directory. -2. Rooms or spaces may be included in the room directory if they meet the following criteria. - 1. Rooms must be actively moderated. There must be active users with a moderator role, and spam and abuse should be removed within a reasonable time period. - 2. Room moderators must be reasonably responsive to Foundation staff in the case of questions or concerns. - 3. Rooms must comply with best practices for moderation of large public rooms, as determined by the Trust and Safety Committee of the Governing Board. - 4. Rooms named after a recognisable organisation or project must be sponsored by that project or be clearly marked as unofficial, while still having a positive relationship with the project. - 5. In the case of a space, all rooms under the space must comply with this policy, and the administrators of the space must provide assurance that this will continue to be the case. -3. Approval of rooms for inclusion in the room directory is at the discretion of the Room Directory Working Group. Generally, the Working Group expects to approve rooms that are related to Matrix, other open source projects or communities, or other well-defined topics that are of interest to the Matrix community. Because of the difficulty of reviewing and moderating “general” rooms with no specific focus, they will not generally be approved. - 1. The Room Directory Working Group will consult Foundation Trust & Safety staff prior to approving additions. In some cases, Trust & Safety staff may object to the addition of a room. -4. Administrators of rooms aligned with this policy may request that they be added to the room directory by sending an email to *TBD* with a general description of the room’s topic and its moderation practices. The Working Group may follow up with additional questions. -5. Staff at The Matrix.org Foundation may remove rooms from the room directory if they are found to be in violation of the code of conduct or this policy, or if removal is required to mitigate an ongoing incident. -6. The Room Directory Working Group will review the directory contents at least annually to determine if rooms should remain listed. - -**Interpretation notes** - -* Clause 2's use of "may" permits approval *and* denial. -* Clause 3 is permissive to "vaguely related to Matrix", but is intended to be kept relatively narrow to "Matrix-related" for now. This may change in the future. -* Clause 4 supports using forms instead of an email address. - -**Implementation details** - -* The working group is expected to maintain an appeals process/form. -* The working group is responsible for internal approval/denial processes, including how to get rooms actually (de)listed in the room directory. diff --git a/sass/_base.scss b/sass/_base.scss index 38bab4d4c..a47eff344 100644 --- a/sass/_base.scss +++ b/sass/_base.scss @@ -79,6 +79,12 @@ table { margin-bottom: 1rem; } +blockquote { + margin: 0 0 10px 0; + padding: 10px 20px; + border-left: 5px solid #E2E2E2; +} + p:last-child, blockquote:last-child, figure:last-child, diff --git a/sass/_blog.scss b/sass/_blog.scss index 900050838..71b4e29ea 100644 --- a/sass/_blog.scss +++ b/sass/_blog.scss @@ -67,12 +67,6 @@ article.post { } } - blockquote { - margin: 0 0 10px 0; - padding: 10px 20px; - border-left: 5px solid #E2E2E2; - } - header { margin-bottom: 1rem; } diff --git a/sass/_working-groups.scss b/sass/_working-groups.scss index 306df136f..4103a060a 100644 --- a/sass/_working-groups.scss +++ b/sass/_working-groups.scss @@ -31,7 +31,6 @@ margin-bottom: 1rem; p { - margin: 0; line-height: 1.5; } } @@ -158,4 +157,4 @@ background-color: #ffc107; } } -} \ No newline at end of file +} diff --git a/templates/governing-board/working_group.html b/templates/governing-board/working_group.html new file mode 100644 index 000000000..e620defd5 --- /dev/null +++ b/templates/governing-board/working_group.html @@ -0,0 +1,74 @@ +{% extends "page.html" %} +{% block content -%} +
+
+

{{ page.title }}

+
+ + {% set wg_path = page.path | split(pat="/") | slice(end=-2) | join(sep="/") %} + {% set wg_path = wg_path ~ "/working_groups.toml" %} + {% set working_groups = load_data(path=wg_path, format="toml") %} + + {% for wg in working_groups.working_groups %} + {% if page.title is not starting_with(wg.name) %} + {% continue %} + {% endif %} + + {% if wg.committee == "Community Committee" %} + {% set committee_id = "community" %} + {% elif wg.committee == "Governance Committee" %} + {% set committee_id = "governance" %} + {% elif wg.committee == "Trust & Safety Committee" %} + {% set committee_id = "trust-and-safety" %} + {% elif wg.committee == "Finance & Fundraising Committee" %} + {% set committee_id = "finance" %} + {% endif %} + +
+
+

Charter

+
+

{{ wg.charter | markdown(inline=true) | safe }}

+
+

Members

+
+

{{ wg.members | join(sep=", ") }}

+

Sponsor: {{ wg.sponsor }}

+
+ {% if wg.meeting %} +

Meeting Schedule

+

{{ wg.meeting }}

+ {% endif %} +

Contact

+
+ + + + + Chat + {% if wg.email %} + + + + + + + Email + + {% endif %} +
+
+ + {{ page.content | safe }} +
+ {% endfor %} + +
+{%- endblock content %} diff --git a/templates/governing-board/working_groups.html b/templates/governing-board/working_groups.html index 122398394..19fbca3a8 100644 --- a/templates/governing-board/working_groups.html +++ b/templates/governing-board/working_groups.html @@ -25,7 +25,8 @@

{{ wg.name }} {{ wg.committee }} -
+

+

{{ wg.summary }}

@@ -37,7 +38,7 @@

{{ wg.description | markdown(inline=true) | safe }}

{% if wg.charter %} - Charter + Charter {% endif %}