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

1083 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard van der Hoff
5f4458b2ff Merge branch 'master' into markjh/end_to_end_encryption 2015-11-27 11:45:49 +00:00
Richard van der Hoff
8d41536757 Address kegan's comments 
Minor fixes to the e2e spec as raiseds by kegan
 2015-11-27 11:37:24 +00:00
Richard van der Hoff
181d3f976d Initial proposal for websockets support. 2015-11-20 15:29:54 +00:00
Richard van der Hoff
d8dd380dfa Merge pull request #164 from matrix-org/rav/SPEC-254 
Fix /sync documentation, post SPEC-254
 2015-11-20 15:17:55 +00:00
Richard van der Hoff
e7610c7cc5 Merge pull request #165 from matrix-org/rav/flatten_sync 
/sync response format tweaks
 2015-11-20 15:17:34 +00:00
Daniel Wagner-Hall
1a1a7d87dc Revert "Changelog for 0.3.0" 
This reverts commit 5aeaa42a50.
 2015-11-18 18:53:20 -05:00
Daniel Wagner-Hall
5aeaa42a50 Changelog for 0.3.0 2015-11-18 18:41:25 -05:00
Paul Evans
e95a1616af Merge pull request #143 from matrix-org/paul/federation-room-join 
Document the federation remote join handshake
 2015-11-18 19:21:04 +00:00
Richard van der Hoff
d7d59d78e1 /sync: Put state dict back to being a list 
Turning the state into a dict-of-dicts caused more pain than it solved. Put it
back to a list.
 2015-11-18 16:17:29 +00:00
Daniel Wagner-Hall
7b1e8359d9 Merge pull request #173 from matrix-org/daniel/forgetrooms 
Specify /rooms/:room_id/forget
 2015-11-18 15:51:16 +00:00
Richard van der Hoff
6653362f31 Unflatten 'unsigned' 
It turns out that flattening 'unsigned' comes with too many downsides. Let's
stick with the status quo.
 2015-11-18 15:15:21 +00:00
Daniel Wagner-Hall
6763317e64 Specify /rooms/:room_id/forget 2015-11-17 10:33:46 -05:00
Daniel Wagner-Hall
a0fb7af8fc Merge pull request #172 from matrix-org/daniel/specleaving 
Swaggerify /rooms/:room_id/leave
 2015-11-17 10:32:23 -05:00
Daniel Wagner-Hall
8201eaa042 Swaggerify /rooms/:room_id/leave 2015-11-17 15:31:10 +00:00
Kegsay
994c0974f9 Merge pull request #162 from matrix-org/rav/refactor_tables 
Rewrite the table templates
 2015-11-17 09:47:29 +00:00
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
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
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
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
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
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
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