Richard van der Hoff
d8dd380dfa
Merge pull request #164 from matrix-org/rav/SPEC-254
...
Fix /sync documentation, post SPEC-254
9 years ago
Paul Evans
e95a1616af
Merge pull request #143 from matrix-org/paul/federation-room-join
...
Document the federation remote join handshake
9 years ago
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.
9 years ago
Daniel Wagner-Hall
8201eaa042
Swaggerify /rooms/:room_id/leave
9 years ago
Richard van der Hoff
7ff593b3de
Merge branch 'rav/SPEC-254' into rav/flatten_sync
...
Conflicts:
specification/events.rst
9 years ago
Richard van der Hoff
0db055b4ea
Fix another reference to 'txn_id'
9 years ago
Paul "LeoNerd" Evans
233e8486bc
Wording fix - objects contain keys, not list elements directly
9 years ago
Paul "LeoNerd" Evans
6cbfba7011
'auth_events' is a List, not a String
9 years ago
Paul "LeoNerd" Evans
122c082fcf
Comment about origin servers of invites having subsequently left the room
9 years ago
Paul "LeoNerd" Evans
923f05e554
More consistency around 'resident homeserver'
9 years ago
Paul "LeoNerd" Evans
36af793f05
s/full object/full event/
9 years ago
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
9 years ago
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.
9 years ago
Paul "LeoNerd" Evans
988d773476
/make_join protoevent no longer needs the pointless 'prev_state' key (SYN-517)
9 years ago
Paul "LeoNerd" Evans
885dd1e86c
Explain the 'prev_events' join protoevent key
9 years ago
Paul "LeoNerd" Evans
db5a90edcd
Avoid using the words 'current state' when talking about the result of the /make_join request
9 years ago
Paul "LeoNerd" Evans
aac45295ee
Remark that the directory server step could be skipped in an invite case
9 years ago
Paul "LeoNerd" Evans
d7c69fae43
Fix typo 'process'
9 years ago
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
9 years ago
Daniel Wagner-Hall
29d9c8eec6
Guests are allowed to set displaynames
9 years ago
Daniel Wagner-Hall
061105c9dc
Guest users are allowed room initialSync
9 years ago
Daniel Wagner-Hall
d7357ef9b7
Specify /publicRooms
9 years ago
Daniel Wagner-Hall
24c2036a35
3pid invites: remove mentions of display_name
9 years ago
Daniel Wagner-Hall
e72151f2c3
Specify guest room access
...
This was reviewed as PR #150 and merged from daniel/anonymousaccess
9 years ago
Daniel Wagner-Hall
161441fa3a
Update 3pid spec based on new implementation
9 years ago
Richard van der Hoff
8cba11b1cd
Add some links to spec bugs for display names
...
Just added a couple of TODO comments to useful jira bugs
9 years ago
Richard van der Hoff
2fd5fc39a0
Add spec for calculating display names for rooms and users
...
Merged from https://github.com/matrix-org/matrix-doc/pull/145
9 years ago
Paul "LeoNerd" Evans
f6c55979e0
Remove TODO comment about SYN-490 as it's unlikely to matter for v1; we'll fix it in v2
9 years ago
Paul "LeoNerd" Evans
40fa339cf7
Draw a pretty (well at least I think it's pretty) ASCII diagram of the remote join handshake
9 years ago
Mark Haines
d297d83151
Mention that sender is renamed to user_id in v1
9 years ago
Mark Haines
d067e50af5
Document the differences in event formatting between the v1 and v2 client APIs
9 years ago
Paul "LeoNerd" Evans
5b6f858802
Some initial notes by way of the remote join handshake; with several TODOs and unanswered questions
9 years ago
Paul "LeoNerd" Evans
745e607577
Use 'room' or 'room ID' instead of 'context' when describing federation protocol
9 years ago
Richard van der Hoff
13eddd456f
Proposal for adding full_state param to v2 sync
9 years ago
Erik Johnston
696f75d80b
Rename section
9 years ago
Erik Johnston
e2376e9a43
Merge branch 'erikj/login_fallback_v1' of github.com:matrix-org/matrix-doc
9 years ago
Erik Johnston
3cf431cac1
Add link
9 years ago
Kegsay
a22f1cd230
Merge pull request #119 from matrix-org/paul/test-vectors
...
Capture cryptographic test vectors for JSON or event signing from source
9 years ago
Erik Johnston
9a5bd6d21f
Use static
9 years ago
Erik Johnston
98dbf4d60b
Better flow
9 years ago
Erik Johnston
0529b4a9a2
Reword
9 years ago
Erik Johnston
88c459d549
Add back in login v1 fallback API
9 years ago
Daniel Wagner-Hall
7c250f91ff
Merge pull request #127 from matrix-org/daniel/exposedrooms
...
Allow history to be noted as world-readable
9 years ago
Kegsay
4823a133cd
Merge pull request #124 from matrix-org/clarify_scale_crop
...
Clarify 'scale' & 'crop' resize methods
9 years ago
Richard van der Hoff
f47a49de43
Merge pull request #126 from matrix-org/rav/send_events_api
...
Add the room send and state APIs to the spec
9 years ago
Richard van der Hoff
1945697456
Further tweaks to the room send and state APIs
...
- fix confusion re empty/absent state_keys
- move 'types of room events' section earlier in the 'Events' section
- remove some redundant anchors
9 years ago
Mark Haines
1d7cb6937f
Merge pull request #123 from matrix-org/markjh/list_formatting
...
Fix list formatting
9 years ago
Richard van der Hoff
28ab643a4e
Remove duplicated registration/login APIs
...
Currently the spec duplicates all of the account-management APIs. There's still
work to be done here, but the complete duplication is confusing.
9 years ago
Daniel Wagner-Hall
67880686d5
Allow history to be noted as world-readable
...
SPEC-237
9 years ago
Richard van der Hoff
587a8ba7ce
Merge branch 'master' into rav/send_events_api
9 years ago