Commit Graph

293 Commits (30d46a19d51e8ed64ef9743ee7f6f451c034a723)

Author SHA1 Message Date
Kegsay 4823a133cd Merge pull request #124 from matrix-org/clarify_scale_crop
Clarify 'scale' & 'crop' resize methods
10 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
10 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
10 years ago
Mark Haines 1d7cb6937f Merge pull request #123 from matrix-org/markjh/list_formatting
Fix list formatting
10 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.
10 years ago
Richard van der Hoff 587a8ba7ce Merge branch 'master' into rav/send_events_api 10 years ago
Richard van der Hoff d18d406c41 Add the room send and state APIs to the spec 10 years ago
David Baker 01064369a4 Add some clarification on the difference between 'scale' and 'crop' resize methods 10 years ago
Mark Haines e3e8026025 Fix list formatting so that we aren't including everything in blockquotes 10 years ago
Erik Johnston f0c74a9c83 Merge pull request #96 from matrix-org/erikj/search_actual
Add search API
10 years ago
Erik Johnston 4a558ad63b Typo 10 years ago
Kegan Dougal f95d19cecd Merge branch 'master' into appservice-swagger
Conflicts:
	specification/application_service_api.rst
10 years ago
Daniel Wagner-Hall 74d42f0142 Allow rejecting invitations 10 years ago
Paul Evans 84a8663019 Merge pull request #115 from matrix-org/paul/event-redaction
Initial attempt at describing the event redaction algorithm
10 years ago
Paul "LeoNerd" Evans 9252b3e1a2 Fix typo s/he/the/ 10 years ago
Paul "LeoNerd" Evans bfa9937bdc Minor wording updates 10 years ago
Daniel Wagner-Hall a9a9067d7e Merge pull request #114 from matrix-org/daniel/3pidtosigned
Update 3pid invite section to reflect signed property
10 years ago
Erik Johnston 1d01f69c3c Merge remote-tracking branch 'origin/master' into erikj/search_actual 10 years ago
Erik Johnston 111ca99519 Clarify that this doesn't include events that occurred after you left the room. 10 years ago
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
10 years ago
Kegan Dougal f3088a0674 Merge branch 'master' into spec-182-asapi-user-creation 10 years ago
Kegan Dougal 26f27d95fb Merge branch 'master' into registration-swagger
Conflicts:
	specification/client_server_api.rst
10 years ago
Kegan Dougal ae90d15b3c Add m.room.avatar 10 years ago
Daniel Wagner-Hall c70067dd1e Simplify language 10 years ago
Daniel Wagner-Hall 22fdb8f911 Merge branch 'master' into daniel/as 10 years ago
Paul "LeoNerd" Evans 29720cd152 Initial attempt at describing the event redaction algorithm 10 years ago
Daniel Wagner-Hall 6161a920b6 Update 3pid invite section to reflect signed property 10 years ago
Kegan Dougal 62d53b4f33 Review comments round III 10 years ago
Kegan Dougal 85a6a5a530 Merge branch 'master' into proofing 10 years ago
Kegan Dougal 4bb042daeb Review comments round II 10 years ago
Kegan Dougal e0fe3c42c8 Review comments 10 years ago
Kegan Dougal 6770d6b2d6 Review comments 10 years ago
Daniel Wagner-Hall 20b11281ea Remove lies about OAuth which doesn't exist 10 years ago
Erik Johnston eb59b8e9d1 Mention count 10 years ago
Erik Johnston a6cb2e4339 Mention rank 10 years ago
Kegan Dougal eca98af896 Swaggerify /register endpoint
Need to move registration/login/auth sections around once #94 lands.
10 years ago
Erik Johnston 24e36adbe3 Mention e2e encryption 10 years ago
Erik Johnston 770cfbc5de Be explicit about the events the search is performed over 10 years ago
Erik Johnston 906c59385f s/had/has/ 10 years ago
Kegan Dougal 55cc5c5bb5 Swaggerify application services 10 years ago
Kegan Dougal 3d087df538 Kill number prefixes for good 10 years ago
Kegan Dougal 6b72ddfb8c Spelling and typos 10 years ago
Kegan Dougal 08ccacae17 Merge branch 'master' into proofing
Conflicts:
	specification/0-intro.rst
10 years ago
Erik Johnston c47a94658a Mention supported keys 10 years ago
Kegsay 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
10 years ago
Kegsay 604e268add Merge pull request #105 from matrix-org/spec-177-events-max-len
Add in size limits as per SPEC-222
10 years ago
Kegan Dougal 5de63b4f45 Merge branch 'master' into proofing
Conflicts:
	specification/0-intro.rst
10 years ago
Erik Johnston af347baa68 Better phrasing 10 years ago
Erik Johnston 96a4996c76 Mention search categories 10 years ago
Kegsay 3a2c8cd4b3 Merge pull request #91 from matrix-org/module-history-vis
History visibility module
10 years ago