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

3441 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Hodgson bcd48ebbec
Merge pull request #1610 from uhoreg/reloaded 
document new state resolution algorithm
 2018-09-02 23:53:08 +01:00
Matthew Hodgson 8a949af23a
Merge pull request #1650 from mujx/use-example-org 
Use example.org on examples instead of domain.com which is a real domain
 2018-09-02 23:51:58 +01:00
Konstantinos Sideris 192a6c2ab9 Use example.org on examples instead of domain.com which is a real domain 
Signed-off-by: Konstantinos Sideris <sideris.konstantin@gmail.com>
 2018-09-02 17:58:21 +03:00
Matthew Hodgson 9e82b18e24
Merge pull request #1649 from matrix-org/matthew/to-device 
swaggerify to-device messages
 2018-09-01 03:09:41 +01:00
Matthew Hodgson 43f2819702 switch to travis' example 2018-09-01 03:06:15 +01:00
Matthew Hodgson 49f0a06238 experiment with additionalProperties some more 2018-09-01 03:03:51 +01:00
Matthew Hodgson f6326030ba backtick asterisk 2018-09-01 03:02:46 +01:00
Matthew Hodgson 7430c3b56f experiment with additionalProperties 2018-09-01 03:01:41 +01:00
Matthew Hodgson 337041610f one slash? 2018-09-01 02:53:15 +01:00
Matthew Hodgson a842e0433d try escaping the asterisk 2018-09-01 02:50:32 +01:00
Matthew Hodgson 42b11e096f Review 2018-09-01 02:48:37 +01:00
Matthew Hodgson d25f4412d4 improve wording 2018-09-01 02:46:05 +01:00
Matthew Hodgson db302b66ca revert example which was corect first time; fix rst 2018-09-01 02:44:53 +01:00
Matthew Hodgson 2c0b45fd14 fix example? 2018-09-01 02:41:53 +01:00
Matthew Hodgson 0f9a23c471 swaggerify to-device 2018-09-01 02:37:31 +01:00
Matthew Hodgson d789564db7 only apply list CSS overrides to section classes 2018-09-01 01:12:55 +01:00
Travis Ralston bd78445756 Merge branch 'travis/general/changelogs' into m-master 2018-08-31 17:40:41 -06:00
Travis Ralston 735de03e07 Add r0 version links 
These were missed in the release process.
 2018-08-31 17:40:32 -06:00
Travis Ralston 3ba64f95e6
Merge pull request #1647 from matrix-org/client_server/release-r0.4.0 
r0.4.0 release of the Client-Server specification
 2018-08-31 17:07:38 -06:00
Travis Ralston 485928486a Client-server r0.4.0 changelog 2018-08-31 16:45:41 -06:00
Travis Ralston 17a6a4c2ee Merge branch 'travis/c2s/fix-changelog' into client_server/release-r0.4.0 2018-08-31 16:45:09 -06:00
Travis Ralston bb2835651f
Merge pull request #1637 from turt2live/travis/c2s/clarify-errors 
List known client-server error codes; Clarify priority of error codes vs http status code
 2018-08-31 16:42:43 -06:00
Travis Ralston 51883562b9
Merge pull request #1645 from matrix-org/identity_service/release-r0.1.0 
Identity Service r0.1.0 release
 2018-08-31 16:41:00 -06:00
Travis Ralston 680ab5e194 Misc formatting things 
Consistency, make the renderer happy
 2018-08-31 16:36:51 -06:00
Travis Ralston 247ae26ec4 Consistency 2018-08-31 16:33:17 -06:00
Travis Ralston d5af3bae43 This isn't a new endpoint 2018-08-31 16:33:09 -06:00
Travis Ralston 10fa5a3a01 Changelog for r0.1.0 IS spec 2018-08-31 16:21:51 -06:00
Travis Ralston 00578547c0
Merge pull request #1644 from matrix-org/rav/is_token_grammar 
Spec grammars for IS things
 2018-08-31 16:05:23 -06:00
Travis Ralston 30737cce96
Merge pull request #1643 from turt2live/travis/sanity/fix-naming 
Fix all naming of "homeserver" and "identity server"
 2018-08-31 15:56:17 -06:00
Travis Ralston f3825c5827 A couple more stragglers 2018-08-31 15:55:07 -06:00
Travis Ralston 218b86d6e8 Hopefully the last one 2018-08-31 15:48:41 -06:00
Richard van der Hoff 79974b152c s/identity service/identity server 2018-08-31 22:44:36 +01:00
Travis Ralston 2af09655ce Fix the stragglers 2018-08-31 15:44:23 -06:00
Richard van der Hoff 21f8898cd8 Merge remote-tracking branch 'origin/master' into rav/is_token_grammar 2018-08-31 22:38:04 +01:00
Richard van der Hoff a544b68298 Merge branch 'master' into rav/is_token_grammar 2018-08-31 22:37:04 +01:00
Travis Ralston 7d34995ece It's actually an "identity server implementing the Identity Service API" 
Also add a note about appservices being special.
 2018-08-31 15:35:32 -06:00
Travis Ralston c94f3619b7 Missed a rogue case of identity server 2018-08-31 15:09:18 -06:00
Travis Ralston 7ac76fa27c Actually we're going with "identity server" afterall 2018-08-31 15:04:00 -06:00
Travis Ralston ec248b436f Identity Service is lowercase 2018-08-31 15:04:00 -06:00
Travis Ralston cc0badaaa1 Fix all naming cases of "identity service" 
Fixes https://github.com/matrix-org/matrix-doc/issues/1396

Includes some "homeserver" fixes too. This commit does not include historical documentation or notes.
 2018-08-31 15:04:00 -06:00
Travis Ralston 683072e624
Merge pull request #1636 from turt2live/travis/c2s/id-server 
Clean up and flesh out all three editions of the /requestToken API
 2018-08-31 14:57:17 -06:00
Travis Ralston a1f655e5be Fix more error wording 2018-08-31 14:53:59 -06:00
Travis Ralston 108c623557
Merge pull request #1635 from turt2live/travis/c2s/read-markers 
Add read markers
 2018-08-31 14:47:39 -06:00
Richard van der Hoff 8773b9319b
Merge pull request #1599 from matrix-org/benpa/spec-tables-prettier 
Benpa/spec tables prettier
 2018-08-31 21:40:55 +01:00
Travis Ralston 84a2b7f3c0
Merge pull request #1632 from uhoreg/fix_room_member_state_key 
fix handling of multi-line state key descriptions
 2018-08-31 14:38:58 -06:00
Travis Ralston 1261da209d Fix wording for the homeserver not allowing a particular 3pid 2018-08-31 14:38:22 -06:00
Travis Ralston dfe6d0d3b8
Merge pull request #1642 from turt2live/travis/c2s/pagination 
Generalize language for pagination
 2018-08-31 14:23:31 -06:00
Travis Ralston 835f5de387 Generalize the token name even more 2018-08-31 14:22:07 -06:00
Richard van der Hoff cb1e687196 spec the format of an IS invite token 2018-08-31 21:16:32 +01:00
Richard van der Hoff 69c30ef156 spec the format of a client_secret 2018-08-31 21:11:11 +01:00