Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-01-02 14:08:38 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
6992 commits 31 branches 42 tags 32 MiB
Commit graph

6992 commits

This branch
This branch
All branches
Author SHA1 Message Date
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.
 2019-05-26 20:52:59 -06:00
Travis Ralston 17a9524cad changelog 2019-05-26 15:40:29 -06:00
Travis Ralston 2b96d73305 Fix third party signed definitions for join APIs 
Fixes https://github.com/matrix-org/matrix-doc/issues/1978
 2019-05-26 15:39:35 -06:00
Travis Ralston 5c268ef21f
Merge pull request #2020 from matrix-org/travis/1.0/msc1930-tombstone-notif 
Add a .m.rule.tombstone default push rule for room upgrades
 2019-05-25 09:03:34 -06:00
Travis Ralston 434e238d54
Merge pull request #2016 from matrix-org/travis/1.0/msc1954-redaction-bug 
Remove prev_content from the redaction essential keys list
 2019-05-25 09:03:01 -06:00
Travis Ralston ceaccffdf7 Add a .m.rule.tombstone default push rule for room upgrades 
As per [MSC1930](https://github.com/matrix-org/matrix-doc/pull/1930)

There are no known changes to this proposal since it was accepted.
 2019-05-24 17:14:23 -06:00
Travis Ralston 3b0e194ff7 Add version 4 rooms to the spec 
As per [MSC1884](https://github.com/matrix-org/matrix-doc/pull/1884) and [MSC2002](https://github.com/matrix-org/matrix-doc/pull/2002).

No known changes since the proposals were accepted.

Due to being in the area: This fixes https://github.com/matrix-org/matrix-doc/issues/1863
 2019-05-24 15:50:05 -06:00
Travis Ralston 3c38956510 Remove prev_content from the redaction essential keys list 
As per [MSC1954](https://github.com/matrix-org/matrix-doc/pull/1954)

No known changes since the proposal was accepted.
 2019-05-24 11:57:22 -06:00
Travis Ralston 415212c3a0
Merge pull request #2014 from matrix-org/travis/1.0/changelogs 
Add missing changelogs and make existing ones match conventions
 2019-05-24 08:40:38 -06:00
Travis Ralston 9c2a789d34 Add missing changelogs and make existing ones match conventions 
The conventions are not set in stone, however the changelog should not be a mixed bag of voices.
 2019-05-23 22:13:57 -06:00
Hubert Chathi ac08c84612
remove duplicate consideration 
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2019-05-23 14:39:46 -04:00
Hubert Chathi dd74baa5d0 clarify wording 2019-05-22 12:54:01 -04:00
Hubert Chathi d39baba21b add a security note 2019-05-22 12:44:04 -04:00
Hubert Chathi 7705006260 1 hour seems to be fine 2019-05-22 12:43:43 -04:00
Sorunome 273af2a2e0
wrap long lines 2019-05-22 17:30:18 +02:00
Sorunome 6f3bcb56d3
add rendering idea 2019-05-22 15:35:32 +02:00
Sorunome ebb1351a9f
linebreak consistency 2019-05-22 15:22:22 +02:00
Sorunome d750115fdc
fix up some things 2019-05-22 15:20:30 +02:00
Sorunome 70d3fd809e
add spoiler msc 2019-05-22 14:46:31 +02:00
Hubert Chathi 7bad359b0d switch to the 3-key system, and some wording improvements 2019-05-21 13:57:55 -04:00
Matthew Hodgson 37871106c6 MSC2002: Proposal for adopting MSC1884 as v4 rooms (#2002) 2019-05-21 16:21:46 +01:00
David Baker cae07d9e56
Merge pull request #1999 from matrix-org/dbkr/dummy_auth_for_disambiguation 
Words on using m.login.dummy for disambiguation
 2019-05-15 21:32:18 +01:00
David Baker c38581fb86
Too many spaces 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-05-14 19:20:01 +01:00
David Baker 383e02835e Words on using m.login.dummy for disambiguation 
Add some text on how m.login.dummy can be used to distinguish
a flow that would otherwise be a subset of other flows.
 2019-05-14 18:07:58 +01:00
Travis Ralston ba18a6e9fa
Merge pull request #1992 from matrix-org/anoa/missing_punctuation3 
Add missing period
 2019-05-07 23:12:47 -06:00
Travis Ralston 00b7b70c06
Create 1992.clarification 2019-05-07 23:09:39 -06:00
Travis Ralston 7e093e95fc
Merge pull request #1991 from matrix-org/anoa/missing_punctuation2 
Add missing punctuation
 2019-05-07 23:08:23 -06:00
Travis Ralston ce904f9750
Merge pull request #1990 from matrix-org/anoa/missing_punctuation 
Add missing period
 2019-05-07 23:07:07 -06:00
Travis Ralston c54a5fc3df
Merge pull request #1989 from matrix-org/anoa/typo2 
Add missing 'as'
 2019-05-07 23:06:46 -06:00
Travis Ralston 947fa57183
Merge pull request #1988 from matrix-org/anoa/typo 
fix grammatical error
 2019-05-07 23:06:27 -06:00
Andrew Morgan 713e4401b4 Add changelogs 2019-05-07 19:54:38 -07:00
Andrew Morgan abd770419b Add changelog 2019-05-07 19:52:38 -07:00
Andrew Morgan 20d2fdc288 Add changelog 2019-05-07 19:51:42 -07:00
Andrew Morgan 57cf1aaa96 Add missing period 2019-05-07 19:37:25 -07:00
Andrew Morgan 3c62b90dfb Add missing punctuation 2019-05-07 16:59:10 -07:00
Andrew Morgan 40482f7616 Add missing period 2019-05-07 15:55:07 -07:00
Andrew Morgan c233535de0 fix typo 2019-05-07 15:51:32 -07:00
Andrew Morgan da82a42308 fix grammatical error 2019-05-07 15:40:39 -07:00
Richard van der Hoff 7c7bc677fb Trigger matrix.org rebuild 2019-05-07 00:11:14 +01:00
Brendan Abolivier e71b3ac754 Add details to what an unrecognised request is 2019-05-01 16:53:29 +01:00
Travis Ralston 62748a026d
Rename 0000-leave-reasons.md to 1983-leave-reasons.md 2019-04-30 15:14:54 -06:00
Travis Ralston 97786da4ad
Create 0000-leave-reasons.md 2019-04-30 15:13:28 -06:00
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>
 2019-04-30 17:43:21 +01:00
Richard van der Hoff de3eb3218e
Merge pull request #1975 from matrix-org/rav/thumbnail_dimensions 
Make thumbnail dimensions mandatory
 2019-04-29 12:37:43 +01:00
Brendan Abolivier c1721cb6f7 Merge branch 'master' into babolivier/standardised-federation-response-format 2019-04-29 10:25:39 +01:00
Brendan Abolivier 661d69858e Add fallback 2019-04-29 10:24:46 +01:00
Richard van der Hoff dc09dcd64b
Merge pull request #1976 from matrix-org/rav/buildkite 
jenkins is dead, long live buildkite
 2019-04-27 19:46:19 +01:00
Richard van der Hoff 6cdc8982fa jenkins is dead, long live buildkite 2019-04-26 15:58:31 +01:00
Richard van der Hoff 14715468bb Make thumbnail dimensions mandatory 
Fixes #1883
 2019-04-26 14:41:19 +01:00
Richard van der Hoff 2ae122903f
Use the right name 
Co-Authored-By: uhoreg <hubert@uhoreg.ca>
 2019-04-25 20:49:58 -04:00