Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-31 13:08:38 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
5323 commits 31 branches 42 tags 32 MiB
Commit graph

5323 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Travis Ralston 3ee9a7d654 Attempt to convert MSC2324 to reality 
We've been using this in practice for a while now, so we should document it more officially. 

MSC: https://github.com/matrix-org/matrix-doc/pull/2324
 2020-02-12 21:03:11 -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 41072fcaa9
Apply suggestions from code review 
Co-Authored-By: Matthew Hodgson <matthew@arasphere.net>
 2020-02-07 15:28:19 -05:00
Hubert Chathi c79ed36fcb
Merge pull request #2430 from deepbluev7/mmaster 
Fix key export format example
 2020-02-06 15:41:54 -05:00
Hubert Chathi 78b8133142 use binary encoding of keys to reduce size of QR code 2020-02-06 13:53:33 -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
Brendan Abolivier 2e2f1c1174
Extend the scope of casefolding to the whole address 2020-02-04 16:50:50 +00:00
Hubert Chathi 7f93084242 request can be transaction_id 2020-01-30 10:34:10 -05:00
Hubert Chathi 21ddf8507a make other_user_key optional for one flow of self-verification 2020-01-29 17:52:18 -05:00
Hubert Chathi fcfd5d99a1 add examples for self-verification 2020-01-29 16:39:32 -05:00
Hubert Chathi 0b4411eadb more words 2020-01-28 15:28:49 -05:00
Hubert Chathi be9c37e959 more clarifications, add comparison with SAS 2020-01-27 18:27:06 -05:00
Hubert Chathi a8c7fda187 add some clarifications 2020-01-24 12:50:51 -05: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
Hubert Chathi 379bb79b00
Update proposals/1543-qr_code_key_verification.md 2020-01-22 11:59:35 -05:00
Hubert Chathi 4f83bd3e36
Update proposals/1543-qr_code_key_verification.md 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-01-22 11:55:22 -05: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
Isaiah Inuwa 2563711ceb Rename proposal with proper ID. 2020-01-18 08:30:58 -06:00
Isaiah Inuwa 72bc0e0f6c Add proposal to make reason option on content reporting 2020-01-13 21:36:38 -06:00
Isaiah Inuwa 692d039a2b Merge branch 'master' of github.com:iinuwa/matrix-doc 2020-01-13 21:35:36 -06:00
Hubert Chathi 654a9574be rename to match MSC number 2020-01-02 17:05:12 -05:00
Hubert Chathi c87802587a fix typos, add information 2020-01-02 17:02:19 -05: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
iinuwa 6005c16b60
Merge pull request #1 from matrix-org/master 
Merge from origin
 2019-12-21 13:50:37 -06:00
Hubert Chathi a62c817745
Apply suggestions from code review 
Co-Authored-By: Matthew Hodgson <matthew@arasphere.net>
 2019-12-17 11:07:04 -05:00
Hubert Chathi 90bf2b3b46 add changelog 2019-12-16 17:40:05 -05:00
Hubert Chathi 4cde800ea1 fix validation errors 2019-12-16 17:25:20 -05:00
Hubert Chathi 59e337187b remove duplicated line 2019-12-16 15:54:42 -05:00
Hubert Chathi e658b17070 initial version of spec for key backups 2019-12-16 15:47:03 -05:00
Hubert Chathi e2e83b130d initial proposal for reporting of withheld keys 2019-12-16 15:15:46 -05: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