Commit graph

4895 commits

Author SHA1 Message Date
Patrick Cloke 570398e045 Remove section on the how the authentication currently works and just reference the specification. 2020-03-10 10:00:58 -04:00
Patrick Cloke 4d177753e1 Move proposal to proper proposal number. 2020-03-09 15:05:37 -04:00
Patrick Cloke f48bbd3278 Attempt to clarify the MSC. 2020-03-09 15:04:01 -04:00
Patrick Cloke c69a747bae Convert the initial Google Doc to Markdown. 2020-03-09 12:32:45 -04:00
DeepBlueV7.X 2d85422a2f
Update proposals/2422-allow-color-attribute-on-font-tag.md
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2020-03-07 18:34:07 +00:00
Nicolas Werner b760ec2d74 Add comments why alternatives to MSC2422 weren't chosen 2020-03-07 14:57:32 +01:00
Travis Ralston 7666b9fea7 Add changelog for name correction
https://github.com/matrix-org/matrix-doc/pull/2453
2020-03-06 10:56:19 -07:00
Travis Ralston 8e83256493
Merge pull request #2453 from Runster/patch-1
Correct name of Phil Zimmermann
2020-03-06 10:31:45 -07:00
Runster e6c7eac023
Correct name of Phil Zimmermann 2020-03-06 18:11:28 +01:00
DeepBlueV7.X 6b2752c4c2
Update proposals/2422-allow-color-attribute-on-font-tag.md
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-03-05 21:02:23 +00:00
DeepBlueV7.X 438ff8fc1d
Update proposals/2422-allow-color-attribute-on-font-tag.md
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-03-05 21:02:09 +00:00
Patrick Cloke 61715f6452 Update and expand the proposal based on feedback and additional info. 2020-03-04 08:07:12 -05:00
Patrick Cloke 68357a7d23
Fix a typo in -> and.
Co-Authored-By: Matthew Hodgson <matthew@matrix.org>
2020-03-04 07:31:38 -05:00
Patrick Cloke 6754d5ba5f Move filename based on MSC #. 2020-03-03 16:20:13 -05:00
Patrick Cloke c3420770ad Clarify history of endpoint. 2020-03-03 13:15:32 -05:00
Patrick Cloke 420180a69d MSC: Remove query_auth federation endpoint. 2020-03-03 12:30:19 -05:00
Richard van der Hoff 4e123ca121
Update proposals/2432-revised-alias-publishing.md
Co-Authored-By: Kitsune Ral <Kitsune-Ral@users.sf.net>
2020-02-29 23:29:33 +00:00
Matthew Hodgson 0ce8e5ae1d
Merge pull request #2445 from 29ki/typo-upgrades
Fix typo for upgrade
2020-02-24 09:05:15 +00:00
Örjan Fors e151ba96ac Fix typo for upgrade
Signed-off-by: Örjan Fors <orion@29k.org>
2020-02-24 09:45:46 +01:00
Richard van der Hoff 8b9ea10e11 server admins can list aliases 2020-02-19 07:32:27 +00:00
Richard van der Hoff 98a6cd0f45
fix table 2020-02-19 07:29:55 +00:00
Richard van der Hoff 30d762cc72 document unstable prefixes/feature flags 2020-02-19 07:25:49 +00:00
Richard van der Hoff 645dbcc091 make room alias lists peekable 2020-02-19 07:25:34 +00:00
Travis Ralston f823118a69
Merge pull request #2434 from matrix-org/travis/spec/2313-moderation-policies
Spec moderation policy rooms (MSC2313)
2020-02-18 10:11:02 -07:00
Richard van der Hoff 786772f764
Update proposals/2432-revised-alias-publishing.md
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2020-02-18 16:24:46 +00:00
Travis Ralston 6d475ebd57
Remove whitespace
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2020-02-17 12:56:28 -07:00
Travis Ralston 7a878bb6c3 Fix location of changelog entries and synergize them 2020-02-12 22:01:58 -07:00
Travis Ralston da047523e3 Changelog 2020-02-12 22:00:56 -07:00
Travis Ralston c7942d1cec Spec moderation policy rooms (MSC2313)
MSC: https://github.com/matrix-org/matrix-doc/pull/2313
2020-02-12 21:58:57 -07:00
Richard van der Hoff 95ff26679b
Apply suggestions from code review
Co-Authored-By: Matthew Hodgson <matthew@matrix.org>
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2020-02-11 11:16:56 +00:00
Richard van der Hoff 6bd4b3c08a MSC: Updated semantics for publishing room aliases 2020-02-10 20:29:38 +00:00
Hubert Chathi c79ed36fcb
Merge pull request #2430 from deepbluev7/mmaster
Fix key export format example
2020-02-06 15:41:54 -05:00
Nicolas Werner 6911171e83 Fix key export format example
Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>
2020-02-06 09:52:03 +01:00
Nicolas Werner b47de28da5 MSC2422: Allow color on font tag
Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>
2020-01-24 00:40:33 +01:00
Matthew Hodgson 6e3946f7bc
Merge pull request #2415 from iinuwa/spelling
Fix spelling mistakes.
2020-01-18 20:18:40 +00:00
Isaiah Inuwa 715d2d674b Add changelog for spelling. 2020-01-18 14:12:24 -06:00
Isaiah Inuwa 8e888b916c Fix spelling mistakes. 2020-01-18 09:09:42 -06:00
Matthew Hodgson 4808b60cdd
Merge pull request #2396 from aaronraimist/v4-event-id-link
Fix link to v4 event ID format in identity service spec
2020-01-02 08:40:08 +00:00
Aaron Raimist 82a626a98a Fix link to v4 event ID format in identity service spec
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-01-02 02:30:29 -06:00
Travis Ralston 6c48e77878
Merge pull request #2395 from matrix-org/travis/tags-push
Add missing tags to push rules endpoints
2020-01-01 15:58:27 -07:00
Travis Ralston f59aa563dd Add missing tags to push rules endpoints
Without the tags, the endpoints don't end up in the swagger. No changelog for this because it doesn't affect the spec itself.
2020-01-01 11:59:37 -07:00
Travis Ralston 224a103355
Merge pull request #2392 from matrix-org/travis/s2s/fix-auth
Move auth events selection to a more appropriate section of the spec
2019-12-31 15:47:13 -07:00
Travis Ralston 912b3cbc95 Move auth events selection to a more appropriate section of the spec
This was pretty buried, and feels like a common question.
2019-12-30 16:29:56 -07:00
Travis Ralston f11f77f33b
Merge pull request #2386 from carbeer/patch-1
Change state_type to event_type
2019-12-15 15:31:08 -07:00
Carolin Beer 3aba6e3eeb
Change state_type to event_type
I couldn't find any other reference to a state_type within the entire specification. I assume this is supposed to be the event_type? This aligns with the description of changes resulting from a state update.
2019-12-15 14:37:10 +01:00
Travis Ralston c823bdbf70
Merge pull request #2384 from matrix-org/travis/pr-templates
Add some github stuff (PR templates, funding)
2019-12-09 09:14:00 -07:00
Travis Ralston 47b94b62c4 Add some github stuff (PR templates, funding) 2019-12-07 15:57:24 -07:00
Travis Ralston 21b50d749a
Merge pull request #2369 from iinuwa/token-auth-doc-tweaks
Rename nonce to txn_id. Reorganize for clarity.
2019-12-07 15:37:10 -07:00
Travis Ralston ccc7bcabbc id -> ID while we're here 2019-12-07 15:32:43 -07:00
Travis Ralston 7cfc4b09a6 Changelog 2019-12-07 15:31:42 -07:00