332 Commits (42dbeee7d356e96f22c4b64bda4a3c0594dfd76f)

Author	SHA1	Message	Date
Jimmy Cuadra	5384b61d95	Fix style issues brought up during code review. ... Signed-off-by: Jimmy Cuadra <jimmy@jimmycuadra.com>	6 years ago
Jimmy Cuadra	bc71dacaf4	Clarify the distinction between *m.key.verification.start* and its *m.sas.v1* variant. ... Currently the *m.key.verification.start* event appears twice with the exact same title, in the "Key verification framework" section and the "Short Authentication (SAS) verification" section. It's not immediately clear that the first occurrence describes the format of the event in general terms and that the second occurrence describes the fields when the *m.sas.v1* verification method is being used. This is a similar relationship to the *m.room.message* event and its various *msgtype* variants. This commit does three things: * It tweaks the generation of the documentation to change the title of the second occurrence of *m.key.verification.start* to distinguish it from the first. * It updates the language in the description of the two versions of the event to better describe the relationship between the two. * It adds the optional `next_method` field to the schema of the *m.sas.v1* variant, as specified in the general form of *m.key.verification.start*. Signed-off-by: Jimmy Cuadra <jimmy@jimmycuadra.com>	6 years ago
Travis Ralston	e60d2defbd	Fix changelog generation ... Only include the target version, not all versions. Additionally, make sure the appservice spec isn't hardcoded as "unstable".	6 years ago
Travis Ralston	2d18f81807	Merge pull request #2087 from matrix-org/travis/1.0/events-are-extensible ... Reorganize event structure in c2s spec and clarify event capabilities	6 years ago
Travis Ralston	4b6e2cc956	Merge pull request #2072 from matrix-org/travis/1.0/msc1717-msc1267-sas-verification ... Spec SAS verification and the common key verification framework	6 years ago
Travis Ralston	79bbb47d9f	Clarify when authorization and rate-limiting are not applicable ... Fixes https://github.com/matrix-org/matrix-doc/issues/1971	6 years ago
Travis Ralston	8fd5b15594	Reorganize event structure in c2s spec and clarify event capabilities ... Fixes https://github.com/matrix-org/matrix-doc/issues/1166 Fixes https://github.com/matrix-org/matrix-doc/issues/1527 Fixes https://github.com/matrix-org/matrix-doc/issues/1827 Note: In order to fix the "state events have the following fields: [no words]" bug (1827) we need to resolve references on common event types. When doing this we ultimately end up with more fields than may be required to explain the section, however this commit alters the section descriptions to just say "these fields" instead of "these additional fields". This is also preferable over trying to get the inheritance reversed in the common event types, as the `/sync` endpoint has a high amount of reliance on partial events definitions.	6 years ago
Travis Ralston	9ac89cc915	Merge pull request #2056 from matrix-org/travis/1.0/membership-table ... Add a table to show how changes in membership should be interpreted	6 years ago
Travis Ralston	a3364ff357	Spec SAS verification and the common key verification framework ... Reference implementations: * 94f664e725 * https://github.com/matrix-org/matrix-react-sdk/pull/2461 * https://github.com/matrix-org/matrix-js-sdk/pull/818 * https://github.com/matrix-org/matrix-react-sdk/pull/2596 * https://github.com/matrix-org/matrix-js-sdk/pull/837 Proposals: * [MSC1717](https://github.com/matrix-org/matrix-doc/pull/1717) * [MSC1267](https://github.com/matrix-org/matrix-doc/issues/1267) No alterations to either proposal have been made intentionally here.	6 years ago
Travis Ralston	f3c0c5232f	Add a table to show how changes in membership should be interpreted ... Fixes https://github.com/matrix-org/matrix-doc/issues/876	6 years ago
Travis Ralston	d6d74c4cbe	Switch to using $ instead of # for sub-types ... # is reserved by the swagger validator as a way to include partial content from a JSON object (eg: "#/path" would include {"test": true} from the object {"path":{"test":true}}). Instead of trying to convince the validator that it is wrong, we'll just use a different character. Note that our rendering tools do not care about #-style references to objects. It's still somewhat worth changing the character though.	6 years ago
Travis Ralston	62890d21b2	Fix example Content-Type for /media/upload request ... Fixes https://github.com/matrix-org/matrix-doc/issues/1770	6 years ago
Travis Ralston	5eea4a477f	Add server notices support ... As per [MSC1452](https://github.com/matrix-org/matrix-doc/issues/1452) Fixes https://github.com/matrix-org/matrix-doc/issues/1254 Although MSC1452 focuses on just the warnings part of the server notices, the base for notices has not been established in the spec. This commit adds the needed support to be able to handle notices. No intentional divergences from the proposal are included in this changeset. There are a few additions which are used in practice although not defined in the proposal, such as who is responsible for aesthetics, sending notices, and other misc rules.	6 years ago
Richard van der Hoff	4e9dc2098f	Fix comments which refer to jenkins. (#1981) ... * Fix comments which refer to jenkins. * Spelling Co-Authored-By: turt2live <travpc@gmail.com>	6 years ago
Richard van der Hoff	6cdc8982fa	jenkins is dead, long live buildkite	6 years ago
Travis Ralston	b1689a3036	Misc improvements	6 years ago
Travis Ralston	b42310ab9d	Merge branch 'master' into travis/fix-changelog	6 years ago
Travis Ralston	76946a8a7c	Simplify changelog generation ... We don'e need `{{server_server_changelog_r0.1.0}}` (for example), so don't go through the hassle of generating it. Instead, we'll generate the changelog for the requested versions of each API and put that in place. In the future, we may wish to consider bringing back more complicated variables when/if we start generating released versions of the spec on the fly rather than manually.	6 years ago
Travis Ralston	54ee861b5f	Fix changelog generation for non-default versions ... Currently if you generate a changelog for r0.1.1 of an API, you'd get "No significant changes" which is wrong. You should get a real changelog for the version. This is now handled by generating a "preferred" changelog which acts as the default for version variables in the RST. Using a specific version's changelog is still supported for the rare cases where that is desired.	6 years ago
Travis Ralston	6067a4ad3c	Use the real identity server version in the APIs table	6 years ago
Travis Ralston	6c7eea555a	Merge pull request #1773 from matrix-org/travis/spec/rooms ... Add a room version specification	6 years ago
Travis Ralston	71e6321f4d	Rework how room versions are represented ... Versions are actually on a scale of recommendations, and are expected to be created as needed. The scale presented here (develop/beta/default/recommended/mandatory) is a more wordy version of what was previously discussed/intended for room versions - the labels aren't final and may be changed.	6 years ago
Andrew Morgan	b7b96833d0	Fix sticky headers so they don't hide behind header bar on desktop	6 years ago
Andrew Morgan	f738f671d1	Sticky headers for proposals page	6 years ago
Travis Ralston	ffe577371d	Add a room version specification ... The "Room Specification" (or "Room Version Specification") is the specification that defines which room versions do what and are intended to be documents which speak the truth about how rooms operate under the hood. The approach taken here is a bit different than other specifications. For starters, the specification is versioned in this project instead of relying on the matrix.org repository to track compiled HTML. This is done for a couple reasons, the first being we're still developing the v1 specification while concurrently making a v2 spec and the second being trying to reduce the reliance on matrix.org's repository for specifications. Because the room spec is built into versions, some changes needed to be made. The `targets.yaml` now has a special syntax for indicating what version something is at, and the changelog generator can handle rendering different versions of the same changelog (as parsed from the RST). Some additional work has been put in to the changelog parsing to allow us to reference the v1 room spec as "v1" without having to sacrifice clarity in the changelog headings. Finally, this moves the state resolution algorithms into the versioned spec as a result of MSC1759 (https://github.com/matrix-org/matrix-doc/pull/1759). Note: this does not introduce the concept of versioned schemas (tabs) that I was previously working with. There's currently no use for them, so they are shelved elsewhere.	6 years ago
Richard van der Hoff	a451e007a4	Fix labels in proposals script	6 years ago
Richard van der Hoff	fa0b4f9e13	Make the proposal labels match what happens in practice	6 years ago
Richard van der Hoff	926cfe4f75	Change the labels the proposals list looks for ... This is slightly complicated by the `proposal-wip` label going away, and becoming implicit	6 years ago
Erik Johnston	4271391214	Initial stab at documenting soft fail (#1641)	6 years ago
Matthew Hodgson	1fc6465168	remove archaic port 8448 from matrix.org URL for swagger-ui	6 years ago
Matthew Hodgson	d789564db7	only apply list CSS overrides to section classes	6 years ago
Travis Ralston	7d34995ece	It's actually an "identity server implementing the Identity Service API" ... Also add a note about appservices being special.	6 years ago
Travis Ralston	7ac76fa27c	Actually we're going with "identity server" afterall	6 years ago
Richard van der Hoff	8773b9319b	Merge pull request #1599 from matrix-org/benpa/spec-tables-prettier ... Benpa/spec tables prettier	6 years ago
Travis Ralston	84a2b7f3c0	Merge pull request #1632 from uhoreg/fix_room_member_state_key ... fix handling of multi-line state key descriptions	6 years ago
Ben Parsons	c77b505441	capitali[zs]e path parameters	6 years ago
Ben Parsons	778fe2a47a	css caption size tweak	6 years ago
Ben Parsons	e8afab1fe5	many visual improvements	6 years ago
Travis Ralston	98a445890c	Render a warning if the spec is unstable ... Fixes https://github.com/matrix-org/matrix-doc/issues/1499 This is done by using magic variables in the RST. The magic variables are generated based on the substitutions available, making them available for use at build-time. Magic variables were chosen because it allows people to continue working on the spec and release process without having to worry about removing a chunk of text from the top of the file. Originally, this was attempted by using jinja2 if-statements, however the substitutions are replaced *after* the template is executed, so the condition would never match. The format of the variable is to make the templating happy. Using colons or percent signs results in the templator thinking something else is going on, and then complaining about format.	6 years ago
Travis Ralston	cee0a5ac7b	Merge pull request #1557 from turt2live/travis/general/r0-prep ... Prepare the identity service and server-server APIs for r0	6 years ago
Hubert Chathi	a1b1054aa1	fix handling of multi-line state key descriptions	6 years ago
Travis Ralston	2753d24302	Merge remote-tracking branch 'matrix-org/master' into travis/general/r0-prep	6 years ago
Travis Ralston	827033c128	Merge remote matrix-org/master	6 years ago
Richard van der Hoff	f649d04ae1	Merge pull request #1626 from matrix-org/rav/encoding ... Set the encoding to UTF-8 on all file I/O	6 years ago
Richard van der Hoff	20c9829f56	Merge pull request #1627 from matrix-org/travis/general/dont-build-proposals ... Don't generate proposals.rst in Circle CI	6 years ago
Travis Ralston	ecd3ce39e5	Don't generate proposals.rst in Circle CI	6 years ago
Richard van der Hoff	4e90b32348	Set the encoding to UTF-8 on all file I/O ... Hopefully this will resolve issues with building the spec on systems where the default encoding is somthing other than UTF-8.	6 years ago
Ben Parsons	f1ae872857	light zebra striping for tables	6 years ago
Ben Parsons	9e1d6d7490	sanitise caption handling	6 years ago
Travis Ralston	b2092922e8	Don't define a variable for the appservice major version	6 years ago