Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-01-09 17:33:44 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
3888 commits 28 branches 42 tags 32 MiB
Commit graph

187 commits

Author SHA1 Message Date
Matthew Hodgson efcbf2f807
Merge branch 'master' into matthew/msc1779 2019-04-03 00:36:23 +01:00
David Baker 410a5dbbff
Update proposals/1915-unbind-identity-server-param.md 
Co-Authored-By: erikjohnston <erikj@jki.re>
 2019-03-18 09:36:01 +00:00
Erik Johnston bd4fab7a15 Be more explicit identity server selection and errors 2019-03-18 09:28:46 +00:00
Erik Johnston 60f1cf79de Update wording and add deactivate account API 2019-03-12 14:30:16 +00:00
David Baker 77110b46df
Update proposals/1915-unbind-identity-server-param.md 
Co-Authored-By: erikjohnston <erikj@jki.re>
 2019-03-08 12:14:08 +00:00
Erik Johnston ee6513d608 Add alternative sid/client_secret authentication 2019-03-07 16:52:58 +00:00
Erik Johnston f92925ed45 Add a 3PID unbind API 2019-03-06 11:32:28 +00:00
Erik Johnston 7eb8b5d7f3 Add proposal for invite error code 2019-02-08 14:36:12 +00:00
Travis Ralston f5134b2d8b
Merge pull request #1819 from matrix-org/neilj/msc-remove-presence-lists 
MSC:1819 Remove Presence Lists
 2019-02-01 12:00:42 -07:00
Travis Ralston 1cf9086c26
Merge pull request #1831 from matrix-org/travis/msc/wk-before-srv 
MSC1831: Change the order of .well-known and SRV discovery techniques
 2019-02-01 11:52:59 -07:00
Travis Ralston 41e50d553e
Merge pull request #1830 from matrix-org/travis/spec/x509-wk 
Specify .well-known s2s discovery and X.509 validation
 2019-02-01 08:36:55 -07:00
Travis Ralston 6421582bf2 Clarifications and alter the error handling of .well-known 
Note that MSC1831 changes the order, so the changes to MSC1708 might not make sense when combining all the proposals together. However, independently the change should make sense.
 2019-02-01 08:18:12 -07:00
Travis Ralston 00de03bddb Merge remote-tracking branch 'origin/travis/msc/wk-before-srv' into travis/msc/wk-before-srv 2019-01-31 10:53:22 -07:00
Travis Ralston 2fe6b2cb5c Plagiarize from richvdh for a better explanation 2019-01-31 10:53:06 -07:00
Travis Ralston ab7876cbef
Update 1831-srv-after-wellknown.md 2019-01-31 09:55:58 -07:00
Travis Ralston 0e90cf6a0c Proposal to change the order of .well-known and SRV discovery techniques 2019-01-31 09:38:58 -07:00
Travis Ralston ccce6c196d Specify how capabilities work in the c2s API 
Original proposals:
* https://github.com/matrix-org/matrix-doc/pull/1753
* https://github.com/matrix-org/matrix-doc/pull/1804

Implementation proof:
* https://github.com/matrix-org/synapse/pull/4472
* https://github.com/matrix-org/matrix-js-sdk/pull/830

There is one change to MSC1753 which is included in this commit. MSC1804 remains unchanged. In the original proposal, the change password capability being present was an indication that password changes were possible. It was found that this doesn't really communicate the state very well to clients in that lack of a capability (or a 404, etc) would mean that users would erroneously not be able to change their passwords. A simple boolean flag was added to assist clients in detecting this capability.
 2019-01-30 19:43:55 -07:00
Travis Ralston 72a2871021
Merge pull request #1804 from matrix-org/travis/msc/room-version-client-advertising 
MSC1804: Advertising capable room versions to clients
 2019-01-30 17:06:24 -07:00
