Commit graph

352 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
2de7ef9a3d #1865 Add the m.push_rules schema. 2019-02-15 23:23:38 +03:00
Travis Ralston
22188ebfeb Further clarify why membership events are not to be transferred 2019-02-10 19:54:20 -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
Aaron Raimist
fe7f582233
Fix several spelling mistakes
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-01 16:43:46 -06:00
Neil Johnson
c09fa6845e
Update presence.rst 2019-01-29 18:23:30 +00:00
Neil Johnson
bf2b6e6daa remove references to presence lists 2019-01-28 15:05:10 +00:00
Travis Ralston
052d68d83d
Merge pull request #1791 from matrix-org/travis/spec/rver-upgrades
Add room version upgrades
2019-01-23 19:04:24 -07:00
Travis Ralston
0dfc64a9f4 Improve wording 2019-01-22 18:11:36 -07:00
Travis Ralston
2457438f1e Encourage servers to transfer whatever they can while being open-ended 2019-01-17 13:57:02 -07:00
Travis Ralston
4e0533a5f3 Soften UX requirements 2019-01-17 13:56:48 -07:00
Travis Ralston
82ee3a6035 Adjust wording for SSO introduction 2019-01-17 11:18:48 -07:00
Travis Ralston
aeb524ef89 Remove CAS login and reference it against r0.4.0
The SSO module should cover what CAS provides, and r0.4.0 is good as a reference for how CAS could be implemented without us repeating it here.
2019-01-16 16:13:53 -07:00
Travis Ralston
b85f7bb248 Add room version upgrades
Implements https://github.com/matrix-org/matrix-doc/issues/1501
2019-01-09 17:02:09 -07:00
Travis Ralston
d6c33ea0a5 Make CAS a subset of SSO 2019-01-09 14:41:46 -07:00
Travis Ralston
3e7a5f5ea4 Initial draft for SSO support 2019-01-09 00:09:38 -07:00
Travis Ralston
35de43de61
Merge pull request #1743 from matrix-org/dbkr/add_sandbox_to_csp
Add 'sandbox' to recommended CSP header
2018-12-17 10:28:06 -07:00
J. Ryan Stinnett
d197a5761f Clarify encrypted push rules
Fix `.m.rule.encrypted_room_one_to_one` by moving a condition to the right block
of the rule.

Fix `.m.rule.encrypted` to state that it applies to group rooms.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-11 16:07:01 +00:00
David Baker
e318286404 Add 'sandbox' to recommended CSP header 2018-12-10 17:33:04 +00:00
Hubert Chathi
189725659a clarifications and formatting fixes 2018-11-05 15:43:18 -05:00
Hubert Chathi
46fde9723c document megolm session export format 2018-10-19 10:55:14 -04:00
Konstantinos Sideris
192a6c2ab9 Use example.org on examples instead of domain.com which is a real domain
Signed-off-by: Konstantinos Sideris <sideris.konstantin@gmail.com>
2018-09-02 17:58:21 +03:00
Travis Ralston
218b86d6e8 Hopefully the last one 2018-08-31 15:48:41 -06:00
Travis Ralston
7d34995ece It's actually an "identity server implementing the Identity Service API"
Also add a note about appservices being special.
2018-08-31 15:35:32 -06:00
Travis Ralston
7ac76fa27c Actually we're going with "identity server" afterall 2018-08-31 15:04:00 -06:00
Travis Ralston
ec248b436f Identity Service is lowercase 2018-08-31 15:04:00 -06:00
Travis Ralston
cc0badaaa1 Fix all naming cases of "identity service"
Fixes https://github.com/matrix-org/matrix-doc/issues/1396

Includes some "homeserver" fixes too. This commit does not include historical documentation or notes.
2018-08-31 15:04:00 -06:00
Travis Ralston
108c623557
Merge pull request #1635 from turt2live/travis/c2s/read-markers
Add read markers
2018-08-31 14:47:39 -06:00
Hubert Chathi
c0dd7e0025
Merge pull request #1420 from Zil0/encrypted_attach
Document encrypted attachments
2018-08-31 13:33:05 -04:00
Travis Ralston
4b9fb99644 Take out unhelpful example 2018-08-31 11:18:54 -06:00
Travis Ralston
f6d9e53f5c Clarify that homeserver must reject clients from setting m.fully_read 2018-08-31 11:13:32 -06:00
Travis Ralston
2e8151999e Clarify that read markers are fully read markers 2018-08-31 11:13:19 -06:00
Hubert Chathi
f1f32d3a15 add more clarifications 2018-08-31 12:59:57 -04:00
Travis Ralston
679ddabb53 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/read-markers 2018-08-31 10:34:19 -06:00
Travis Ralston
567843e043 Add additional clarity to how rich replies are structured and used 2018-08-31 10:20:26 -06:00
Hubert Chathi
e3daf10bb9 refactor encrypted file schema as "Extension to m.message" 2018-08-31 12:11:27 -04:00
Travis Ralston
9004be7bda Merge remote matrix-org/master 2018-08-31 10:08:05 -06:00
Travis Ralston
f72c821be4
Merge pull request #1619 from turt2live/travis/c2s/local-echo
Reference that transaction IDs may be used to echo
2018-08-31 09:48:02 -06:00
Travis Ralston
136ba15eb2
Merge pull request #1605 from turt2live/travis/c2s/clarify-html-again
Mention that clients should not be producing invalid HTML
2018-08-31 08:41:29 -06:00