Commit graph

373 commits

Author SHA1 Message Date
Travis Ralston c1c26859e2
Merge pull request #2096 from matrix-org/travis/1.0/read-notifs
Clarify how notification counts are calculated in /sync
2019-06-11 07:50:33 -06:00
Travis Ralston 32761fc108
Merge pull request #2098 from matrix-org/travis/1.0/modules-update
Clarify what a "module" is and update feature profiles for clients
2019-06-10 14:05:15 -06:00
Travis Ralston 1886a2346a Move explanation of notifications to notifications module 2019-06-10 13:38:43 -06:00
Travis Ralston 4b6e2cc956
Merge pull request #2072 from matrix-org/travis/1.0/msc1717-msc1267-sas-verification
Spec SAS verification and the common key verification framework
2019-06-07 10:34:08 -06:00
Travis Ralston 46747e897e ing 2019-06-07 10:32:06 -06:00
Travis Ralston 5ec1a50b94 Linefeeds and other clarifications 2019-06-07 08:12:09 -06:00
Travis Ralston 3877896a4c Clarify how we now expect verification to be done 2019-06-07 08:10:52 -06:00
Travis Ralston d49c7fb3b0
Apply suggestions from code review
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-06-07 08:01:17 -06:00
Travis Ralston cd6b012523 Clarify what a "module" is and update feature profiles for clients
Fixes https://github.com/matrix-org/matrix-doc/issues/2009
2019-06-06 17:07:49 -06:00
Travis Ralston f0eb495cee Clarify how notification counts are calculated in /sync
Fixes https://github.com/matrix-org/matrix-doc/issues/2015
2019-06-06 15:41:28 -06:00
Travis Ralston aa110b2be2
Merge pull request #2025 from matrix-org/travis/1.0/3rdpartysigned
Fix third party signed definitions for join APIs
2019-06-05 07:10:19 -06:00
Travis Ralston a3364ff357 Spec SAS verification and the common key verification framework
Reference implementations:
* 94f664e725
* https://github.com/matrix-org/matrix-react-sdk/pull/2461
* https://github.com/matrix-org/matrix-js-sdk/pull/818
* https://github.com/matrix-org/matrix-react-sdk/pull/2596
* https://github.com/matrix-org/matrix-js-sdk/pull/837

Proposals:
* [MSC1717](https://github.com/matrix-org/matrix-doc/pull/1717)
* [MSC1267](https://github.com/matrix-org/matrix-doc/issues/1267)

No alterations to either proposal have been made intentionally here.
2019-06-04 12:43:47 -06:00
Travis Ralston 39144942da
Fix title ordering 2019-06-03 20:39:41 -06:00
Travis Ralston 57e3b152b0 Move section to under Olm stuff 2019-05-31 11:37:09 -06:00
Travis Ralston 754b19bb92
typo
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2019-05-31 10:21:16 -06:00
Travis Ralston 54f74cd877 Add Olm unwedging
As per [MSC1719](https://github.com/matrix-org/matrix-doc/pull/1719)

No known alterations have been made to the proposal.

Implementation proof: https://github.com/matrix-org/matrix-js-sdk/pull/780
2019-05-30 16:47:30 -06:00
Travis Ralston 4e58414b26 Clarify that clients should not ack their own messages
Fixes https://github.com/matrix-org/matrix-doc/issues/567
2019-05-27 23:20:09 -06:00
Travis Ralston ade346f8cc Add m.server_notice to reserved tags 2019-05-27 21:19:58 -06:00
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.
2019-05-26 20:52:59 -06:00
Travis Ralston 2b96d73305 Fix third party signed definitions for join APIs
Fixes https://github.com/matrix-org/matrix-doc/issues/1978
2019-05-26 15:39:35 -06:00
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.
2019-05-24 17:14:23 -06: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 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