Commit graph

734 commits

Author SHA1 Message Date
Richard van der Hoff cefd1a832e
server_server_api: fix typo in auth section
fixes "destintation" typo
2018-06-05 17:55:21 +01:00
Ben Parsons ffb8037af2 update MSC list 2018-06-05 16:43:42 +01:00
Ben Parsons ee98082a60 update MSC1270 2018-06-04 12:12:48 +01:00
Travis Ralston 8610effad7
Merge branch 'master' into travis/reporting 2018-05-31 10:57:33 -06:00
Ben Parsons 7a44351a34 update following rvdh spec blitz 2018-05-31 16:13:31 +01:00
Ben Parsons 34090b24c4 prepare proposals.py for CI 2018-05-29 14:19:03 +01:00
Travis Ralston 9037f506ac Document how to report content
Fixes: https://github.com/matrix-org/matrix-doc/issues/739

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-27 12:19:30 -06:00
Ben Parsons c3062b7db6 Include Proposals Page Title, update MSC1256 2018-05-24 11:36:56 +01:00
Ben Parsons 434e2949f9 include #1256 2018-05-23 17:00:26 +01:00
Ben Parsons 8d550d2166 force re-render 2018-05-23 09:39:18 +01:00
Ben Parsons 0b776b0e9c link to proposals page from index 2018-05-21 11:01:03 +01:00
Jason Volk 2a6895e759 Fix typo. 2018-05-18 17:06:22 -07:00
Ben Parsons 663e1a5ebe Update some text 2018-05-18 10:17:54 +01:00
Ben Parsons 9873a2a0ac link from the spec intro page 2018-05-17 18:33:12 +01:00
Ben Parsons 38adc7df06 latest generated proposals 2018-05-17 18:25:13 +01:00
Matthew Hodgson 8440179ecf clarify shepherds and clarify 'greater benefit'
as per https://github.com/matrix-org/matrix-doc/pull/1240#discussion_r188459957
2018-05-17 18:21:39 +01:00
Ben Parsons 4d3c4225b2 include proposal template link 2018-05-16 11:12:57 +01:00
Matthew Hodgson 84524df783 spell out requirements for doc editing 2018-05-15 17:38:33 +01:00
Ben Parsons 73b28612ec updates from feedback on pull 2018-05-15 16:07:55 +01:00
Matthew Hodgson 4c0743ef65 fix wording 2018-05-15 15:47:34 +01:00
Matthew Hodgson 10a8cb3f67 put handwavey timings on state transitions 2018-05-15 15:44:47 +01:00
Matthew Hodgson 4cdb4f105c clarify architecture 2018-05-15 15:11:51 +01:00
Matthew Hodgson 8096bf0039 perms and apostrophes 2018-05-15 15:07:47 +01:00
Matthew Hodgson 3e10a5a24a enter #matrix-spec:matrix.org 2018-05-15 15:02:35 +01:00
Matthew Hodgson 42fd3f34e4 shift stuff from contributing.rst to the new proposals page 2018-05-15 14:46:08 +01:00
Matthew Hodgson 3b736388ce clarify governance 2018-05-15 14:17:38 +01:00
Ben Parsons 3cef79f31d sublist formatting 2018-05-15 12:09:35 +01:00
Matthew Hodgson e27f674fb9 incept dates 2018-05-14 23:00:54 +01:00
Matthew Hodgson 29348c6190 improve wording 2018-05-14 22:35:53 +01:00
Matthew Hodgson 714767c95a explain proposal neutrality 2018-05-14 22:32:00 +01:00
Matthew Hodgson 755c9473fb more tweaks 2018-05-14 22:27:43 +01:00
Matthew Hodgson 07bf61b33b more tweaks 2018-05-14 22:22:09 +01:00
Matthew Hodgson 93681458d6 more tweaks 2018-05-14 22:13:28 +01:00
Matthew Hodgson cb882ba12d more tweaks 2018-05-14 22:07:49 +01:00
Matthew Hodgson 8c469e51cb lots of tweaks to the MSC verbiage 2018-05-14 22:05:28 +01:00
Ben Parsons b8f38b21a7 update introductory text 2018-05-14 14:25:12 +01:00
Ben Parsons 120fa92078 update intro 2018-05-14 10:25:10 +01:00
Ben Parsons 867307af8b new flow 2018-05-14 09:57:43 +01:00
Ben Parsons 866b0b6348 I mostly play with ascii art 2018-05-10 16:02:55 +01:00
Ben Parsons 9e37d15c8f little ascii diagram of process 2018-05-08 15:11:15 +01:00
Ben Parsons e18aa30fd2 start generating new proposals page 2018-05-02 13:47:01 +01:00
Jason Volk 2802fdea7e Fix typo. 2018-04-24 19:29:00 -07:00
Richard Lewis 8d05f80cec Sticker messages (m.sticker) (#1158) 2018-03-27 10:00:41 +01:00
Andrew Morgan cd26c170de Specify token used in /login is not an Access Token (#1155)
* Specify token used in /login is not an Access Token

While working through the implementation of /login in Dendrite, it was
confusing what the contents of the token attribute in the login request
body referred to. Initially, I thought it was an access token, which led
to further confusion. This commit explicitly states that the token is a
login token, which is separate from an access token, hopefully reducing
confusion for future readers.

Signed-off-by: Andrew Morgan (https://amorgan.xyz) <andrew@amorgan.xyz>
2018-03-23 10:00:49 +00:00
Vyom Sharma 4f5ad35865 fixed minor typo 2018-03-14 20:57:38 +05:30
Travis Ralston 331e49bd0d Improve the documentation of ignored users
* Fix the event schema to represent the real world
* Add the module to the spec targets
* Remove incomplete thought from the client behaviour
* Link to the account data API
* Minor word choice changes

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-03-06 09:00:32 -07:00
Travis Ralston d37ed0876f
Merge branch 'master' into travis/m.ignored_user_list 2018-03-05 14:52:37 -07:00
Richard van der Hoff a0dda3cae2
Merge branch 'master' into travis/m.tag 2018-03-05 18:58:53 +00:00
Travis Ralston e862ef60ae Spec ignoring users
Adds https://github.com/matrix-org/matrix-doc/issues/528

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-03-03 15:39:10 -07:00
Travis Ralston a3f006353c Tag ordering is defined as a number between 0 and 1, not strings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-03-03 12:40:48 -07:00