Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-24 18:08:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3834 commits 30 branches 42 tags 32 MiB
Commit graph

3834 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston b76b7cd178
Merge pull request #1915 from matrix-org/erikj/unbind_threepid_msc 
MSC 1915 - Add a 3PID unbind API
 2019-03-23 22:45:55 -06:00
Travis Ralston fa541fd99a
Merge pull request #1933 from Vikingat-RAGE/master 
E2E typo fix in spec
 2019-03-18 15:56:03 -06:00
Vikingat-RAGE 76ee13b9bb Fixed bad spacing. 2019-03-18 21:54:56 +00:00
Vikingat-RAGE 1a739ec97b E2E typo fix in spec 2019-03-18 21:16:52 +00: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
Travis Ralston c08d223cfe
Merge pull request #1889 from ma1uta/push_rules 
Fix for the #1865
 2019-02-28 13:31:56 -07:00
Anatoly Sablin 5303ba54b7 Add a clarification changelog. 2019-02-28 21:04:23 +03:00
Travis Ralston f1280ef305
Merge pull request #1910 from matrix-org/benpa/spelling-fix 
in the appendices, thanks earfolds
 2019-02-26 11:19:51 -07:00
Ben Parsons 99405418c9 in the appendices, thanks earfolds 2019-02-26 18:11:02 +00:00
Travis Ralston 324660073a
Merge pull request #1908 from matrix-org/travis/spec/unsupported-room-version 
Describe M_UNSUPPORTED_ROOM_VERSION on invite and createRoom endpoints
 2019-02-25 09:48:07 -07:00
Andrew Morgan 1c731630f8
Merge pull request #1909 from matrix-org/anoa/contrib_rst 
Specify news fragments must be done in RST
 2019-02-25 14:07:50 +00:00
Andrew Morgan 4049ca9208 Specify news fragments must be done in RST. 2019-02-25 09:47:19 +00:00
Travis Ralston adb721bc0b Fix unrelated changelog entry's RST representation 2019-02-24 21:55:57 -07:00
Travis Ralston baf8948eb5 Describe M_UNSUPPORTED_ROOM_VERSION on invite and createRoom endpoints 
Spec for MSC1866: https://github.com/matrix-org/matrix-doc/pull/1866
 2019-02-24 21:55:04 -07:00
Travis Ralston 23b2420520
Merge pull request #1866 from matrix-org/erikj/fed_invite_error_code 
Add proposal for invite error code for unsupported room version
 2019-02-24 21:46:08 -07:00
Travis Ralston 51995b2d9e
Merge pull request #1906 from ma1uta/fix_s2s_open_id 
Fix #1904.
 2019-02-24 13:25:49 -07:00
Anatoly Sablin 060c5c7b21 Add clarification changelog entry. 2019-02-24 23:01:01 +03:00
Anatoly Sablin d52918a892 Fix #1904. 2019-02-24 22:26:32 +03:00
Anatoly Sablin 4bec3d6dd8 Avoid duplicates. 2019-02-24 19:43:03 +03:00
Richard van der Hoff 9edf2a3271
Merge pull request #1900 from hvenev/spec-ident-port 
Restrict identifier port numbers to 5 digits.
 2019-02-22 10:40:11 +00:00
Hristo Venev e825224b5b Restrict identifier port numbers to 5 digits. 2019-02-21 21:27:21 +00:00
Travis Ralston 621437b0c5
Merge pull request #1891 from QMatrixClient/kitsune-drop-obsolete-text 
Remove extended text about life without transaction IDs
 2019-02-21 11:31:55 -07:00
Travis Ralston 49119ed345
Merge pull request #1875 from matrix-org/travis/clarify-upgrades 
Clarify the recommendations for "transferable state"
 2019-02-18 06:14:43 -07:00
Travis Ralston b82b16c3ae
Merge pull request #1846 from matrix-org/travis/fix-changelog 
Fix changelog generation for non-default versions
 2019-02-18 06:14:06 -07:00
Travis Ralston 2ffdda2824
Merge pull request #1890 from ma1uta/fix_link 
Fix links.
 2019-02-16 11:08:53 -07:00
Kitsune Ral 989d7ff192 Remove extended text about life without transaction IDs 
Signed-off-by: Kitsune Ral <Kitsune-Ral@users.sf.net>
 2019-02-16 18:49:13 +09:00
Anatoly Sablin befd76f853 Fix links. 2019-02-16 10:38:51 +03:00
Anatoly Sablin 17420c537a Fix links. 2019-02-16 08:56:02 +03:00
Anatoly Sablin d4b4d92b82 Fix the m.push_rules type (switch from the state event to the common event). 2019-02-16 00:24:26 +03:00
Anatoly Sablin 2de7ef9a3d #1865 Add the m.push_rules schema. 2019-02-15 23:23:38 +03:00
Travis Ralston 72242e4ebb
Merge pull request #1879 from matrix-org/travis/fix-capabilities 
Correctly nest the capabilities response object
 2019-02-11 21:45:02 -07:00
Travis Ralston d31d2f5e57 Correctly nest the capabilities response object 
Everything is contained in a "capabilities" property, which is not represented by the schema. The example was correct.
 2019-02-11 20:31:48 -07:00
Andrew Morgan 48569c2156
Merge pull request #1853 from matrix-org/anoa/3pid_typos 
Replace "3pid" with "3PID"
 2019-02-11 15:11:28 +00:00
Travis Ralston 26810bccef
Merge pull request #1873 from matrix-org/travis/spec/get-account-data 
Add routes for retrieving account data
 2019-02-11 08:02:34 -07:00
Travis Ralston a044145049
Merge pull request #1874 from matrix-org/travis/spec/resource-limit-error 
Add M_RESOURCE_LIMIT_EXCEEDED
 2019-02-11 07:59:21 -07:00
Andrew Morgan df7223f992 Add changelogs 2019-02-11 10:02:05 +00:00
Travis Ralston 22188ebfeb Further clarify why membership events are not to be transferred 2019-02-10 19:54:20 -07:00
Travis Ralston f058a0f40a also power levels 2019-02-10 19:36:33 -07:00
Travis Ralston f67782230a changelog 2019-02-10 19:35:23 -07:00
Travis Ralston ef13aef8c3 Clarify the recommendations for "transferable state" 
Fixes https://github.com/matrix-org/matrix-doc/issues/1843
 2019-02-10 19:33:43 -07:00
Travis Ralston b1689a3036 Misc improvements 2019-02-10 18:03:17 -07:00
Travis Ralston b42310ab9d Merge branch 'master' into travis/fix-changelog 2019-02-10 17:53:29 -07:00
Travis Ralston 5721712eae Add M_RESOURCE_LIMIT_EXCEEDED 
Original proposal: https://github.com/matrix-org/matrix-doc/issues/1504

No changes from the original proposal or implementations have been made intentionally here.
 2019-02-10 17:47:17 -07:00
Travis Ralston 6bbf22cd04 Add routes for retrieving account data 
Original proposal: https://github.com/matrix-org/matrix-doc/issues/1339

This contains no known differences to what was ultimately decided upon and implemented.
 2019-02-10 17:07:47 -07:00
Erik Johnston 7eb8b5d7f3 Add proposal for invite error code 2019-02-08 14:36:12 +00:00