Commit Graph

3892 Commits (ade346f8cc173a532a0e991b61ed153a3ea93e9c)
 

Author SHA1 Message Date
Travis Ralston ade346f8cc Add m.server_notice to reserved tags 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
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
6 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
6 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.
6 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.
6 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
6 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.
6 years ago
Matthew Hodgson 37871106c6 MSC2002: Proposal for adopting MSC1884 as v4 rooms (#2002) 6 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
6 years ago
David Baker c38581fb86
Too many spaces
Co-Authored-By: Travis Ralston <travpc@gmail.com>
6 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.
6 years ago
Travis Ralston ba18a6e9fa
Merge pull request #1992 from matrix-org/anoa/missing_punctuation3
Add missing period
6 years ago
Travis Ralston 00b7b70c06
Create 1992.clarification 6 years ago
Travis Ralston 7e093e95fc
Merge pull request #1991 from matrix-org/anoa/missing_punctuation2
Add missing punctuation
6 years ago
Travis Ralston ce904f9750
Merge pull request #1990 from matrix-org/anoa/missing_punctuation
Add missing period
6 years ago
Travis Ralston c54a5fc3df
Merge pull request #1989 from matrix-org/anoa/typo2
Add missing 'as'
6 years ago
Travis Ralston 947fa57183
Merge pull request #1988 from matrix-org/anoa/typo
fix grammatical error
6 years ago
Andrew Morgan 713e4401b4 Add changelogs 6 years ago
Andrew Morgan abd770419b Add changelog 6 years ago
Andrew Morgan 20d2fdc288 Add changelog 6 years ago
Andrew Morgan 57cf1aaa96 Add missing period 6 years ago
Andrew Morgan 3c62b90dfb Add missing punctuation 6 years ago
Andrew Morgan 40482f7616 Add missing period 6 years ago
Andrew Morgan c233535de0 fix typo 6 years ago
Andrew Morgan da82a42308 fix grammatical error 6 years ago
Richard van der Hoff 7c7bc677fb Trigger matrix.org rebuild 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 de3eb3218e
Merge pull request #1975 from matrix-org/rav/thumbnail_dimensions
Make thumbnail dimensions mandatory
6 years ago
Richard van der Hoff dc09dcd64b
Merge pull request #1976 from matrix-org/rav/buildkite
jenkins is dead, long live buildkite
6 years ago
Richard van der Hoff 6cdc8982fa jenkins is dead, long live buildkite 6 years ago
Richard van der Hoff 14715468bb Make thumbnail dimensions mandatory
Fixes #1883
6 years ago
Andrew Morgan c230c2fd2f
Merge pull request #1967 from aqtusia/master
Replace /bind with /3pid/bind
6 years ago
Matthew Hodgson 5c62d6271c
Merge pull request #1969 from jplatte/patch-1
Fix a typo in m.call.invite
6 years ago
Andrew Morgan 5792e5f4de
Merge pull request #1954 from matrix-org/neilj/Remove-prev_content-from-the-essential-keys-list2
MSC1954: Proposal to remove prev_content from the essential keys list
6 years ago
Jonas Platte 043dddc490
Fix a typo in m.call.invite 6 years ago
Neil Johnson 911fb94ea0
typos 6 years ago
aqtusia 2eb9708f7f
Replace /unbind with /3pid/unbind 6 years ago
aqtusia 24e0ec4bce
Replace /bind with /3pid/bind 6 years ago
Neil Johnson b41fbc86b6 add further potential issues and security concerns 6 years ago
Travis Ralston b12e92440e
Merge pull request #1930 from matrix-org/travis/msc/tombstone-notif
MSC1930: Add a push rule for m.room.tombstone events
6 years ago
Travis Ralston cecf75c9a9
Merge pull request #1884 from matrix-org/rav/proposal/no_slash_in_event_id
MSC1884: Proposal to replace slashes in event IDs
6 years ago
Travis Ralston 64d48855e2
Merge pull request #1955 from matrix-org/travis/spec/1704
Add permalink routing through ?via parameters on matrix.to URIs
6 years ago
Travis Ralston 99cd064f26 Update original MSC as per proposal guidelines 6 years ago
Travis Ralston 8ad82ce3c0 Add permalink routing through ?via parameters on matrix.to URIs
Spec for [MSC1704](https://github.com/matrix-org/matrix-doc/pull/1704)

Reference implementations:
* Original: https://github.com/matrix-org/matrix-react-sdk/pull/2250
* Modern recommendations: 2ca281f6b7/src/matrix-to.js (L29-L70)

The only deviation from the original MSC is the recommendation for which servers to pick. The original MSC failed to consider server ACLs and IP addresses correctly, and during implementation it was realized that both of these cases should be handled. The core principles of the original MSC are left unaltered.
6 years ago
Neil Johnson 743eeca27a MSC to remove prev_content from the essential keys list 6 years ago
Matthew Hodgson 88f533f0db incorporate further feedback 6 years ago
Matthew Hodgson 417f3a3e8b incorporate further feedback from vdh 6 years ago
Hubert Chathi 9dcf2d6a28
Update proposals/1884-replace-slashes-in-event_ids.md
Co-Authored-By: ara4n <matthew@arasphere.net>
6 years ago
Matthew Hodgson 207d6cf851 update MSC1884 to reflect new conclusions following discussion on the PR 6 years ago