Commit Graph

4869 Commits (d24f15a3a91b19429d65dd516e8cded1c7a2b44f)
 

Author SHA1 Message Date
Travis Ralston 17a9524cad changelog 7 years ago
Travis Ralston 2b96d73305 Fix third party signed definitions for join APIs
Fixes https://github.com/matrix-org/matrix-doc/issues/1978
7 years ago
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
7 years ago
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
7 years ago
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.
7 years ago
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
7 years ago
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.
7 years ago
Travis Ralston 415212c3a0
Merge pull request #2014 from matrix-org/travis/1.0/changelogs
Add missing changelogs and make existing ones match conventions
7 years ago
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.
7 years ago
Hubert Chathi ac08c84612
remove duplicate consideration
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
7 years ago
Hubert Chathi dd74baa5d0 clarify wording 7 years ago
Hubert Chathi d39baba21b add a security note 7 years ago
Hubert Chathi 7705006260 1 hour seems to be fine 7 years ago
Sorunome 273af2a2e0
wrap long lines 7 years ago
Sorunome 6f3bcb56d3
add rendering idea 7 years ago
Sorunome ebb1351a9f
linebreak consistency 7 years ago
Sorunome d750115fdc
fix up some things 7 years ago
Sorunome 70d3fd809e
add spoiler msc 7 years ago
Hubert Chathi 7bad359b0d switch to the 3-key system, and some wording improvements 7 years ago
Matthew Hodgson 37871106c6 MSC2002: Proposal for adopting MSC1884 as v4 rooms (#2002) 7 years ago
David Baker cae07d9e56
Merge pull request #1999 from matrix-org/dbkr/dummy_auth_for_disambiguation
Words on using m.login.dummy for disambiguation
7 years ago
David Baker c38581fb86
Too many spaces
Co-Authored-By: Travis Ralston <travpc@gmail.com>
7 years ago
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.
7 years ago
Travis Ralston ba18a6e9fa
Merge pull request #1992 from matrix-org/anoa/missing_punctuation3
Add missing period
7 years ago
Travis Ralston 00b7b70c06
Create 1992.clarification 7 years ago
Travis Ralston 7e093e95fc
Merge pull request #1991 from matrix-org/anoa/missing_punctuation2
Add missing punctuation
7 years ago
Travis Ralston ce904f9750
Merge pull request #1990 from matrix-org/anoa/missing_punctuation
Add missing period
7 years ago
Travis Ralston c54a5fc3df
Merge pull request #1989 from matrix-org/anoa/typo2
Add missing 'as'
7 years ago
Travis Ralston 947fa57183
Merge pull request #1988 from matrix-org/anoa/typo
fix grammatical error
7 years ago
Andrew Morgan 713e4401b4 Add changelogs 7 years ago
Andrew Morgan abd770419b Add changelog 7 years ago
Andrew Morgan 20d2fdc288 Add changelog 7 years ago
Andrew Morgan 57cf1aaa96 Add missing period 7 years ago
Andrew Morgan 3c62b90dfb Add missing punctuation 7 years ago
Andrew Morgan 40482f7616 Add missing period 7 years ago
Andrew Morgan c233535de0 fix typo 7 years ago
Andrew Morgan da82a42308 fix grammatical error 7 years ago
Richard van der Hoff 7c7bc677fb Trigger matrix.org rebuild 7 years ago
Brendan Abolivier e71b3ac754 Add details to what an unrecognised request is 7 years ago
Travis Ralston 62748a026d
Rename 0000-leave-reasons.md to 1983-leave-reasons.md 7 years ago
Travis Ralston 97786da4ad
Create 0000-leave-reasons.md 7 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>
7 years ago
Richard van der Hoff de3eb3218e
Merge pull request #1975 from matrix-org/rav/thumbnail_dimensions
Make thumbnail dimensions mandatory
7 years ago
Brendan Abolivier c1721cb6f7 Merge branch 'master' into babolivier/standardised-federation-response-format 7 years ago
Brendan Abolivier 661d69858e Add fallback 7 years ago
Richard van der Hoff dc09dcd64b
Merge pull request #1976 from matrix-org/rav/buildkite
jenkins is dead, long live buildkite
7 years ago
Richard van der Hoff 6cdc8982fa jenkins is dead, long live buildkite 7 years ago
Richard van der Hoff 14715468bb Make thumbnail dimensions mandatory
Fixes #1883
7 years ago
Richard van der Hoff 2ae122903f
Use the right name
Co-Authored-By: uhoreg <hubert@uhoreg.ca>
7 years ago
Andrew Morgan c230c2fd2f
Merge pull request #1967 from aqtusia/master
Replace /bind with /3pid/bind
7 years ago