wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1410 commits 4 branches 0 tags 17 MiB
Commit graph

1410 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kegan Dougal
d1c685f296 Merge branch 'master' into rav/refactor_tables 2015-11-17 09:46:25 +00:00
Mark Haines
03a0377c76 Plans for end-to-end in matrix 2015-11-16 20:07:56 +00:00
Daniel Wagner-Hall
5db56df851 Merge pull request #160 from matrix-org/daniel/optional 
Note that invite_room_state is optional
 2015-11-16 13:01:57 -05:00
Erik Johnston
8991c4fa78 Fix schema and example 2015-11-16 18:00:48 +00:00
Mark Haines
c77b22778f Add some documentation on names of tags 2015-11-16 17:48:41 +00:00
Erik Johnston
5e0e4a8518 Document group and context response keys 2015-11-16 17:22:56 +00:00
Mark Haines
25769493b1 Fix template 2015-11-16 17:14:41 +00:00
Mark Haines
e7fbe6f13b Limit the size of a tag 2015-11-16 17:13:02 +00:00
Mark Haines
48f35e15cb describe how to order rooms that don't have an order in their tags 2015-11-16 17:08:59 +00:00
Mark Haines
299af673da Specify how ordering of tags is supposed to work 2015-11-16 17:04:19 +00:00
Richard van der Hoff
7ff593b3de Merge branch 'rav/SPEC-254' into rav/flatten_sync 
Conflicts:
	specification/events.rst
 2015-11-16 16:56:39 +00:00
Mark Haines
3b390bff3c Merge branch 'master' into markjh/room_tags 
Conflicts:
	api/client-server/v1/rooms.yaml
	specification/targets.yaml
 2015-11-16 16:56:35 +00:00
Richard van der Hoff
0db055b4ea Fix another reference to 'txn_id' 2015-11-16 16:54:57 +00:00
Richard van der Hoff
58b7901b51 Merge branch 'rav/SPEC-254' into rav/flatten_sync 
Conflicts:
	api/client-server/v2_alpha/definitions/event.json
	api/client-server/v2_alpha/sync.yaml
 2015-11-16 16:52:43 +00:00
Mark Haines
8f5783615c Merge branch 'master' into markjh/client_config 
Conflicts:
	api/client-server/v1/rooms.yaml
	specification/targets.yaml
 2015-11-16 16:51:45 +00:00
Paul "LeoNerd" Evans
233e8486bc Wording fix - objects contain keys, not list elements directly 2015-11-16 16:50:58 +00:00
Richard van der Hoff
8316881393 txn_id field in events is called transaction_id 2015-11-16 16:50:54 +00:00
Mark Haines
c3769ef75c Add a module for client config to the specification 2015-11-16 16:49:32 +00:00
Mark Haines
22b3159a39 Add examples of v1 initialSync and v2 /sync returning the client config 2015-11-16 16:34:39 +00:00
Mark Haines
769c5285ab Add API for setting client config 2015-11-16 16:33:57 +00:00
Paul "LeoNerd" Evans
6cbfba7011 'auth_events' is a List, not a String 2015-11-16 16:33:26 +00:00
Paul "LeoNerd" Evans
122c082fcf Comment about origin servers of invites having subsequently left the room 2015-11-16 16:29:43 +00:00
Kegsay
2b19b50f4f Merge pull request #167 from matrix-org/more_nesting 
Support more nesting
 2015-11-16 16:10:55 +00:00
Erik Johnston
e2eb0c7ad9 Add new request options 2015-11-16 16:04:23 +00:00
Paul "LeoNerd" Evans
923f05e554 More consistency around 'resident homeserver' 2015-11-16 15:34:11 +00:00
Paul "LeoNerd" Evans
36af793f05 s/full object/full event/ 2015-11-16 15:30:22 +00:00
Kegan Dougal
8648f86032 Moar spaces 2015-11-16 15:08:37 +00:00
Erik Johnston
96be7ff241 Support more nesting 2015-11-16 15:00:31 +00:00
Richard van der Hoff
e1b12a753e Fix typos and missing file 2015-11-16 00:17:22 +00:00
Richard van der Hoff
29bd4d45ee Flatten the response to /sync 
Now that we don't expect there to be duplication betwen the 'timeline' and
'state' results, there's no point in having the state map. (That does mean the
events themselves need event_id fields though).

Also:

- move the contents of the 'unsigned' dictionary into the events themselves
- replace the state list with two layers of dictionary keyed on type and
  state_key
