Commit graph

2607 commits

Author SHA1 Message Date
Richard van der Hoff
c84066df89
do not use 'optional' in descriptions. 2018-06-22 14:30:24 +01:00
Richard van der Hoff
dfa4af5c19
record that "identity server" has two words 2018-06-22 11:08:19 +01:00
Matthew Hodgson
4fcf7252b1
Merge pull request #1317 from turt2live/patch-1
Don't suggest reusing old issues for spec proposals
2018-06-18 20:55:34 +01:00
Travis Ralston
d647169806
Add more strength to the suggestion to find existing issues
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-06-18 13:20:42 -06:00
Travis Ralston
fc402c296b
Don't suggest reusing old issues for spec proposals
In practice this was confusing for people, so instead we should encourage people to create new issues and reference the existing ones.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-06-18 12:03:14 -06:00
Matthew Hodgson
8fe88d2590
Merge pull request #1311 from matrix-org/anoa/small_fixes
Small grammatical and stylistic fixes
2018-06-17 16:40:16 +01:00
user
54c3003b74 newly joined -> newly-joined 2018-06-17 16:35:23 +01:00
user
5ab5fe08d1 Small grammatical and stylistic fixes 2018-06-17 15:49:39 +01:00
Michael Telatynski
39e33d0cbb
Merge pull request #1291 from matrix-org/anoa/fix_typo_events
Fix typo
2018-06-11 20:41:51 +01:00
Andrew Morgan
2e5cdaf51c
Fix typo
"To stream events all the events" -> "To stream all the events"
2018-06-11 14:25:05 +01:00
Michael Kaye
5e1c7350ae
Merge pull request #1283 from matrix-org/michaelkaye/re_add_proposals
Add back proposals.rst with a link to the actual location
2018-06-07 16:37:04 +01:00
Michael Kaye
72282577bf Add back proposals.rst with a link to the actual location 2018-06-07 16:35:11 +01:00
Ben Parsons
77117ea8ee
Merge pull request #1282 from matrix-org/benparsons/proposalsCI
include proposals.py in matrix-doc CI
2018-06-07 15:42:54 +01:00
Ben Parsons
18ba0d6d81 remove propsals.rst as it will be regenerated 2018-06-07 15:32:18 +01:00
Ben Parsons
0c1ba33eba include proposals.py in matrix-doc CI 2018-06-07 14:30:50 +01:00
Ben Parsons
a552c1853e update for MSC 701 2018-06-07 14:07:02 +01:00
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
Richard van der Hoff
92cf91dc69
Merge pull request #1278 from matrix-org/t3chguy/search_docs
Fix two issues with /search docs
2018-06-05 11:13:50 +01:00
Michael Telatynski
968ee0f613
add changelog 2018-06-05 10:13:54 +01:00
Michael Telatynski
df5455de1f
re-arrange fields in example /search request to make them a valid request. 2018-06-05 10:12:34 +01:00
Michael Telatynski
64f97c5b78
add example of highlights field in /search response 2018-06-05 10:10:24 +01:00
Michael Telatynski
4ff5887c91
spec the highlights field in /search response 2018-06-05 10:06:26 +01:00
Ben Parsons
ee98082a60 update MSC1270 2018-06-04 12:12:48 +01:00
Richard van der Hoff
b00131a774
Merge pull request #1265 from turt2live/travis/clarify-routing-loops
Document the allow_remote query param on the media repo
2018-06-01 08:00:47 +01:00
Travis Ralston
3dc54b20c6
Merge branch 'master' into travis/clarify-routing-loops 2018-05-31 11:53:04 -06:00
Richard van der Hoff
9191b0fa82
Merge pull request #1264 from turt2live/travis/reporting
Document how to report content
2018-05-31 18:02:32 +01:00
Travis Ralston
8610effad7
Merge branch 'master' into travis/reporting 2018-05-31 10:57:33 -06:00
Richard van der Hoff
f17195529b
Merge pull request #1263 from turt2live/travis/logout_all
Document /logout/all
2018-05-31 17:41:39 +01:00
Ben Parsons
7a44351a34 update following rvdh spec blitz 2018-05-31 16:13:31 +01:00
Ben Parsons
cb00fc35ab git checkout master 2018-05-31 15:54:23 +01:00
Ben Parsons
d1c27349b2 Merge branch 'master' of https://github.com/matrix-org/matrix-doc 2018-05-31 15:47:34 +01:00
Richard van der Hoff
419bf1e52c Fix continuserv instructions
As per f04b17f1c9

Also dedup continuserv readme
2018-05-30 09:45:22 +01:00
Ben Parsons
7a82a5d427 correct proposals.py 2018-05-29 14:20:48 +01:00
Ben Parsons
34090b24c4 prepare proposals.py for CI 2018-05-29 14:19:03 +01:00
Travis Ralston
8cbd802650 Add allow_remote to the changelog
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-27 12:36:50 -06:00
Travis Ralston
7cc15f3315 Document the allow_remote query param on the media repo
Fixes https://github.com/matrix-org/matrix-doc/issues/837

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-27 12:34:58 -06:00
Travis Ralston
352f1b7776 Add report content API to changelog
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-27 12:23:46 -06: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
Travis Ralston
59ea10b842 Add changelog entry for /logout/all
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-27 11:47:28 -06:00
Travis Ralston
4278cd56a4 Document /logout/all
Fixes https://github.com/matrix-org/matrix-doc/issues/700

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-27 11:45:36 -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
Matthew Hodgson
4609220084
Merge pull request #1247 from matrix-construct/master
Fix typo.
2018-05-19 09:11:31 +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
Richard van der Hoff
3967833a1a
Merge pull request #1244 from florianjacob/room_member_authentication
/rooms/{roomId}/members: specify access_token requirement
2018-05-18 08:16:02 +01:00
Ben Parsons
f09f9e186a
Merge pull request #1240 from matrix-org/proposals
Spec Proposals page on matrix.org
2018-05-17 18:35:26 +01:00