Commit graph

5313 commits

Author SHA1 Message Date
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
Richard van der Hoff 82258fc0fc Proposal for changing event ids. Again. 2019-02-13 23:11:14 +00:00
Hubert Chathi ca7aa8b0ba fill in more details, including federation bits 2019-02-12 20:12:17 -05: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 946acbf380 Clarify v3 event representation in identifier grammar
Fixes https://github.com/matrix-org/matrix-doc/issues/1870
Fixes https://github.com/matrix-org/matrix-doc/issues/1869
Fixes https://github.com/matrix-org/matrix-doc/issues/1867
2019-02-10 19:49:55 -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
manuroe 0051c6a377 Key backup: Return {hash, count} for key upload requests
This is this tuple that allows the client to check if it has locally all keys of the backup
2019-02-07 23:32:29 -05:00
manuroe 7cde3193e5 Key backup: Explain hash better 2019-02-07 23:32:29 -05:00
manuroe 82ff866b58 Key backup: Add hash to represent stored keys
so that a matrix client A can check it is synchronised with the backup.
If not, that means that another client B has pushed keys client A does not have locally. Client A should then propose to the end user to retrieve  keys from the backup.
2019-02-07 23:32:29 -05:00
manuroe ed945d6744 Key backup: Expose the number of keys stored in the backup
so that matrix clients can compare it with the number of keys they have locally.
2019-02-07 23:32:29 -05:00
Hubert Chathi e7f7926023 add algorithm and version to the example
since they're marked as required
2019-02-07 23:30:01 -05:00
manuroe d43b595b5e Key backup: Fix PR remarks on PUT /room_keys/version/{version} 2019-02-07 23:30:01 -05:00
manuroe 2099308d4c Key backup: add PUT /room_keys/version/{version} to allow matrix clients to add signatures to an existing backup 2019-02-07 23:30:01 -05: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
Travis Ralston e14eb672e6
Merge pull request #1861 from matrix-org/travis/rver-toc
Add a table of contents to each room version spec
2019-02-07 08:11:25 -07:00
J. Ryan Stinnett 0ed0fee261
Update specification/rooms/v2.rst
Co-Authored-By: turt2live <travpc@gmail.com>
2019-02-07 08:09:35 -07:00
Travis Ralston 772ba8dc2a Add a table of contents to each room version spec
Fixes https://github.com/matrix-org/matrix-doc/issues/1852

We get clickable headers for free by doing this.
2019-02-06 22:26:41 -07:00
Travis Ralston 85578f9842 Fix spelling mistake: endponts -> endpoints
Fixes https://github.com/matrix-org/matrix-doc/issues/1677
2019-02-06 22:19:47 -07:00
Travis Ralston cf11965a8e Change notice about room v2's scope to represent reality
Fixes https://github.com/matrix-org/matrix-doc/issues/1851
2019-02-06 22:15:13 -07:00
Travis Ralston 375104127c Fix spec release process to match new changelog stuff
Also while we're here, make it accurate. 

Fixes https://github.com/matrix-org/matrix-doc/issues/1858
2019-02-06 22:03:16 -07:00
Travis Ralston 76946a8a7c Simplify changelog generation
We don'e need `{{server_server_changelog_r0.1.0}}` (for example), so don't go through the hassle of generating it. Instead, we'll generate the changelog for the requested versions of each API and put that in place. In the future, we may wish to consider bringing back more complicated variables when/if we start generating released versions of the spec on the fly rather than manually.
2019-02-06 22:02:21 -07:00
Travis Ralston 681a4f0387
Merge pull request #1857 from matrix-org/server_server/release-r0.1.1
s2s r0.1.1 release
2019-02-06 15:37:01 -07:00
Travis Ralston 8bd9ca4edd Prep for r0.1.1 of s2s 2019-02-06 12:39:16 -07:00
Travis Ralston 71f251c733
Merge pull request #1855 from matrix-org/travis/fix-wk-fallback
Fix contradiction in wellknown discovery for servers
2019-02-06 12:22:59 -07:00
Travis Ralston 4b68b5c939 Changelog 2019-02-06 12:20:56 -07:00
Travis Ralston bcef94ec70
Merge pull request #1847 from matrix-org/travis/s2s-unstable-warning
Add the "please use latest.html" warning to the s2s spec
2019-02-06 08:12:32 -07:00