Commit Graph

2602 Commits (8fe88d259098267f34c555d4a44ac9f45efee84b)
 

Author SHA1 Message Date
Matthew Hodgson 8fe88d2590
Merge pull request #1311 from matrix-org/anoa/small_fixes
Small grammatical and stylistic fixes
6 years ago
user 54c3003b74 newly joined -> newly-joined 6 years ago
user 5ab5fe08d1 Small grammatical and stylistic fixes 6 years ago
Michael Telatynski 39e33d0cbb
Merge pull request #1291 from matrix-org/anoa/fix_typo_events
Fix typo
6 years ago
Andrew Morgan 2e5cdaf51c
Fix typo
"To stream events all the events" -> "To stream all the events"
6 years ago
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
6 years ago
Michael Kaye 72282577bf Add back proposals.rst with a link to the actual location 6 years ago
Ben Parsons 77117ea8ee
Merge pull request #1282 from matrix-org/benparsons/proposalsCI
include proposals.py in matrix-doc CI
6 years ago
Ben Parsons 18ba0d6d81 remove propsals.rst as it will be regenerated 6 years ago
Ben Parsons 0c1ba33eba include proposals.py in matrix-doc CI 6 years ago
Ben Parsons a552c1853e update for MSC 701 6 years ago
Richard van der Hoff cefd1a832e
server_server_api: fix typo in auth section
fixes "destintation" typo
6 years ago
Ben Parsons ffb8037af2 update MSC list 6 years ago
Richard van der Hoff 92cf91dc69
Merge pull request #1278 from matrix-org/t3chguy/search_docs
Fix two issues with /search docs
6 years ago
Michael Telatynski 968ee0f613
add changelog 6 years ago
Michael Telatynski df5455de1f
re-arrange fields in example /search request to make them a valid request. 6 years ago
Michael Telatynski 64f97c5b78
add example of highlights field in /search response 6 years ago
Michael Telatynski 4ff5887c91
spec the highlights field in /search response 6 years ago
Ben Parsons ee98082a60 update MSC1270 6 years ago
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
6 years ago
Travis Ralston 3dc54b20c6
Merge branch 'master' into travis/clarify-routing-loops 6 years ago
Richard van der Hoff 9191b0fa82
Merge pull request #1264 from turt2live/travis/reporting
Document how to report content
6 years ago
Travis Ralston 8610effad7
Merge branch 'master' into travis/reporting 6 years ago
Richard van der Hoff f17195529b
Merge pull request #1263 from turt2live/travis/logout_all
Document /logout/all
6 years ago
Ben Parsons 7a44351a34 update following rvdh spec blitz 6 years ago
Ben Parsons cb00fc35ab git checkout master 6 years ago
Ben Parsons d1c27349b2 Merge branch 'master' of https://github.com/matrix-org/matrix-doc 6 years ago
Richard van der Hoff 419bf1e52c Fix continuserv instructions
As per f04b17f1c9

Also dedup continuserv readme
6 years ago
Ben Parsons 7a82a5d427 correct proposals.py 6 years ago
Ben Parsons 34090b24c4 prepare proposals.py for CI 6 years ago
Travis Ralston 8cbd802650 Add allow_remote to the changelog
Signed-off-by: Travis Ralston <travpc@gmail.com>
6 years ago
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>
6 years ago
Travis Ralston 352f1b7776 Add report content API to changelog
Signed-off-by: Travis Ralston <travpc@gmail.com>
6 years ago
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>
6 years ago
Travis Ralston 59ea10b842 Add changelog entry for /logout/all
Signed-off-by: Travis Ralston <travpc@gmail.com>
6 years ago
Travis Ralston 4278cd56a4 Document /logout/all
Fixes https://github.com/matrix-org/matrix-doc/issues/700

Signed-off-by: Travis Ralston <travpc@gmail.com>
6 years ago
Ben Parsons c3062b7db6 Include Proposals Page Title, update MSC1256 6 years ago
Ben Parsons 434e2949f9 include #1256 6 years ago
Ben Parsons 8d550d2166 force re-render 6 years ago
Ben Parsons 0b776b0e9c link to proposals page from index 6 years ago
Matthew Hodgson 4609220084
Merge pull request #1247 from matrix-construct/master
Fix typo.
6 years ago
Jason Volk 2a6895e759 Fix typo. 6 years ago
Ben Parsons 663e1a5ebe Update some text 6 years ago
Richard van der Hoff 3967833a1a
Merge pull request #1244 from florianjacob/room_member_authentication
/rooms/{roomId}/members: specify access_token requirement
6 years ago
Ben Parsons f09f9e186a
Merge pull request #1240 from matrix-org/proposals
Spec Proposals page on matrix.org
6 years ago
Ben Parsons 9873a2a0ac link from the spec intro page 6 years ago
Ben Parsons 38adc7df06 latest generated proposals 6 years ago
Matthew Hodgson 8440179ecf clarify shepherds and clarify 'greater benefit'
as per https://github.com/matrix-org/matrix-doc/pull/1240#discussion_r188459957
6 years ago
Florian Jacob cc54a4f8cb /rooms/{roomId}/members: specify access_token requirement
as the behaviour of which members the users see is user-specific
and therefore requires authentication.

Signed-off-by: Florian Jacob <projects+git AT florianjacob )DOT( de>
6 years ago
Richard van der Hoff bb39bea44d
Merge pull request #1169 from mujx/event-id-format
Use the correct event_id format on examples
6 years ago