Commit graph

1047 commits

Author SHA1 Message Date
Hubert Chathi 0b39308a13 rename to use msc number 2020-05-05 19:20:20 -04:00
Hubert Chathi fffed943bc proposal to add endpoint to delete backups 2020-05-05 19:18:04 -04:00
Travis Ralston 4cd4e19bf8
Merge pull request #2454 from matrix-org/clokep/ui-interactive-auth-for-sso
MSC2454: Support UI interactive auth for SSO
2020-05-05 10:28:11 -06:00
Hubert Chathi 9dc6e00335 draft of proposal for SAS 2020-05-04 22:49:34 -04:00
Travis Ralston 8ba6d0157b
Merge pull request #2457 from matrix-org/clokep/modify-password-invalid-sessions
MSC2457: Invalidating devices during password modification
2020-05-02 17:58:27 -06:00
Hubert Chathi 9103a0a398 minor clarifications and corrections 2020-04-16 14:58:44 -04:00
Hubert Chathi 4672a7083e make .ready required, and add .done 2020-04-15 16:07:03 -04:00
Patrick Cloke f6879c897b
Fix minor grammatical fixes.
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2020-04-15 07:39:00 -04:00
Patrick Cloke 4cfcda57fb Clarify that the only new item here is the new authentication type. 2020-04-01 10:48:05 -04:00
Hubert Chathi 4a3f9ec63a add information to check the key 2020-03-30 17:44:06 -04:00
Hubert Chathi 943d9386bb remove requirement to sign the key, since it is no longer used to trust it 2020-03-30 17:43:46 -04:00
Patrick Cloke 745f8c09df Fix incorrect statement about the current spec's guidance. 2020-03-27 14:01:04 -04:00
Patrick Cloke eb48863c40
Markdown formatting.
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2020-03-26 11:47:32 -04:00
Travis Ralston 2313f1e281
Merge pull request #2432 from matrix-org/rav/proposal/alt_canonical_aliases
MSC2432: Updated semantics for publishing room aliases
2020-03-25 16:14:43 -06:00
Hubert Chathi 4b21e44e5f use the MSC number 2020-03-24 16:24:09 -04:00
Hubert Chathi 76dd16b854 add proposal to switch to symmetric crypto 2020-03-24 16:20:31 -04:00
Hubert Chathi f7ebda040e update some examples to use new algorithm name 2020-03-24 16:20:31 -04:00
Hubert Chathi eb17e5d826 switch to symmetric algorithm 2020-03-24 16:20:31 -04:00
Travis Ralston b8b0e0d792
Merge pull request #2422 from deepbluev7/master
MSC2422: Allow color on font tag
2020-03-24 14:01:53 -06:00
DeepBlueV7.X 28dc6a0515
Update proposals/2422-allow-color-attribute-on-font-tag.md
Apply typo fix as suggested.

