Commit graph

5313 commits

Author SHA1 Message Date
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
Andrew Morgan c230c2fd2f
Merge pull request #1967 from aqtusia/master
Replace /bind with /3pid/bind
2019-04-25 13:30:10 -07:00
Matthew Hodgson 5c62d6271c
Merge pull request #1969 from jplatte/patch-1
Fix a typo in m.call.invite
2019-04-21 11:54:32 +01:00
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
2019-04-21 02:00:18 -07:00
Jonas Platte 043dddc490
Fix a typo in m.call.invite 2019-04-20 21:56:43 +02:00
Neil Johnson 911fb94ea0
typos 2019-04-15 17:08:09 +01:00
aqtusia 2eb9708f7f
Replace /unbind with /3pid/unbind 2019-04-14 18:21:59 +02:00
aqtusia 24e0ec4bce
Replace /bind with /3pid/bind 2019-04-14 18:17:44 +02:00
Neil Johnson b41fbc86b6 add further potential issues and security concerns 2019-04-09 13:56:45 +01:00
Travis Ralston 0bab70c14e Assign MSC number 2019-04-08 21:37:35 -06:00
Travis Ralston d6d0f9780d Proposal for basic integration manager authentication APIs 2019-04-08 21:36:16 -06:00
Travis Ralston bd0211be12 Assign MSC number 2019-04-08 21:24:57 -06:00
Travis Ralston e8de1423b1 Proposal for OpenID information exchange with widgets 2019-04-08 21:22:55 -06:00
Travis Ralston b12e92440e
Merge pull request #1930 from matrix-org/travis/msc/tombstone-notif
MSC1930: Add a push rule for m.room.tombstone events
2019-04-08 11:25:52 -06:00
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
2019-04-08 11:25:26 -06:00
Travis Ralston 64d48855e2
Merge pull request #1955 from matrix-org/travis/spec/1704
Add permalink routing through ?via parameters on matrix.to URIs
2019-04-08 11:20:59 -06:00
J. Ryan Stinnett 13d63685d3
Spelling
Co-Authored-By: turt2live <travpc@gmail.com>
2019-04-08 07:05:38 -06:00
Travis Ralston 2dcda7d564 Add a mention that clients should re-query .well-known 2019-04-07 21:17:14 -06:00