Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-01-01 21:48:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5879 commits 31 branches 42 tags 32 MiB
Commit graph

5879 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Travis Ralston 7cfc4b09a6 Changelog 2019-12-07 15:31:42 -07:00
Travis Ralston b556ef3605
Merge pull request #2381 from Cadair/patch-1 
Clarify description of user directory
 2019-12-07 15:14:37 -07:00
Travis Ralston 4d0bd5b9e2 Changelog 2019-12-07 15:12:55 -07:00
Stuart Mumford c2ffef051f
Clarify description of user directory 
Signed off by Stuart Mumford <stuart@cadair.com>
 2019-12-05 09:27:37 -07:00
Hubert Chathi 22f7eaae0c add example 2019-12-03 22:03:21 -05:00
Hubert Chathi d7263861d8
Merge pull request #2371 from uhoreg/add_unstable_prefix_template 
add unstable prefix section to proposal template
 2019-12-03 14:37:49 -05:00
Travis Ralston 1cf322bc2a MSC2324: Facilitating early releases of software dependent on spec (#2324) 2019-12-03 18:43:56 +00:00
Hubert Chathi 75a6a28c6c
Merge pull request #2372 from matrix-org/jryans/clarify-cross-signing-examples 
Clarify cross-signing examples
 2019-12-02 16:30:01 -05:00
Travis Ralston e4deb4ca27
Merge pull request #2367 from matrix-org/erikj/invite_reject_reasons 
MSC2367: Add reason field to all membership events
 2019-12-02 08:12:13 -07:00
J. Ryan Stinnett 71faffc9ed Update example to show keys wrapped by user ID 2019-12-02 14:59:48 +00:00
J. Ryan Stinnett c549bf201b Clarify POST instead of GET for federation key query 2019-12-02 14:54:59 +00:00
Hubert Chathi 17abe054f2 send m.key.verification.cancel to other devices when one device is ready 2019-11-29 17:05:53 -05:00
Hubert Chathi b7234c7fd3 add unstable prefix section to proposal template 2019-11-29 15:51:50 -05:00
Isaiah Inuwa ad383351c2 Rename nonce to txn_id. Reorganize for clarity. 
Signed-Off-By: Isaiah Inuwa <isaiah.inuwa@gmail.com>
 2019-11-29 10:25:38 -06:00
Hubert Chathi 5742c30a96 s/accept/ready/ because we already have an m.key.verification.accept 2019-11-29 09:22:09 -05:00
Hubert Chathi 5f5f99fcc1 wording tweaks 2019-11-26 13:06:13 -05:00
Travis Ralston f37aa30c43
Merge pull request #1756 from uhoreg/cross-signing2 
MSC1756: cross-signing devices using a master identity key
 2019-11-26 10:00:44 -07:00
Erik Johnston f054ffe760 Add note about using PUT /state/m.room.member/ 2019-11-26 11:40:38 +00:00
Erik Johnston 29745d04fb erikj/msc_membership_reasons 2019-11-26 11:22:42 +00:00
Hubert Chathi abbba4788c rename to match MSC number 2019-11-25 16:16:34 -05:00
Hubert Chathi 33df2d1414 initial proposal of m.key.verification.accept 2019-11-25 16:14:49 -05:00
Travis Ralston 2a82a5c27c
Merge pull request #2313 from matrix-org/msc2313 
MSC2313: Moderation policies as rooms (ban lists)
 2019-11-25 09:17:33 -07:00
Hubert Chathi 82260689c9 add link to migrating from device verifications 2019-11-20 11:55:10 -05:00
Hubert Chathi 3b2f897c7e
Apply suggestions from code review 
Co-Authored-By: Matthew Hodgson <matthew@arasphere.net>
 2019-11-20 11:48:36 -05:00
Travis Ralston c7b3d99853 m.policy.rule won the debate 2019-11-19 11:53:07 -07:00
Hubert Chathi 1590ae224c make hash commitment always include the m.relates_to 2019-11-18 16:24:59 -05:00
Travis Ralston f1ff31d2cb
Merge pull request #2284 from matrix-org/travis/msc/optional-is-discover 
MSC2284: Making the identity server optional during discovery
 2019-11-18 10:15:48 -07:00
Travis Ralston f610235cd6 Rename the MSC to be better targeted 2019-11-18 09:38:17 -07:00
Travis Ralston e89d81c587
Merge pull request #2351 from MurzNN/patch-2 
Typo: later user » later use
 2019-11-13 10:37:41 -07:00
Travis Ralston d93d8fe9b5 Add a changelog 2019-11-13 10:36:41 -07:00
Travis Ralston 605f3390c7
Merge pull request #1946 from uhoreg/ssss 
MSC1946: Secure Secret Storage and Sharing
 2019-11-13 10:07:05 -07:00
Travis Ralston 037894d6f7
Merge pull request #2244 from tulir/mass_redactions 
MSC2244: Mass redactions
 2019-11-12 08:56:38 -07:00
Hubert Chathi fc793557f8 make the default key event an object 2019-11-12 10:48:38 -05:00
Alexey Murz Korepov daa610659b
Typo: later user » later use 2019-11-10 16:45:01 +03:00
Travis Ralston dcbdb94693
Add explanation 2019-11-08 09:03:49 -07:00