Co-Authored-By: David Vo <auscompgeek@users.noreply.github.com>
2020-03-20 20:29:44 +00:00
Hubert Chathi a0fcb7d9e1 make code required, and some more details about no_olm 2020-03-19 17:10:44 -04:00
Richard van der Hoff 7917d087f3 clarifications 2020-03-19 15:21:50 +00:00
Patrick Cloke 2d2731efff
Remove duplicated word.
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2020-03-16 10:42:17 -04:00
Patrick Cloke 61b306f8a8 Remove concerns about backwards compatibility. 2020-03-13 07:12:57 -04:00
Patrick Cloke 1facf7ff12 Add an MSC proposal for how to handle sessions when modifying a password. 2020-03-12 15:00:27 -04:00
Patrick Cloke 78e08c1987 Attempt to clarify the proposed changes. 2020-03-10 10:14:47 -04:00
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
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
Hubert Chathi a7279d99f0
Update proposals/1543-qr_code_key_verification.md
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-02-27 11:42:22 -05: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
Hubert Chathi ea0abe9de9 remove incorrect stuff 2020-02-18 23:03:54 -05:00
Hubert Chathi c77d04c709 add base64 option 2020-02-18 22:58:41 -05:00
Hubert Chathi 405ac1e2b5 add base32 option 2020-02-18 22:35:21 -05: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
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
Sorunome 5ae462d558
address issues 2020-02-07 19:50:22 +01:00
Hubert Chathi 78b8133142 use binary encoding of keys to reduce size of QR code 2020-02-06 13:53:33 -05:00
Brendan Abolivier 3c49ba9eb5
Remove reference to second endpoint 2020-02-05 12:29:12 +00:00
Brendan Abolivier 0d4e2e75c7
Remove unstable_features endpoint 2020-02-05 12:25:50 +00: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
Sorunome 53435d400d
update with new endpoints 2020-01-19 13:30:46 +01: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
Sorunome 776436a5f0
forgot to update one json example 2020-01-13 12:54:06 +01:00
Sorunome f0411a3cc5
make clear displayname and avatar_url are optional, add status codes 2020-01-13 12:52:22 +01:00
Sorunome 13964988f4
remove question regarding federation api version, as it has to be v2 2020-01-09 20:08:19 +01:00
Sorunome 1ef7c17b93
remove stray heading 2020-01-09 20:00:25 +01:00
Sorunome bee4e9e269
move to correct msc number 2020-01-09 19:57:24 +01:00
Sorunome 501d7ecfd5
add knock proposal 2020-01-09 19:55:44 +01: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
Hubert Chathi e2e83b130d initial proposal for reporting of withheld keys 2019-12-16 15:15:46 -05: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
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
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
Brendan Abolivier 52cd69eb75
Split into two non-versioned endpoints 2019-11-07 15:45:58 +00: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
Brendan Abolivier 4517506d57
Incorporate review 2019-10-15 17:34:02 +02:00
Brendan Abolivier 6bd2876688
MSC number 2019-10-15 13:59:22 +02:00
Brendan Abolivier ba8880546d
Proposal for versions information on the identity server API 2019-10-15 13:54:52 +02: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
Andrew Morgan 1a51a24768 UIAA on /account/3pid/add 2019-09-26 17:16:44 +01:00
Andrew Morgan 219ebff6d3
typo fix
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2019-09-26 10:37:10 +02:00
Andrew Morgan 9311e89941
Update proposals/2229-rebind-existing-3pid.md
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2019-09-25 01:32:35 +02:00
Hubert Chathi 332b5605c1 simplify protocol by embedding Alice's key in Bob's QR code 2019-09-19 16:18:46 -04:00
Brendan Abolivier 6b0a8505ec
Propose case folding instead of lowercasing 2019-09-19 17:34:25 +01:00
Andrew Morgan 40420d9633
Update proposals/2290-separate-threepid-bind-hs.md
Co-Authored-By: Kitsune Ral <Kitsune-Ral@users.sf.net>
2019-09-19 11:50:16 +01:00
Hubert Chathi 10b6fd6c8e add more crypto magic, clarify things, add examples 2019-09-18 19:05:05 -04:00
Andrew Morgan bd64ffc442 Homeservers shouldn't proxy to user-provided identity servers anymore 2019-09-18 11:57:26 +01:00
Richard van der Hoff 5d6113db1e
Update the MSC template (#2296)
Tradeoffs->Alternatives, and kill the Conclusions section
2019-09-18 01:39:40 +01:00
Andrew Morgan 87d641c7c1 Describe what the IS and HS are doing in the examples 2019-09-17 17:20:57 +01:00
Andrew Morgan e50bb3df25 Mention that homeserver's should remember binds done through them 2019-09-17 17:04:40 +01:00
Andrew Morgan 53519f98d0 Pin a spec version when we link to it 2019-09-17 17:01:45 +01:00
Andrew Morgan 169174e00b Suggest the use of a unstable flag 2019-09-17 17:01:18 +01:00
Andrew Morgan 1e69a7f3f2 be assertive 2019-09-17 15:02:41 +01:00
Andrew Morgan 3eda9f7b28 Merge branch 'anoa/msc_separate_hs_api' of github.com:matrix-org/matrix-doc into anoa/msc_separate_hs_api 2019-09-17 12:13:01 +01:00
Andrew Morgan 0b67f34578 Address review comments 2019-09-17 12:10:32 +01:00
Andrew Morgan c57250b393
Apply suggestions from code review
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-09-17 11:48:50 +01:00
Andrew Morgan 2a55310754 Clarify why MSC2229 was made obselete 2019-09-17 11:43:56 +01:00
Andrew Morgan af2467606e parameter, not endpoint 2019-09-16 18:01:21 +01:00
Andrew Morgan 4bc005ac84 Remove threepid explanation 2019-09-16 16:27:16 +01:00
Andrew Morgan f06ba491fe Assign meaning to bind and add 2019-09-16 15:49:31 +01:00
Andrew Morgan f36ed9a271 typos 2019-09-16 15:26:07 +01:00
Andrew Morgan 7b656e9013
Update proposals/2290-separate-threepid-bind-hs.md
Co-Authored-By: Matthew Hodgson <matthew@matrix.org>
2019-09-16 15:24:43 +01:00
Andrew Morgan 196f27efb2
Update proposals/2290-separate-threepid-bind-hs.md
Co-Authored-By: Matthew Hodgson <matthew@matrix.org>
2019-09-16 15:22:05 +01:00
Andrew Morgan 1fc1e3c6ce run on sentence 2019-09-16 14:49:30 +01:00
Andrew Morgan 5b259bfb52 Fix homeserver binding example 2019-09-16 14:47:38 +01:00
Andrew Morgan cb7c072edb Two new endpoints instead of one 2019-09-16 14:42:21 +01:00
Andrew Morgan 5193c319e7 Cleaner API endpoints 2019-09-13 11:49:31 +01:00
Andrew Morgan f5b10c689f cleanup 2019-09-12 15:55:50 +01:00
Andrew Morgan 7096092da9 init 2019-09-12 13:52:52 +01:00
Travis Ralston c00fe02fd1
Merge pull request #1802 from matrix-org/babolivier/standardised-federation-response-format
MSC1802: Remove the '200' value from some federation responses
2019-09-10 17:08:02 -06:00
Hubert Chathi 8123c4ef0f additional clarification 2019-09-09 22:57:29 -04:00
Hubert Chathi cf953c47fd clarifications, change "hash" to "etag" 2019-09-09 17:29:32 -04:00
Hubert Chathi 60f0ad5b24 lowercase 2019-09-07 16:05:46 -04:00
Hubert Chathi 7644085274 wording fixes and clarifications 2019-09-07 16:03:11 -04:00
Travis Ralston 6baeb6c218 Assign number 2019-09-05 20:25:31 -06:00
Travis Ralston 738fa6833e Proposal to make the identity server optional during discovery 2019-09-05 20:24:17 -06:00
Brendan Abolivier 48e8c55138 Merge branch 'master' into babolivier/standardised-federation-response-format 2019-09-05 14:54:48 +01:00
Brendan Abolivier 620e5dd74d Merge branch 'babolivier/standardised-federation-response-format' of github.com:matrix-org/matrix-doc into babolivier/standardised-federation-response-format 2019-09-05 14:54:44 +01:00
Brendan Abolivier cb2b71c0be
Remove /send + rename 2019-09-05 14:54:31 +01:00
Brendan Abolivier fc26230007
Update proposals/1802-standardised-federation-response-format.md
Co-Authored-By: Matthew Hodgson <matthew@matrix.org>
2019-09-05 14:41:53 +01:00
Travis Ralston 185c564a13 Spec client-server IS unbind API
As per [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140)

Note: this modifies the endpoint in MSC2140 to be more in line with the remainder of the proposal.
2019-09-04 16:38:15 -06:00
Travis Ralston 2d784d93ef Merge branch 'master' into travis/spec/is-auth 2019-09-04 16:35:50 -06:00
Travis Ralston 675cabc33d
Merge pull request #2263 from matrix-org/travis/msc/id-server-optional
MSC2263: Give homeservers the ability to handle their own 3PID registrations/password resets
2019-09-04 11:11:42 -06:00
Brendan Abolivier 520c76a1cb
Spell out that the proposal also concerns homeservers 2019-09-02 13:56:01 +01:00
Brendan Abolivier 997360995c
Wording
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2019-09-02 13:41:49 +01:00
Brendan Abolivier bddadfeb18
Typo
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2019-09-02 13:41:33 +01:00
Brendan Abolivier 552f71a9f9
Wording
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2019-09-02 13:41:23 +01:00
Brendan Abolivier 524ec52f73
Wording
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2019-09-02 13:41:07 +01:00
Tulir Asokan b2ce6f87bc Merge branch 'master' into mass_redactions 2019-08-31 21:15:36 +03:00
Tulir Asokan 7ba4564ac3 Remove soft fail auth rule option
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-08-31 21:04:42 +03:00
Matthew Hodgson a805d2b779 oops, premature merge 2019-08-31 16:04:55 +01:00
Matthew Hodgson 6d71a41e22 Proposal for ignoring invites 2019-08-31 16:01:04 +01:00
Tulir Asokan e6f85cacff Specify that "existing auth rules" means room v5 2019-08-31 00:53:08 +03:00
Travis Ralston b36fe24f1b Let's not doubly remove things 2019-08-30 08:27:44 -06:00
Brendan Abolivier 60354f8cf9
MSC number 2019-08-30 14:47:02 +01:00
Brendan Abolivier d1efd488b7
Proposal for mandating lowercasing when processing e-mail address localparts 2019-08-30 14:43:17 +01:00
Travis Ralston f8780e2395 add note about edit 2019-08-30 04:44:39 -06:00
Travis Ralston 1a6eb9a413
Update proposals/2263-homeserver-pw-resets.md
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-29 15:19:12 -06:00
Travis Ralston 6d5e90b1d6
Apply suggestions from code review
Co-Authored-By: Matthew Hodgson <matthew@matrix.org>
2019-08-29 14:51:32 -06:00
Travis Ralston 16bb3bd8b5 Add an unstable feature flag to MSC2140 for clients to detect support 2019-08-29 13:59:48 -06:00
Travis Ralston 4e43024039 Assign number 2019-08-29 13:54:53 -06:00
Travis Ralston 1d6501b6ec What if we allowed homeservers to deal with their own business? 2019-08-29 13:51:38 -06:00
Tulir Asokan c909a7c423 Move omitting redacted_because into proposal and add security consideration
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-08-29 21:18:02 +03:00
Travis Ralston ef5d3b9f30 Correct token reference in MSC2140 2019-08-28 15:46:58 -06:00
Tulir Asokan 79a5663ec3 Fix typos, inline links and move image into tree
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-08-28 23:07:34 +03:00
Tulir Asokan 238b78bbaf Add potential issue with redacted_because field
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-08-28 23:07:34 +03:00
Tulir Asokan cd75d0f220 Fix authenticity/authorization terminology
Co-authored-by: Kitsune Ral <Kitsune-Ral@users.sf.net>
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-08-28 23:07:12 +03:00
Tulir Asokan 984e0af7b2 Re-word auth rule section on handling each target separately
Co-authored-by: Jason Volk <jason@zemos.net>
Signed-off-by: Tulir Asokan <tulir@maunium.net>
Signed-off-by: Jason Volk <jason@zemos.net>
2019-08-28 22:58:59 +03:00
Hubert Chathi 03ae5614b0 remove unnecessary space 2019-08-27 17:56:52 -07:00
Hubert Chathi e1b0042e7b clarifications, minor fixes, formatting 2019-08-27 17:46:45 -07:00
Hubert Chathi 9aade7291a make it agree with what we actually did with key requests 2019-08-27 16:21:00 -07:00
Hubert Chathi cafe49d36d some clarifications 2019-08-27 16:13:18 -07:00
Travis Ralston 356350de91
Merge pull request #2140 from matrix-org/dbkr/tos_2
MSC2140: Terms of Service for ISes and IMs
2019-08-26 13:48:45 -06:00
Travis Ralston 7a36016cbb
Merge pull request #2230 from matrix-org/dbkr/is_in_account_data
MSC2230: Store Identity Server in Account Data
2019-08-26 08:21:04 -06:00
Travis Ralston 0265817c56
Merge pull request #1957 from matrix-org/travis/msc/integrations/discovery
MSC1957: Integration manager discovery
2019-08-25 19:25:46 -06:00
Hubert Chathi 4e2fe124d2 wording fixes/clarifications 2019-08-25 18:22:23 -07:00
Travis Ralston 4ad9bf7059
Merge pull request #1961 from matrix-org/travis/msc/integrations/auth
MSC1961: Integration manager authentication APIs
2019-08-23 14:24:09 -06:00
Tulir Asokan ec38013daa Proposal to allow multiple targets for one redaction event
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-08-23 23:07:57 +03:00
Travis Ralston b0f873785d Proposal for room version 6 2019-08-21 18:03:17 -06:00
Travis Ralston b6f0e8e8ed Clarify that the query string is because they are widgets 2019-08-21 17:50:18 -06:00
Travis Ralston 8b85fda52c Add a link to the widget MSC to try and stem questions 2019-08-21 17:47:55 -06:00
David Baker 4ea8f645d6 is_token -> id_access_token and add invite to proxy list 2019-08-21 18:13:50 +01:00
Travis Ralston 8ca50eaf9f
Merge pull request #2010 from Sorunome/soru/spoilers
MSC2010: Add client-side spoilers
2019-08-21 08:34:24 -06:00
David Baker 8bd9d7caeb
Add full stop
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2019-08-21 15:12:45 +01:00
David Baker 69315417b5
Typo
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2019-08-21 15:12:25 +01:00
David Baker 4073d940da
Typo
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2019-08-21 15:11:10 +01:00
David Baker 1f8cfd5729 Update migration mechanism 2019-08-21 14:19:20 +01:00
Travis Ralston 53a2ffb12a
Merge pull request #2197 from reivilibre/rei/msc_filter_over_fed
MSC2197: Search Filtering in Federation /publicRooms
2019-08-20 15:35:29 -06:00
Travis Ralston 788796e1c6 Multiple clarifications 2019-08-20 09:20:07 -06:00
David Baker 9b2ca3cdfe
typoes / clarifications
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-08-20 16:19:15 +01:00
Travis Ralston 9e073e9647
Speeeeeeling
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2019-08-19 10:42:30 -06:00
Andrew Morgan 997c5466a8
MSC2229: Allowing 3PID Owners to Rebind (#2229) 2019-08-19 13:35:02 +01:00
David Baker 6d0067320c clarify error proxying 2019-08-19 13:31:44 +01:00
David Baker 12377fbf50
/account/logout not /logout
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2019-08-19 11:53:41 +01:00
David Baker e4bdc283fd
Apply suggestions from code review
Typos / spelling

Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2019-08-19 11:45:46 +01:00
Olivier Wilkinson (reivilibre) 76f9196ff3 Address @richvdh's comments 2019-08-19 07:44:37 +01:00
Travis Ralston 865d3da0f8 General clarity improvements 2019-08-16 19:59:32 -06:00
Travis Ralston 22c9692684 Disclose origin story better 2019-08-16 19:53:28 -06:00
Travis Ralston 475c64de8c Disclose origin story 2019-08-16 19:52:35 -06:00
Andrew Morgan 4059661c29
Update proposals/2229-rebind-existing-3pid.md
Co-Authored-By: Kitsune Ral <Kitsune-Ral@users.sf.net>
2019-08-14 11:38:53 +01:00
Olivier Wilkinson (reivilibre) 4219e272ec Drop the hard SHOULD
Adopts @turt2live's phrasing

Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2019-08-14 11:06:45 +01:00
Olivier Wilkinson (reivilibre) 7e85b9d56a Acknowledge other potential error responses for fallback
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2019-08-14 11:03:55 +01:00
Olivier Wilkinson (reivilibre) 97f856d706 Domain name is potentially personally-identifying
Thanks to @turt2live

Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2019-08-14 11:00:03 +01:00
David Baker b9b984ae60 clarify 2019-08-14 09:52:13 +01:00
David Baker 229cb67b01
Apply suggestions from code review
Use fewer formal MUST etc in proposal

Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-08-14 09:51:27 +01:00
Andrew Morgan 7758e0701c Remove homeserver warning 2019-08-13 18:22:06 +01:00
David Baker 2c8d112089 assign number 2019-08-13 18:03:43 +01:00
Andrew Morgan 2e2a74a235 Merge branch 'anoa/rebind_3pids' of github.com:matrix-org/matrix-doc into anoa/rebind_3pids 2019-08-13 17:17:11 +01:00
Andrew Morgan 2547cc443c backticks 2019-08-13 17:17:06 +01:00
Andrew Morgan 01fc54faae
Update proposals/2229-rebind-existing-3pid.md
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-08-13 17:15:48 +01:00
Andrew Morgan 5b1ea4ffcb
Update proposals/2229-rebind-existing-3pid.md
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-13 17:13:48 +01:00
Andrew Morgan cb1e3b8373 Take into account the 1 is case 2019-08-13 13:29:35 +01:00
Andrew Morgan f313b49c26 Add bind def. 2019-08-13 11:40:34 +01:00
Andrew Morgan be77b5823c fix up 2019-08-13 11:24:37 +01:00
Andrew Morgan 6ed0ae36ba rename msc # 2019-08-13 11:12:04 +01:00
Andrew Morgan ed4d805d2f flesh out 2019-08-13 11:11:22 +01:00
David Baker 6330fff5a4 Draft for IS URL in account data 2019-08-12 18:13:58 +01:00
Andrew Morgan 783fd78a6f wip 2019-08-12 17:13:37 +01:00
Richard van der Hoff 353b6cd198 clarification 2019-08-12 13:12:18 +01:00
Hubert Chathi 7ed5367516 clarifications, fix formatting 2019-08-10 14:14:30 -07:00
Olivier Wilkinson (reivilibre) 60cbc4567b Addresses some of Andrew's comments
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2019-08-09 11:21:39 +01:00
Travis Ralston a171d5f6fd Check for a state_key on the tombstone push rule
This is an oversight from the proposal.
2019-08-08 09:29:52 -06:00
Travis Ralston 3087c76452
Merge pull request #2134 from matrix-org/hs/hash-identity
MSC2134: Identity Hash Lookups
2019-08-07 19:48:36 -06:00
Olivier Wilkinson (reivilibre) 493bb062af MSC2197: update with privacy perspective
Includes recommendations for client developers.

Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2019-08-05 09:50:24 +01:00
Travis Ralston a71757f1ee
Merge pull request #2174 from matrix-org/rav/proposals/move_redacts_key
MSC2174: Move the `redacts` key to a sane place
2019-08-03 11:01:28 -06:00
Luca Becker 25e3602bbe
3rd draft of MSC2209 2019-08-03 09:15:32 +02:00
Andrew Morgan 3edf5e3c16 Make hashes real values 2019-08-02 11:25:28 +01:00
Luca Becker 42dbeee7d3 MSC2209: 2nd draft @uhoregs changes 2019-08-01 18:36:19 +02:00
Luca Becker ec37fe4427 first draft of MSC2209 2019-08-01 16:23:26 +02:00
Andrew Morgan 96e06b6f5f Add line, britishise 2019-08-01 15:04:38 +01:00
Andrew Morgan 3877724774 fix speeling 2019-08-01 15:01:05 +01:00
Andrew Morgan c401a4d47b punctuation 2019-08-01 14:53:41 +01:00
Andrew Morgan acf8d34474 Merge branch 'hs/hash-identity' of github.com:matrix-org/matrix-doc into hs/hash-identity 2019-08-01 14:51:42 +01:00
Andrew Morgan 3789d828fd Incorporate solution analysis from the context of attacks 2019-08-01 14:51:26 +01:00
Olivier Wilkinson (reivilibre) 36e43ee326 Rewrap lines in MSC2917 to 80 chars wide
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2019-08-01 09:28:30 +01:00
Hubert Chathi 80adbaff4c switch to MSC1946 for storing recovery key 2019-07-31 16:38:20 -04:00
Hubert Chathi 825757ffd8 add information about verifying backup by entering key 2019-07-31 16:37:54 -04:00
Hubert Chathi bd9efcdf53 add some information and an example 2019-07-31 16:22:24 -04:00
Hubert Chathi d47e13c6d9 this FIXME will be addressed in the key backup MSC 2019-07-31 16:20:55 -04:00
Hubert Chathi 395d40314b fix typos and make valid JSON 2019-07-31 16:20:39 -04:00
Andrew Morgan f989263872
MSC2181: Add an Error Code for Signaling a Deactivated User (#2181) 2019-07-31 13:14:02 +01:00
Richard van der Hoff 0c7c48bd12 MSC2175: Remove the creator field from m.room.create events (#2175)
Fixes #1193
2019-07-31 13:13:38 +01:00
Andrew Morgan 33d22c3320 hashes are not stream ciphers 2019-07-31 11:47:03 +01:00
Andrew Morgan 9913f5bc29 Slightly clarify pepper value 2019-07-31 11:16:58 +01:00
Andrew Morgan 57de107ea9 Move medium back behind the address 2019-07-31 11:07:22 +01:00
Richard van der Hoff f1f293678b
Apply suggestions from code review
Co-Authored-By: Travis Ralston <travpc@gmail.com>
Co-Authored-By: Kitsune Ral <Kitsune-Ral@users.sf.net>
2019-07-30 08:00:48 +01:00
Olivier Wilkinson (reivilibre) 4c22eb86b5 MSC for Search Filtering in Federation /publicRooms
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2019-07-29 16:30:25 +01:00
Andrew Morgan c8527b7af8 Merge branch 'hs/hash-identity' of github.com:matrix-org/matrix-doc into hs/hash-identity 2019-07-26 12:05:49 +01:00
Andrew Morgan 4d1f2ea4f4
Apply suggestions from code review
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2019-07-26 12:05:41 +01:00
Andrew Morgan 6660768d85 Don't repeat fast hash bit 2019-07-26 12:04:17 +01:00
Andrew Morgan 027c2d7260 Merge branch 'hs/hash-identity' of github.com:matrix-org/matrix-doc into hs/hash-identity 2019-07-26 12:01:32 +01:00
Andrew Morgan a17c74f592 switch medium and address around, space between address and pepper 2019-07-26 12:00:53 +01:00
Andrew Morgan 5580a2a1a9
Update proposals/2134-identity-hash-lookup.md
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2019-07-26 11:40:38 +01:00
Andrew Morgan ffbfde8a09
Update proposals/2134-identity-hash-lookup.md
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2019-07-26 11:40:20 +01:00
Andrew Morgan 87a54e8d8d Merge branch 'hs/hash-identity' of github.com:matrix-org/matrix-doc into hs/hash-identity 2019-07-25 19:06:07 +01:00
Andrew Morgan 6119b9a50d *@hobnobbob.com is unlikely to be guessed 2019-07-25 19:05:49 +01:00
Andrew Morgan 20c72a3649
Update proposals/2134-identity-hash-lookup.md
Co-Authored-By: David Baker <dbkr@users.noreply.github.com>
2019-07-25 18:56:17 +01:00
Andrew Morgan 0ac70b268a Clarify peppering should not happen on none algo 2019-07-25 18:55:57 +01:00
Andrew Morgan da876bb340 missing word 2019-07-25 18:54:02 +01:00
Andrew Morgan c6dd5951a1 Clients can cache the hash details if they want to 2019-07-25 18:53:32 +01:00
Andrew Morgan 8f3e588708 pepper is not a secret val. Still needs to be around. 2019-07-24 15:27:48 +01:00
Andrew Morgan 3b8c57e06c Don't require servers/clients to support "none" 2019-07-23 16:43:55 +01:00
Andrew Morgan 3031df79cc Add example for none algo 2019-07-23 16:33:24 +01:00
Andrew Morgan 9fd6bd3184 Add details about why this proposal should exist 2019-07-23 15:25:41 +01:00
Andrew Morgan b26a9ed1fd Expand on why we can't trust dirty homeservers 2019-07-23 13:28:42 +01:00
Andrew Morgan 577021f12b resolve some comments 2019-07-23 11:48:01 +01:00
Richard van der Hoff 9e264fedc9 Updates
* preserve *all* of `create`
* don't preserve `notifications` or `algorithm`, and add some justifcation.
2019-07-22 16:47:49 +01:00
Andrew Morgan 887cd5e7d0 I really hope someone doesn't invest none-hash 2019-07-22 16:00:29 +01:00
Andrew Morgan 0444c8016b review comments 2019-07-22 15:33:49 +01:00
Richard van der Hoff 4503327450 Add some compatibility hacks. 2019-07-22 15:17:52 +01:00
Alexander "Ace" Olofsson 99bd46c9e7
Allow the use of the HTML <details> tag
Signed-off-by: Alexander Olofsson <ace@haxalot.com>
2019-07-16 22:00:24 +02:00
Richard van der Hoff d324cac847 preserve powerlevel 2019-07-16 19:32:34 +01:00
Richard van der Hoff b49a950245
Update proposals/2176-update-redaction-rules.md
fix typo

Co-Authored-By: Kitsune Ral <Kitsune-Ral@users.sf.net>
2019-07-16 19:26:02 +01:00
Sorunome 9ebcff5758
fix typo, add section on html details element 2019-07-16 17:11:07 +02:00
Andrew Morgan 36cb8ed894 none -> m.none 2019-07-16 10:44:02 +01:00
Sorunome 1f786ae6dc
commit image into repo, fix typo 2019-07-15 20:52:24 +02:00
David Baker d9269b084f Exclude pubkey endpoints from auth 2019-07-15 16:58:24 +01:00
David Baker a1de6ff634 Hopefully clarify some bits 2019-07-15 10:26:24 +01:00
Richard van der Hoff cd5549d483 Proposal to update the redaction algorithm 2019-07-14 22:50:46 +01:00
Richard van der Hoff b09d48a9f7 Spec link 2019-07-14 20:22:39 +01:00
Richard van der Hoff 78d46b2890 Proposal to move the redacts key to a sane place 2019-07-14 20:20:09 +01:00
David Baker 25a47afa32
unnecessary capital mk. 2
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-12 11:55:40 +01:00
David Baker 6e061b1baf
unnecessary capital
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-12 11:55:11 +01:00
David Baker f474b31f5f
typo
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-12 11:54:45 +01:00
Andrew Morgan 3514437d24 Ability for client/server to decide on no hashing 2019-07-12 11:37:41 +01:00
David Baker 9bb6ad80d1 typo 2019-07-10 16:13:38 +01:00
Andrew Morgan ed67e26037 pepper must not be an empty string, append medium 2019-07-08 17:03:20 +01:00
Andrew Morgan 1963a24832 fix attacks paragraph 2019-07-08 13:27:38 +01:00
Andrew Morgan dd8a6549c9 Address review comments 2019-07-08 11:55:37 +01:00
David Baker 701d340da1 Remove exception for request/submitToken 2019-07-05 19:00:15 +01:00
David Baker bf8a1e5d5f Add way to get the HS to bind/unbind existing 3pids 2019-07-05 18:11:42 +01:00
Andrew Morgan 3702669424 update from comments 2019-07-05 15:59:29 +01:00
David Baker 30dcc28f9b try & clarify that HS signature isn't the only acceptable auth for unbind 2019-07-04 18:38:31 +01:00
Andrew Morgan f4a1e02884 simple method once more 2019-07-04 16:28:49 +01:00
Hubert Chathi 4d31ddc8c9 additions and clarifications
- indicate how to use MSC 1946 to store/share private keys
- add signing by devices to enable migrating from device verifications
- add information about signature upload failures and M_INVALID_SIGNATURE code
- add security consideration
2019-07-03 15:09:06 -04:00
Andrew Morgan 53bd384f2e Clarify salting 2019-07-03 09:59:38 +01:00
Hubert Chathi 3aaf181db2 rename some things and add clarification 2019-07-02 14:05:06 -04:00
David Baker 1a669348d8 http status code 2019-07-02 11:27:46 +01:00
David Baker d15c9df115
fullstop
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-07-02 11:25:26 +01:00
David Baker e28f7aad72
slash
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-07-02 11:25:12 +01:00
David Baker 4c72c37b80
slash
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-07-02 11:24:51 +01:00
David Baker 10858bf83b set account data after registration 2019-07-02 11:22:41 +01:00
David Baker 79dbad2914 remove acceptance token mention 2019-07-02 11:17:27 +01:00
David Baker ac6b9bdb7c s/deprecate/remove/ 2019-07-02 11:16:25 +01:00
David Baker 7f65364804
Typo
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-07-02 11:13:12 +01:00
David Baker 03e6ab0103 re-word double openid 2019-07-02 11:11:50 +01:00
David Baker d00dfb7822 exclude submittoken too 2019-07-02 11:04:06 +01:00
David Baker f02e4c2e9c
both registers are excluded from auth
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-07-02 11:00:39 +01:00
David Baker 5374030cc0 Drop application/x-form-www-urlencoded in v2 2019-07-02 10:59:08 +01:00
David Baker 2d11217d4e
Typo
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-07-02 10:56:32 +01:00
David Baker 8af35be13f
Typo
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-07-02 10:56:12 +01:00
Andrew Morgan 922a20ba26 small fixes 2019-07-01 16:30:07 +01:00
Andrew Morgan 6f81d3774b New hashing method 2019-07-01 16:23:28 +01:00
David Baker fe14d3c9f0 Spec terms response 2019-06-28 18:07:24 +01:00
David Baker 786d5bc281 rewrite UI auth tradeoffs 2019-06-28 10:25:24 +01:00
David Baker 45d630951c back to M_TERMS_NOT_SIGNED 2019-06-28 09:32:15 +01:00
David Baker 83bb3861ba line wrap 2019-06-28 09:31:53 +01:00
Travis Ralston 8897ea4bb1 Merge branch 'master' into travis/msc/integrations/discovery 2019-06-27 21:56:23 -06:00
Travis Ralston a2a7b7ff13 Merge branch 'master' into travis/msc/integrations/auth 2019-06-27 21:55:59 -06:00