Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-28 03:48:36 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3832 commits 30 branches 42 tags 32 MiB
Commit graph

3832 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Hubert Chathi 4e2fe124d2 wording fixes/clarifications 2019-08-25 18:22:23 -07: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
Hubert Chathi 3aaf181db2 rename some things and add clarification 2019-07-02 14:05:06 -04:00
Hubert Chathi fee2ebf682
fix typo 
Co-Authored-By: Shamil K <me@noteness.in>
 2019-06-02 16:09:47 -04:00
Hubert Chathi da5ce919f2 add sharing secrets, and a bunch of cleanups 2019-05-31 12:16:59 -04:00
Hubert Chathi 979827bad3 rename to match MSC number 2019-03-27 21:57:13 -04:00
Hubert Chathi 63c6d030fd draft of secure server-side storage 2019-03-27 21:48:12 -04: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
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
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
Travis Ralston 3e06473305
Merge pull request #1859 from matrix-org/travis/fix-v2-scope 
Change notice about room v2's scope to represent reality
 2019-02-07 11:41:25 -07:00
Travis Ralston 1f05c44a0b
Merge pull request #1860 from matrix-org/travis/fix-spelling-1 
Fix spelling mistake: endponts -> endpoints
 2019-02-07 08:11:43 -07:00