Erik Johnston 1c0742ed6a
MSC 1659 Proposal: Change Event IDs to Hashes (#1659) 2019-01-30 17:08:21 +00:00
Neil Johnson 2eae933ed6 hard wrap to 80 chars 2019-01-30 11:28:53 +00:00
Neil Johnson 4f13f5289e
Update 1819-remove-presence-lists.md 
Add references to exactly what this proposal would remove
 2019-01-30 11:20:38 +00:00
Richard van der Hoff 5151aa0aa7
Update proposals/1819-remove-presence-lists.md 
Co-Authored-By: neilisfragile <neil@matrix.org>
 2019-01-30 10:44:15 +00:00
Travis Ralston 2c3ba0b135
Merge pull request #1813 from matrix-org/erikj/make_membership_room_ver 
MSC 1813 - Federation Make Membership Room Version
 2019-01-29 10:17:48 -07:00
Richard van der Hoff de57d3950f
Relax the requirement for a content-type on .well-known (#1824) 
The main reason for this is that Apache etc won't stick a content-type on by
default, because they don't know it's JSON, so requiring it seems like it will
require unnecessary hoop-humping for everyone who wants to use a .well-known.
 2019-01-29 14:46:27 +00:00
Neil Johnson 9f517f33ce
Create 1819-remove-presence-lists.md 2019-01-28 17:59:17 +00:00
Travis Ralston 577edeb53b Say that !stable == unstable 2019-01-25 09:27:23 -07:00
Travis Ralston 052d68d83d
Merge pull request #1791 from matrix-org/travis/spec/rver-upgrades 
Add room version upgrades
 2019-01-23 19:04:24 -07:00
Travis Ralston 50eba23669 Update MSC to match how room versions work 
As per 1773.
 2019-01-22 18:24:04 -07:00
Erik Johnston 3ec3adbc24 Proposal for add room_version to make_* fed APIs 2019-01-22 10:55:27 +00:00
Travis Ralston f308871ed9
Merge pull request #1794 from matrix-org/erikj/fed_invite_v2 
MSC 1794 - Federation v2 Invite API
 2019-01-21 07:59:07 -07:00
Hubert Chathi 41c14c9e7d
uhoreg tweaks 
Co-Authored-By: ara4n <matthew@arasphere.net>
 2019-01-18 22:56:19 +00:00
Matthew Hodgson 20b9a33b12 clarify 100% threshold for new spec core team additions 2019-01-18 22:39:44 +00:00
Matthew Hodgson 86703ef952
Merge branch 'master' into matthew/msc1779 2019-01-17 23:57:48 +00:00
Matthew Hodgson 3b86fa0e3c incorporating delph & vdh reviews 2019-01-17 23:56:49 +00:00
Travis Ralston 853d7ede30 Clarify the categories and the interaction between them 2019-01-17 09:41:24 -07:00
Travis Ralston 5da17d0114 Remove recommendation for clients to respect the spec over the server 2019-01-17 09:41:11 -07:00
Travis Ralston 7fee7373ea Proposal for advertising capable room versions to clients 2019-01-16 17:32:07 -07:00
Matthew Hodgson 80b9c83cce clarify dual-hatted guardians & spec core teamistas 2019-01-15 10:00:17 +00:00
Matthew Hodgson 8f4e1d9686 clarify guardian selection wording 2019-01-15 00:32:14 +00:00
Matthew Hodgson cc6b6ea021 clarify wording for trojan horsen 2019-01-15 00:31:08 +00:00
Matthew Hodgson 822d84e50c append fullstops to lists to make vdh happy 2019-01-15 00:29:07 +00:00
Matthew Hodgson 6ff0155a32 s/responsibilities/functions 2019-01-15 00:16:33 +00:00
Richard van der Hoff 9e435d6dab
scifi IANA 
Co-Authored-By: ara4n <matthew@arasphere.net>
 2019-01-14 23:33:03 +00:00
Richard van der Hoff ebf37178b5
Update proposals/1794-federation-v2-invites.md 
Co-Authored-By: erikjohnston <erikj@jki.re>
 2019-01-14 15:53:23 +00:00
Travis Ralston fe4928c6a1
Merge pull request #1708 from matrix-org/rav/proposal/well-known-for-federation 
MSC1708: .well-known support for server name resolution
 2019-01-14 07:48:05 -07:00
Erik Johnston b90ee6baab 'invite_room_state' should be an array 2019-01-14 14:21:20 +00:00
Hubert Chathi c88c9c2941
Update proposals/1794-federation-v2-invites.md 
Co-Authored-By: erikjohnston <erikj@jki.re>
 2019-01-14 14:19:58 +00:00
Matthew Hodgson a38e1e6adf incorporate kitsune & dbkr review 2019-01-14 13:02:01 +00:00
Kitsune Ral 2f20679db5
deanonymise kitsune 
Co-Authored-By: ara4n <matthew@arasphere.net>
 2019-01-14 12:48:12 +00:00
Matthew Hodgson 09813fc3a0 improve wording around compensation for team members. 
tweak Greater Benefit (particularly adding SnR and filtering goals
 2019-01-14 12:41:19 +00:00