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
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
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
29d9c8eec6
Guests are allowed to set displaynames
2015-11-12 12:05:02 +00:00
Daniel Wagner-Hall
061105c9dc
Guest users are allowed room initialSync
2015-11-11 17:18:58 +00:00
Daniel Wagner-Hall
d7357ef9b7
Specify /publicRooms
2015-11-11 11:39:40 +00:00
Daniel Wagner-Hall
24c2036a35
3pid invites: remove mentions of display_name
2015-11-09 17:30:18 +00:00
Daniel Wagner-Hall
e72151f2c3
Specify guest room access
...
This was reviewed as PR #150 and merged from daniel/anonymousaccess
2015-11-06 18:15:21 +00:00
Daniel Wagner-Hall
161441fa3a
Update 3pid spec based on new implementation
2015-11-05 18:11:20 +00:00
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
2015-11-05 11:06:31 +00:00
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
2015-11-05 10:55:11 +00:00
Mark Haines
d297d83151
Mention that sender is renamed to user_id in v1
2015-10-29 18:45:53 +00:00
Mark Haines
d067e50af5
Document the differences in event formatting between the v1 and v2 client APIs
2015-10-29 18:38:33 +00:00
Paul "LeoNerd" Evans
745e607577
Use 'room' or 'room ID' instead of 'context' when describing federation protocol
2015-10-28 14:49:50 +00:00
Richard van der Hoff
13eddd456f
Proposal for adding full_state param to v2 sync
2015-10-26 15:52:45 +00:00
Erik Johnston
696f75d80b
Rename section
2015-10-26 14:14:13 +00:00
Erik Johnston
e2376e9a43
Merge branch 'erikj/login_fallback_v1' of github.com:matrix-org/matrix-doc
2015-10-26 14:11:21 +00:00
Erik Johnston
3cf431cac1
Add link
2015-10-26 14:10:02 +00:00
Kegsay
a22f1cd230
Merge pull request #119 from matrix-org/paul/test-vectors
...
Capture cryptographic test vectors for JSON or event signing from source
2015-10-26 14:02:42 +00:00
Erik Johnston
9a5bd6d21f
Use static
2015-10-26 13:56:07 +00:00
Erik Johnston
98dbf4d60b
Better flow
2015-10-26 13:46:41 +00:00
Erik Johnston
0529b4a9a2
Reword
2015-10-26 13:45:36 +00:00
Erik Johnston
88c459d549
Add back in login v1 fallback API
2015-10-26 13:40:24 +00:00
Daniel Wagner-Hall
7c250f91ff
Merge pull request #127 from matrix-org/daniel/exposedrooms
...
Allow history to be noted as world-readable
2015-10-26 10:30:32 +00:00
Kegsay
4823a133cd
Merge pull request #124 from matrix-org/clarify_scale_crop
...
Clarify 'scale' & 'crop' resize methods
2015-10-26 09:57:32 +00:00
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
2015-10-23 17:05:30 +01:00
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
2015-10-23 16:58:55 +01:00
Mark Haines
1d7cb6937f
Merge pull request #123 from matrix-org/markjh/list_formatting
...
Fix list formatting
2015-10-23 16:53:29 +01:00
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.
2015-10-23 15:56:48 +01:00
Daniel Wagner-Hall
67880686d5
Allow history to be noted as world-readable
...
SPEC-237
2015-10-23 14:02:53 +01:00
Richard van der Hoff
587a8ba7ce
Merge branch 'master' into rav/send_events_api
2015-10-23 13:48:58 +01:00
Richard van der Hoff
d18d406c41
Add the room send and state APIs to the spec
2015-10-23 13:08:42 +01:00
David Baker
01064369a4
Add some clarification on the difference between 'scale' and 'crop' resize methods
2015-10-23 11:57:15 +01:00
Mark Haines
e3e8026025
Fix list formatting so that we aren't including everything in blockquotes
2015-10-23 10:51:31 +01:00
Erik Johnston
f0c74a9c83
Merge pull request #96 from matrix-org/erikj/search_actual
...
Add search API
2015-10-23 10:19:36 +01:00
Erik Johnston
4a558ad63b
Typo
2015-10-23 10:19:25 +01:00
Kegan Dougal
f95d19cecd
Merge branch 'master' into appservice-swagger
...
Conflicts:
specification/application_service_api.rst
2015-10-21 09:55:53 +01:00
Daniel Wagner-Hall
74d42f0142
Allow rejecting invitations
2015-10-20 11:08:22 +01:00
Paul "LeoNerd" Evans
e38e4788f2
Spell 'cryptographic' correctly
2015-10-19 18:29:37 +01:00
Paul "LeoNerd" Evans
228acc59aa
Capture cryptographic test vectors for JSON or event signing from source code
2015-10-19 18:26:52 +01:00
Paul Evans
84a8663019
Merge pull request #115 from matrix-org/paul/event-redaction
...
Initial attempt at describing the event redaction algorithm
2015-10-19 17:44:22 +01:00
Paul "LeoNerd" Evans
9252b3e1a2
Fix typo s/he/the/
2015-10-19 17:44:09 +01:00
Paul "LeoNerd" Evans
bfa9937bdc
Minor wording updates
2015-10-19 17:28:31 +01:00
Daniel Wagner-Hall
a9a9067d7e
Merge pull request #114 from matrix-org/daniel/3pidtosigned
...
Update 3pid invite section to reflect signed property
2015-10-19 15:52:50 +01:00
Erik Johnston
1d01f69c3c
Merge remote-tracking branch 'origin/master' into erikj/search_actual
2015-10-19 13:46:58 +01:00
Erik Johnston
111ca99519
Clarify that this doesn't include events that occurred after you left the room.
2015-10-19 13:46:30 +01:00
Kegsay
6546068c63
Merge pull request #101 from matrix-org/spec-182-asapi-user-creation
...
SPEC-182: Make it clearer how ASes are supposed to create users
2015-10-19 13:39:50 +01:00
Kegan Dougal
f3088a0674
Merge branch 'master' into spec-182-asapi-user-creation
2015-10-19 13:39:21 +01:00
Kegan Dougal
26f27d95fb
Merge branch 'master' into registration-swagger
...
Conflicts:
specification/client_server_api.rst
2015-10-19 13:34:41 +01:00
Kegan Dougal
ae90d15b3c
Add m.room.avatar
2015-10-19 10:46:07 +01:00
