Commit graph

1235 commits

Author SHA1 Message Date
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
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
Andrew Morgan
57cf1aaa96 Add missing period 2019-05-07 19:37:25 -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
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
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.
2019-04-05 16:24:51 -06:00
Travis Ralston
1c5ec68cd0
Merge pull request #1876 from matrix-org/travis/v3-id-grammar
Clarify v3 event representation in identifier grammar
2019-03-27 08:57:11 -06:00
Hubert Chathi
d224c4ff71 fix some errors in key export format
- empirically, we don't acatually wrap the array in an object
- fix an incorrect type
2019-03-25 18:57:17 -04:00
Travis Ralston
0ec34039e8 URL encode all the things 2019-03-20 14:44:54 -06:00
Travis Ralston
42cf72c60f URL encode matrix.to URIs 2019-03-20 14:43:16 -06:00
Vikingat-RAGE
76ee13b9bb Fixed bad spacing. 2019-03-18 21:54:56 +00:00
Vikingat-RAGE
1a739ec97b E2E typo fix in spec 2019-03-18 21:16:52 +00:00
Travis Ralston
c08d223cfe
Merge pull request #1889 from ma1uta/push_rules
Fix for the #1865
2019-02-28 13:31:56 -07:00
Ben Parsons
99405418c9 in the appendices, thanks earfolds 2019-02-26 18:11:02 +00:00
Hristo Venev
e825224b5b Restrict identifier port numbers to 5 digits. 2019-02-21 21:27:21 +00:00
Travis Ralston
621437b0c5
Merge pull request #1891 from QMatrixClient/kitsune-drop-obsolete-text
Remove extended text about life without transaction IDs
2019-02-21 11:31:55 -07:00
Travis Ralston
49119ed345
Merge pull request #1875 from matrix-org/travis/clarify-upgrades
Clarify the recommendations for "transferable state"
2019-02-18 06:14:43 -07:00
Kitsune Ral
989d7ff192 Remove extended text about life without transaction IDs
Signed-off-by: Kitsune Ral <Kitsune-Ral@users.sf.net>
2019-02-16 18:49:13 +09:00
Anatoly Sablin
befd76f853 Fix links. 2019-02-16 10:38:51 +03:00
Anatoly Sablin
17420c537a Fix links. 2019-02-16 08:56:02 +03:00
Anatoly Sablin
2de7ef9a3d #1865 Add the m.push_rules schema. 2019-02-15 23:23:38 +03:00
Andrew Morgan
48569c2156
Merge pull request #1853 from matrix-org/anoa/3pid_typos
Replace "3pid" with "3PID"
2019-02-11 15:11:28 +00:00
Andrew Morgan
df7223f992 Add changelogs 2019-02-11 10:02:05 +00:00
Travis Ralston
22188ebfeb Further clarify why membership events are not to be transferred 2019-02-10 19:54:20 -07:00
Travis Ralston
946acbf380 Clarify v3 event representation in identifier grammar
Fixes https://github.com/matrix-org/matrix-doc/issues/1870
Fixes https://github.com/matrix-org/matrix-doc/issues/1869
Fixes https://github.com/matrix-org/matrix-doc/issues/1867
2019-02-10 19:49:55 -07:00
Travis Ralston
f058a0f40a also power levels 2019-02-10 19:36:33 -07:00
Travis Ralston
ef13aef8c3 Clarify the recommendations for "transferable state"
Fixes https://github.com/matrix-org/matrix-doc/issues/1843
2019-02-10 19:33:43 -07:00
Travis Ralston
5721712eae Add M_RESOURCE_LIMIT_EXCEEDED
Original proposal: https://github.com/matrix-org/matrix-doc/issues/1504

No changes from the original proposal or implementations have been made intentionally here.
2019-02-10 17:47:17 -07:00
Travis Ralston
3e06473305
Merge pull request #1859 from matrix-org/travis/fix-v2-scope
Change notice about room v2's scope to represent reality
2019-02-07 11:41:25 -07:00
Travis Ralston
1f05c44a0b
Merge pull request #1860 from matrix-org/travis/fix-spelling-1
Fix spelling mistake: endponts -> endpoints
2019-02-07 08:11:43 -07:00
J. Ryan Stinnett
0ed0fee261
Update specification/rooms/v2.rst
Co-Authored-By: turt2live <travpc@gmail.com>
2019-02-07 08:09:35 -07:00
Travis Ralston
772ba8dc2a Add a table of contents to each room version spec
Fixes https://github.com/matrix-org/matrix-doc/issues/1852

We get clickable headers for free by doing this.
2019-02-06 22:26:41 -07:00
Travis Ralston
85578f9842 Fix spelling mistake: endponts -> endpoints
Fixes https://github.com/matrix-org/matrix-doc/issues/1677
2019-02-06 22:19:47 -07:00
Travis Ralston
cf11965a8e Change notice about room v2's scope to represent reality
Fixes https://github.com/matrix-org/matrix-doc/issues/1851
2019-02-06 22:15:13 -07:00
Travis Ralston
8bd9ca4edd Prep for r0.1.1 of s2s 2019-02-06 12:39:16 -07:00
Travis Ralston
bcef94ec70
Merge pull request #1847 from matrix-org/travis/s2s-unstable-warning
Add the "please use latest.html" warning to the s2s spec
2019-02-06 08:12:32 -07:00
Andrew Morgan
4ec3a43a85 Replace "3pid" with "3PID" 2019-02-05 12:58:11 +00:00
Travis Ralston
3581368f1f Add the "please use latest.html" warning to the s2s spec
Now that we have a release, we should be warning people who try and use the unstable spec as fact.
2019-02-04 14:48:31 -07:00
Travis Ralston
e9bac1b011 Remove wrong references to TLS fingerprints
Also fix some styling in the server discovery section - this didn't feel like it needed its own commit.
2019-02-04 13:50:17 -07:00
Travis Ralston
1f5783b329 fix links and wording 2019-02-01 18:07:55 -07:00
Travis Ralston
9631e4bcb1 Add a bit of text to ensure that the intro page isn't missed 2019-02-01 18:01:01 -07:00
Travis Ralston
8ace64bab7 r0.1.0 of the s2s specification 2019-02-01 16:10:22 -07:00
Travis Ralston
9364787b9c Remove stability warning 2019-02-01 16:09:48 -07:00
Aaron Raimist
fe7f582233
Fix several spelling mistakes
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-01 16:43:46 -06:00
Travis Ralston
d94a70f49d Warn clients about changes in event format 2019-02-01 08:40:18 -07:00