Commit Graph

955 Commits (30d46a19d51e8ed64ef9743ee7f6f451c034a723)
 

Author SHA1 Message Date
Kegan Dougal 30d46a19d5 Review comments 10 years ago
Kegan Dougal 3b7585cbda Make nested request objects display correctly (search API)
This now displays search_categories.room_events.filter and co correctly.
Also make arrays of enums display correctly.
10 years ago
Kegsay ade0ad5ed1 Merge pull request #129 from matrix-org/erikj/search_actual
Add filter param to search API
10 years ago
Erik Johnston 36634df355 Add filter param 10 years ago
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
Mark Haines 637718108e Add newline before list 10 years ago
Richard van der Hoff 1401a1e2da Merge pull request #128 from matrix-org/rav/clean_up_login
Remove duplicated registration/login APIs
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 d2bbc461e4 mark stateKey as required in room/{id}/state
Swagger insists that path params be mandatory.
10 years ago
Richard van der Hoff d18d406c41 Add the room send and state APIs to the spec 10 years ago
Mark Haines 0639f885df Merge pull request #125 from matrix-org/markjh/blockquote_css
Move css into a css subdirectory.
10 years ago
Mark Haines df443c10ac Move css into a css subdirectory.
Add css to put a bar next to blockquotes.
10 years ago
David Baker 01064369a4 Add some clarification on the difference between 'scale' and 'crop' resize methods 10 years ago
Mark Haines cc14620932 Add a newline before the list 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
Daniel Wagner-Hall 879c6fc24b Merge pull request #122 from matrix-org/trustleo
Trust Leo
10 years ago
Daniel Wagner-Hall 82d4ea199f Trust Leo 10 years ago
Kegsay 73142fe76e Merge pull request #108 from matrix-org/appservice-swagger
Swaggerify application services
10 years ago
Kegan Dougal f95d19cecd Merge branch 'master' into appservice-swagger
Conflicts:
	specification/application_service_api.rst
10 years ago
Kegan Dougal 4c3e1b9ed3 Find replace fail 10 years ago
Kegan Dougal bd539c72b4 More review comments 10 years ago
Kegsay 074c7d480c Merge pull request #113 from matrix-org/invite-room-state
Add invite_room_state to spec
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
Kegsay c032eafd4e Merge pull request #109 from matrix-org/registration-swagger
Swaggerify /register endpoint
10 years ago
Kegan Dougal 26f27d95fb Merge branch 'master' into registration-swagger
Conflicts:
	specification/client_server_api.rst
10 years ago
Kegan Dougal f450fc1db6 Typo 10 years ago
Kegan Dougal bbd3f8072c Review comments 10 years ago
Daniel Wagner-Hall b7355b0fa5 Merge pull request #117 from matrix-org/daniel/jenkins
Give useful error if z-schema is missing
10 years ago
Kegsay a2aa3cc00e Merge pull request #116 from matrix-org/room-avatar
Add m.room.avatar
10 years ago
Daniel Wagner-Hall b2aae762fc Give useful error if z-schema is missing 10 years ago
Daniel Wagner-Hall f51e031066 Fix JSON 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 cf3d75103c Merge pull request #111 from matrix-org/daniel/as
Remove lies about OAuth which doesn't exist
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