- rename the children of the 'rooms' dict from "joined/invited/archived" to
  "join/invite/leave" to match the membership states
 2015-11-16 00:00:48 +00:00
Richard van der Hoff
b41d771c15 Fix typos in /sync example response 2015-11-15 23:58:04 +00:00
Richard van der Hoff
57995a815a Fix a number of untruths in the documentation about /sync. 
Attempts to make the /sync documentation better represent fact as it currently
stands - in particular document the structure of the returned events.
 2015-11-15 23:47:35 +00:00
Richard van der Hoff
3f0262081c Update sync API defn to reflect SPEC-254 changes 
State now corresponds to the start of the timeline, not the end.
 2015-11-15 23:47:35 +00:00
Richard van der Hoff
838af2a23e Updates to swagger table generation 
A bunch of related fixes to the code for parsing the state and API yaml files:

1. Some of our objects are {key: {key: value}} - style nested key/value
   dictionaries. Handle this by refactoring get_json_schema_object_fields so
   that such objects are handled wherever they appear, rather than when they
   are just subproperties of a 'proper' object.

2. Fix multi-level inheritance (so an object can have an 'allOf' property which
   can successfully refer to an object which itself has an 'allOf' property).

3. $ref fields in event schemas weren't being expanded correctly

4. sort type tables breadth-first rather than depth-first so that the ordering
   in complex structures like the /sync response makes a bit more sense.
 2015-11-15 23:44:46 +00:00
Richard van der Hoff
cc8ef691fb Rewrite the table templates 
Allow columns to stretch if they end up with wide content.

Apart from the hassle of having to manually update the calculations, having the
columns wide enough to hold the widest thing they might ever have leads to
tables with lots of whitespace in the results.
 2015-11-15 16:58:35 +00:00
Paul "LeoNerd" Evans
988d773476 /make_join protoevent no longer needs the pointless 'prev_state' key (SYN-517) 2015-11-13 17:49:22 +00:00
Paul "LeoNerd" Evans
885dd1e86c Explain the 'prev_events' join protoevent key 2015-11-13 16:39:31 +00:00
Paul "LeoNerd" Evans
db5a90edcd Avoid using the words 'current state' when talking about the result of the /make_join request 2015-11-13 16:36:26 +00:00
Paul "LeoNerd" Evans
aac45295ee Remark that the directory server step could be skipped in an invite case 2015-11-13 16:34:22 +00:00
Paul "LeoNerd" Evans
d7c69fae43 Fix typo 'process' 2015-11-13 16:33:34 +00:00
Daniel Wagner-Hall
ea364a108b Merge pull request #161 from matrix-org/daniel/guestdisplaynames 
Merge pull request #161 from matrix-org/daniel/guestdisplaynames

Guests are allowed to set displaynames
 2015-11-12 13:23:49 +00:00
Daniel Wagner-Hall
c5e4d08e3b Merge pull request #158 from matrix-org/daniel/guestroominitialsync 
Merge pull request #158 from matrix-org/daniel/guestroominitialsync

Guest users are allowed room initialSync
 2015-11-12 13:20:39 +00:00
Daniel Wagner-Hall
29d9c8eec6 Guests are allowed to set displaynames 2015-11-12 12:05:02 +00:00
Daniel Wagner-Hall
4d3175fc8b Note that invite_room_state is optional 2015-11-12 10:45:57 +00:00
Daniel Wagner-Hall
061105c9dc Guest users are allowed room initialSync 2015-11-11 17:18:58 +00:00
Daniel Wagner-Hall
703b9d456b Merge pull request #157 from matrix-org/daniel/specfetch 
speculator: Nessle up some more if statements
 2015-11-11 15:25:04 +00:00
Daniel Wagner-Hall
0f0359d9c1 speculator: Nessle up some more if statements 2015-11-11 15:13:34 +00:00
Daniel Wagner-Hall
567ba6d22d Merge pull request #156 from matrix-org/daniel/specfetch 
speculator: Fetch before deciding head is fresh
 2015-11-11 15:11:51 +00:00
Daniel Wagner-Hall
740cc66a7c speculator: Fetch before deciding head is fresh 2015-11-11 14:01:45 +00:00
Daniel Wagner-Hall
a80fcfa83b Merge pull request #155 from matrix-org/daniel/publicwritable2 
Specify /publicRooms world_readable and guest_access

Depends on https://github.com/matrix-org/matrix-doc/pull/154
 2015-11-11 11:53:37 +00:00