Erik Johnston
856dd9100e
Merge remote-tracking branch 'origin/master' into erikj/search_yet_agian
9 years ago
Erik Johnston
2aef684e7e
Add list of required supported groupings
9 years ago
Erik Johnston
c61ae86102
Specify behaviour if server does not support pagination
9 years ago
Richard van der Hoff
3939ccf20c
Remove e2e drafts from master
...
This is now being tracked in the main spec, on the drafts/e2e branch.
9 years ago
Daniel Wagner-Hall
39f43abbb7
Add per-API changelogs
9 years ago
Daniel Wagner-Hall
705556634a
Add filters
9 years ago
Daniel Wagner-Hall
72e12bc2f5
Merge pull request #205 from jimmycuadra/signing-details-typo
...
Fix typo in signing details
9 years ago
Jimmy Cuadra
444fc5dbcd
Fix typo in signing details.
9 years ago
Daniel Wagner-Hall
873b0dcecf
Replace version numbers with release numbers
9 years ago
Daniel Wagner-Hall
63ca91f353
Move event signing to server-server spec
...
It's *definitely* not a client concern.
It isn't really in the right place at the moment, but s-s is very much a
work in progress whereas c-s is nearly stable.
9 years ago
Daniel Wagner-Hall
f308b7543c
Specify /admin/whois/{userId}
9 years ago
Daniel Wagner-Hall
19ce17cfed
Merge pull request #200 from matrix-org/daniel/redact
...
Merge pull request #200 from matrix-org/daniel/redact
9 years ago
Daniel Wagner-Hall
4baba85fe5
Draftify e2e in anticipation of a spec release
9 years ago
Daniel Wagner-Hall
2f3a00fe34
Consistently spell homeserver as homeserver
9 years ago
Daniel Wagner-Hall
e072d215cf
Specify redaction
9 years ago
Matthew Hodgson
b946d39886
typo
9 years ago
Daniel Wagner-Hall
c05da871ca
Merge pull request #194 from matrix-org/daniel/clarify
...
Merge pull request # 194 from matrix-org/daniel/clarify
9 years ago
Daniel Wagner-Hall
aa4ed10821
Unify v1 and v2 event schemas
9 years ago
Daniel Wagner-Hall
97fd1fdd62
Embed client and server release numbers
...
Note that this also removes the changelog - I'm going to re-add the
changelog differently soon.
9 years ago
Daniel Wagner-Hall
f6229f649a
Remove confusing wording
9 years ago
Daniel Wagner-Hall
fd88be1830
Merge pull request #189 from matrix-org/daniel/sections
...
Merge pull request # 189 from matrix-org/daniel/sections
9 years ago
Erik Johnston
23b2497743
Expand on where pagination tokens can be returned
9 years ago
Erik Johnston
46fd0b252c
Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/search_yet_agian
9 years ago
Daniel Wagner-Hall
c6e0322a9e
Swaggerify /account
9 years ago
Daniel Wagner-Hall
c9c433bc15
Make section depths consistent
9 years ago
Daniel Wagner-Hall
6c66bfc755
Flatten out v1 and v2_alpha directories
...
As a side effect, I got rid of all of the horrible symlinks and just put
in all of the proper relative paths. Because the horrible symlinks were
horrible.
9 years ago
Daniel Wagner-Hall
b479b54cd8
Add tables of contents to individual specs
9 years ago
Daniel Wagner-Hall
e401d3e262
Merge pull request #184 from matrix-org/daniel/splitspec
...
Split spec into page-per-section
9 years ago
Daniel Wagner-Hall
e171acf01f
Split spec into page-per-section
9 years ago
Daniel Wagner-Hall
bc514dc9c4
Merge pull request #178 from matrix-org/daniel/directory
...
Fix and include /directory api docs
9 years ago
Daniel Wagner-Hall
7f2813354d
Swaggerify /ban
9 years ago
Mark Haines
a20a49abf6
Merge pull request #168 from matrix-org/markjh/client_config
...
Add API for setting client config
9 years ago
Mark Haines
c5f457cee9
Merge pull request #132 from matrix-org/markjh/room_tags
...
Document a v2 api for setting tags on rooms
9 years ago
Richard van der Hoff
d9130f0e13
Merge pull request #24 from matrix-org/markjh/end_to_end_encryption
...
Basic specification for key distribution for end-to-end cryptography.
9 years ago
Daniel Wagner-Hall
ad4d8ae7a6
Move client-server intro to client-server section
9 years ago
Richard van der Hoff
0b1ba70a32
fix rst markup
...
`` > `
9 years ago
Richard van der Hoff
2dbb8ba56c
Fix title levels
...
make the title decoration consistent with the rest of the spec
9 years ago
Richard van der Hoff
51ca25a472
Merge branch 'master' into markjh/end_to_end_encryption
9 years ago
Richard van der Hoff
5f4458b2ff
Merge branch 'master' into markjh/end_to_end_encryption
9 years ago
Richard van der Hoff
8d41536757
Address kegan's comments
...
Minor fixes to the e2e spec as raiseds by kegan
9 years ago
Daniel Wagner-Hall
5e30b5b8d7
Remove POST version of /send
...
PUT should always be used.
9 years ago
Daniel Wagner-Hall
c25a806cef
Fix and include /directory api docs
9 years ago
Mark Haines
e76068a2a6
Merge branch 'markjh/room_tags' into markjh/client_config
9 years ago
Mark Haines
5bae15d47b
Merge branch 'master' into markjh/room_tags
...
Conflicts:
api/client-server/v2_alpha/sync.yaml
9 years ago
Richard van der Hoff
d8dd380dfa
Merge pull request #164 from matrix-org/rav/SPEC-254
...
Fix /sync documentation, post SPEC-254
9 years ago
Mark Haines
032ee75537
Update specification wording to match s/config/account_data/
9 years ago
Mark Haines
05c0092664
s/config/account_data/
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
Mark Haines
40f7eab73f
s/private_user_data/account_data/
9 years ago
Mark Haines
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