51ca25a472
Merge branch 'master' into markjh/end_to_end_encryption
9 years ago
5f4458b2ff
Merge branch 'master' into markjh/end_to_end_encryption
9 years ago
8d41536757
Address kegan's comments
...
Minor fixes to the e2e spec as raiseds by kegan
9 years ago
5e30b5b8d7
Remove POST version of /send
...
PUT should always be used.
9 years ago
c25a806cef
Fix and include /directory api docs
9 years ago
e76068a2a6
Merge branch 'markjh/room_tags' into markjh/client_config
9 years ago
5bae15d47b
Merge branch 'master' into markjh/room_tags
...
Conflicts:
api/client-server/v2_alpha/sync.yaml
9 years ago
d8dd380dfa
Merge pull request #164 from matrix-org/rav/SPEC-254
...
Fix /sync documentation, post SPEC-254
9 years ago
032ee75537
Update specification wording to match s/config/account_data/
9 years ago
05c0092664
s/config/account_data/
9 years ago
e95a1616af
Merge pull request #143 from matrix-org/paul/federation-room-join
...
Document the federation remote join handshake
9 years ago
40f7eab73f
s/private_user_data/account_data/
9 years ago
24c4b8b095
Merge branch 'markjh/room_tags' into markjh/client_config
...
Conflicts:
api/client-server/v1/rooms.yaml
api/client-server/v1/sync.yaml
api/client-server/v2_alpha/sync.yaml
specification/targets.yaml
9 years ago
fcbb985073
s/private_user_data/account_data/
9 years ago
6653362f31
Unflatten 'unsigned'
...
It turns out that flattening 'unsigned' comes with too many downsides. Let's
stick with the status quo.
9 years ago
8201eaa042
Swaggerify /rooms/:room_id/leave
9 years ago
373c6c8270
Add ordering, pagination and grouping comments
9 years ago
c77b22778f
Add some documentation on names of tags
9 years ago
25769493b1
Fix template
9 years ago
e7fbe6f13b
Limit the size of a tag
9 years ago
48f35e15cb
describe how to order rooms that don't have an order in their tags
9 years ago
299af673da
Specify how ordering of tags is supposed to work
9 years ago
7ff593b3de
Merge branch 'rav/SPEC-254' into rav/flatten_sync
...
Conflicts:
specification/events.rst
9 years ago
3b390bff3c
Merge branch 'master' into markjh/room_tags
...
Conflicts:
api/client-server/v1/rooms.yaml
specification/targets.yaml
9 years ago
0db055b4ea
Fix another reference to 'txn_id'
9 years ago
8f5783615c
Merge branch 'master' into markjh/client_config
...
Conflicts:
api/client-server/v1/rooms.yaml
specification/targets.yaml
9 years ago
233e8486bc
Wording fix - objects contain keys, not list elements directly
9 years ago
c3769ef75c
Add a module for client config to the specification
9 years ago
6cbfba7011
'auth_events' is a List, not a String
9 years ago
122c082fcf
Comment about origin servers of invites having subsequently left the room
9 years ago
923f05e554
More consistency around 'resident homeserver'
9 years ago
36af793f05
s/full object/full event/
9 years ago
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
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
988d773476
/make_join protoevent no longer needs the pointless 'prev_state' key (SYN-517)
9 years ago
885dd1e86c
Explain the 'prev_events' join protoevent key
9 years ago
db5a90edcd
Avoid using the words 'current state' when talking about the result of the /make_join request
9 years ago
aac45295ee
Remark that the directory server step could be skipped in an invite case
9 years ago
d7c69fae43
Fix typo 'process'
9 years ago
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
29d9c8eec6
Guests are allowed to set displaynames
9 years ago
061105c9dc
Guest users are allowed room initialSync
9 years ago
d7357ef9b7
Specify /publicRooms
9 years ago
24c2036a35
3pid invites: remove mentions of display_name
9 years ago
e72151f2c3
Specify guest room access
...
This was reviewed as PR #150 and merged from daniel/anonymousaccess
9 years ago
161441fa3a
Update 3pid spec based on new implementation
9 years ago
8cba11b1cd
Add some links to spec bugs for display names
...
Just added a couple of TODO comments to useful jira bugs
9 years ago
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
3953006792
Fix spelling
9 years ago
f6c55979e0
Remove TODO comment about SYN-490 as it's unlikely to matter for v1; we'll fix it in v2
9 years ago
40fa339cf7
Draw a pretty (well at least I think it's pretty) ASCII diagram of the remote join handshake
9 years ago
149890227a
Fix wording
9 years ago
52f55e0542
Allow room tags to have asssociated content, and return that content in the m.tag events
9 years ago
f557e69860
Note that m.tag events can appear in v1 initialSync and /events as well as v2 sync. Only add the room_id for v1 /events since it is redundant in v1 /initialSync
9 years ago
d297d83151
Mention that sender is renamed to user_id in v1
9 years ago
d067e50af5
Document the differences in event formatting between the v1 and v2 client APIs
9 years ago
5b6f858802
Some initial notes by way of the remote join handshake; with several TODOs and unanswered questions
9 years ago
745e607577
Use 'room' or 'room ID' instead of 'context' when describing federation protocol
9 years ago
65066a76b3
Add the m.tags event to a ``private_user_data`` key rather than including it under the ``ephemeral`` key
9 years ago
9b0d20315a
Add the tags module to the specification targets
9 years ago
12e33a3b09
Document a v2 api for setting tags on rooms
9 years ago
13eddd456f
Proposal for adding full_state param to v2 sync
9 years ago
696f75d80b
Rename section
9 years ago
e2376e9a43
Merge branch 'erikj/login_fallback_v1' of github.com:matrix-org/matrix-doc
9 years ago
3cf431cac1
Add link
9 years ago
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
9a5bd6d21f
Use static
9 years ago
98dbf4d60b
Better flow
9 years ago
0529b4a9a2
Reword
9 years ago
88c459d549
Add back in login v1 fallback API
9 years ago
7c250f91ff
Merge pull request #127 from matrix-org/daniel/exposedrooms
...
Allow history to be noted as world-readable
9 years ago
4823a133cd
Merge pull request #124 from matrix-org/clarify_scale_crop
...
Clarify 'scale' & 'crop' resize methods
9 years ago
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
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
1d7cb6937f
Merge pull request #123 from matrix-org/markjh/list_formatting
...
Fix list formatting
9 years ago
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
67880686d5
Allow history to be noted as world-readable
...
SPEC-237
9 years ago
587a8ba7ce
Merge branch 'master' into rav/send_events_api
9 years ago
d18d406c41
Add the room send and state APIs to the spec
9 years ago
01064369a4
Add some clarification on the difference between 'scale' and 'crop' resize methods
9 years ago
e3e8026025
Fix list formatting so that we aren't including everything in blockquotes
9 years ago
f0c74a9c83
Merge pull request #96 from matrix-org/erikj/search_actual
...
Add search API
9 years ago
4a558ad63b
Typo
9 years ago
f95d19cecd
Merge branch 'master' into appservice-swagger
...
Conflicts:
specification/application_service_api.rst
9 years ago
74d42f0142
Allow rejecting invitations
9 years ago
e38e4788f2
Spell 'cryptographic' correctly
9 years ago
228acc59aa
Capture cryptographic test vectors for JSON or event signing from source code
9 years ago
84a8663019
Merge pull request #115 from matrix-org/paul/event-redaction
...
Initial attempt at describing the event redaction algorithm
9 years ago
9252b3e1a2
Fix typo s/he/the/
9 years ago
bfa9937bdc
Minor wording updates
9 years ago
a9a9067d7e
Merge pull request #114 from matrix-org/daniel/3pidtosigned
...
Update 3pid invite section to reflect signed property
9 years ago
1d01f69c3c
Merge remote-tracking branch 'origin/master' into erikj/search_actual
9 years ago
111ca99519
Clarify that this doesn't include events that occurred after you left the room.
9 years ago
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
9 years ago
f3088a0674
Merge branch 'master' into spec-182-asapi-user-creation
9 years ago
26f27d95fb
Merge branch 'master' into registration-swagger
...
Conflicts:
specification/client_server_api.rst
9 years ago
ae90d15b3c
Add m.room.avatar
9 years ago
c70067dd1e
Simplify language
9 years ago
22fdb8f911
Merge branch 'master' into daniel/as
9 years ago
29720cd152
Initial attempt at describing the event redaction algorithm
9 years ago
6161a920b6
Update 3pid invite section to reflect signed property
9 years ago
62d53b4f33
Review comments round III
9 years ago
85a6a5a530
Merge branch 'master' into proofing
9 years ago
4bb042daeb
Review comments round II
9 years ago
e0fe3c42c8
Review comments
9 years ago
6770d6b2d6
Review comments
9 years ago
20b11281ea
Remove lies about OAuth which doesn't exist
9 years ago
eb59b8e9d1
Mention count
9 years ago
a6cb2e4339
Mention rank
9 years ago
eca98af896
Swaggerify /register endpoint
...
Need to move registration/login/auth sections around once #94 lands.
9 years ago
24e36adbe3
Mention e2e encryption
9 years ago
770cfbc5de
Be explicit about the events the search is performed over
9 years ago
906c59385f
s/had/has/
9 years ago
55cc5c5bb5
Swaggerify application services
9 years ago
3d087df538
Kill number prefixes for good
9 years ago
6b72ddfb8c
Spelling and typos
9 years ago
08ccacae17
Merge branch 'master' into proofing
...
Conflicts:
specification/0-intro.rst
9 years ago
c47a94658a
Mention supported keys
9 years ago
3146b52f83
Merge pull request #102 from matrix-org/spec-207-asapi-unique-tokens
...
SPEC-207: Add a warning about needing AS tokens to be unique and why
9 years ago
604e268add
Merge pull request #105 from matrix-org/spec-177-events-max-len
...
Add in size limits as per SPEC-222
9 years ago
5de63b4f45
Merge branch 'master' into proofing
...
Conflicts:
specification/0-intro.rst
9 years ago
af347baa68
Better phrasing
9 years ago
96a4996c76
Mention search categories
9 years ago
3a2c8cd4b3
Merge pull request #91 from matrix-org/module-history-vis
...
History visibility module
9 years ago
5aad67f74d
Review comments round III
9 years ago
c5dc383668
Merge pull request #85 from matrix-org/module-im
...
Instant messaging module
9 years ago
507cb29e39
Review comments round deux
9 years ago
f51ee70633
Review comments round 2
9 years ago
c82c07ddd2
Review comments
9 years ago
c4d1b56843
Add a comment about enforcement.
9 years ago
1229ad24dd
Merge pull request #103 from matrix-org/spec-165-mxc-security
...
SPEC-165: Outline directory traversal attacks on MXC URIs
9 years ago
bc0ab32cfd
Merge pull request #99 from matrix-org/spec-144-https-examples
...
SPEC-144 : Use https examples not http
9 years ago
e6eb19c461
Review comments
9 years ago
728b5a7951
Add very short summary
9 years ago
007bb1a69a
Add extra new line
9 years ago
5e48b0b79a
Add search to targets
9 years ago
38fcc563da
Spell out full title
9 years ago
0efa3fd981
Add module
9 years ago
6a0595bc46
Add in size limits as per SPEC-222
9 years ago
d8bc0c9315
Add search module
9 years ago
f0d8052951
SPEC-205: Warn about password strengths in m.login.password section
9 years ago
44b19a8b0e
SPEC-165: Outline directory traversal attacks on MXC URIs
9 years ago
45b1d08c7e
SPEC-207: Add a warning about needing AS tokens to be unique and why
9 years ago
cd34d4e19b
SPEC-182: Make it clearer how ASes are supposed to create users by linkifying the right text.
9 years ago
3608f3a282
SPEC-144 : Use https examples not http.
9 years ago
34bd8edec5
Move related auth sections together
9 years ago
6f6861a11d
Swaggerify the createRoom API
9 years ago
07d7a3fa3a
Shuffle pagination section around
9 years ago
7bdb71b1c9
Tweak the syncing section
...
Bring together disparate sections to make it more cohesive.
9 years ago
e716e81963
Add `dir` parameter to pagination. Remove path references
...
This section needs a lot of work to not lie.
9 years ago
Richard van der Hoff