0
0
Fork 0
Commit Graph

640 Commits

Author SHA1 Message Date
Pascal Abresch 71b9a571ab fix minor mistakes
Signed-off-by: Pascal Abresch <nep@packageloss.eu>
2020-04-04 04:59:16 +02:00
Pascal Abresch 6e87d46262 Add a way to represent contextes
Signed-off-by: Pascal Abresch <nep@packageloss.eu>
2020-04-03 16:36:06 +02:00
Tulir Asokan 7cd2b97851 Add supporting nesting as an example of future major versions
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2020-01-25 16:00:37 +02:00
Tulir Asokan 8a10eff70a Make rainbow HTML example spec-compliant and add dash to title
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2020-01-24 21:50:26 +02:00
Tulir Asokan c25ab53893 Fix another JSON mistake
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2020-01-24 21:47:57 +02:00
Tulir Asokan 71db06146a Fix JSON mistakes and define initial version
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2020-01-24 21:46:59 +02:00
Tulir Asokan 52ff42c99a Proposal for JSON-based message formatting
Co-authored-by: Pascal Abresch <nep@packageloss.eu>
Signed-off-by: Tulir Asokan <tulir@maunium.net>
Signed-off-by: Pascal Abresch <nep@packageloss.eu>
2020-01-24 21:34:09 +02: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 b7234c7fd3 add unstable prefix section to proposal template 2019-11-29 15:51:50 -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
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
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 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
Travis Ralston dcbdb94693
Add explanation 2019-11-08 09:03:49 -07:00
Hubert Chathi e8ce135a41 add clarification and examples 2019-11-07 19:01:30 -05:00
Hubert Chathi 5cc5908dd5
Update proposals/1946-secure_server-side_storage.md
Co-Authored-By: Matthew Hodgson <matthew@arasphere.net>
2019-11-07 18:45:29 -05:00
Tulir Asokan 30106aaaac Add section about backwards compatibility
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-11-04 21:14:18 +02:00
Hubert Chathi a51805cfe7
Apply suggestions from code review
Co-Authored-By: Kitsune Ral <Kitsune-Ral@users.sf.net>
2019-11-01 23:10:14 -04:00
Hubert Chathi 3e42cf528b
Apply suggestions from code review
Co-Authored-By: David Baker <dbkr@users.noreply.github.com>
2019-11-01 15:38:14 -04:00
Aaron Raimist 14c32cc4bf Wrap lines 2019-10-30 16:20:17 -05:00
Aaron Raimist 6270983b7f MSC2334 - Change default room version to v5
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-10-30 14:40:52 -05:00
Travis Ralston ce286dac02
Merge pull request #1538 from uhoreg/e2e_backup
MSC1219: storing megolm keys serverside
2019-10-29 11:54:44 -06:00
Hubert Chathi a6977f19c5
Update proposals/1219-storing-megolm-keys-serverside.md
Co-Authored-By: aditsachde <23707194+aditsachde@users.noreply.github.com>
2019-10-28 12:58:27 -04:00
Hubert Chathi 4fadace9c8
Update proposals/1946-secure_server-side_storage.md
Co-Authored-By: David Baker <dbkr@users.noreply.github.com>
2019-10-28 12:48:59 -04:00
Hubert Chathi 86eccc3bc8 change how we mark the default key, and make sure clients trust keys 2019-10-25 15:00:23 -04:00
Hubert Chathi b27f6985b2 more clarifications 2019-10-23 17:32:36 -04:00
Hubert Chathi 9dfca61ae7
Apply suggestions from code review
Co-Authored-By: David Baker <dbkr@users.noreply.github.com>
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Co-Authored-By: Erik Johnston <erikj@jki.re>
2019-10-23 16:13:17 -04:00
Travis Ralston 7236f1c741
Merge pull request #1983 from matrix-org/travis/msc/leave-reason
MSC1983: Supporting a reason for leaving rooms
2019-10-15 11:42:08 +02:00
Hubert Chathi 5799c433fe add HTTP status codes for errors and move key format to the right spot 2019-10-10 15:03:10 -04:00
Hubert Chathi 576177b579 make version optional in versions update 2019-10-09 17:52:53 -04:00
Andrew Morgan 6274a66ae5
Merge pull request #2176 from matrix-org/rav/proposals/update-redaction
MSC2176: Update the redaction rules
2019-10-07 10:22:32 +01:00
Travis Ralston f608c48f8a
Merge pull request #2290 from matrix-org/anoa/msc_separate_hs_api
MSC2290: Separate Endpoints for Threepid Binding
2019-10-06 09:47:59 -06:00
Matthew Hodgson eddce00390 MSC2313: Ban lists 2019-10-04 21:56:02 -04:00
Hubert Chathi 54e73e4729
Apply suggestions from code review
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-10-04 10:41:28 -04:00
Andrew Morgan 46e7137252 Don't remove id_server and id_access_token 2019-09-26 17:51:51 +01:00
Andrew Morgan ec7e795112 reflow 2019-09-26 17:20:40 +01:00
Andrew Morgan 0332d531e9 Merge branch 'anoa/msc_separate_hs_api' of github.com:matrix-org/matrix-doc into anoa/msc_separate_hs_api 2019-09-26 17:16:49 +01:00