Commit graph

132 commits

Author SHA1 Message Date
Kegsay
5ef9d52702 Merge pull request #5 from matrix-org/application-services
Application Service General API doc
2015-02-19 11:45:17 +00:00
Matthew Hodgson
b02f2aa364 never upscale images 2015-02-12 20:31:44 +00:00
Matthew Hodgson
7c65e4748e typo 2015-02-12 20:24:14 +00:00
Kegan Dougal
65b3cf3740 Merge branch 'master' into application-services 2015-02-09 09:12:58 +00:00
Kegan Dougal
6c21f499e8 Final syntax fixes 2015-02-06 13:08:12 +00:00
Kegan Dougal
047355b5c9 More syntax fixes 2015-02-06 13:05:28 +00:00
Kegan Dougal
3b696878f5 Fix a bunch of rst syntax errors. 2015-02-06 12:59:08 +00:00
Kegsay
e7c522b606 Add information on exclusive namespaces 2015-02-05 16:06:47 +00:00
Kegsay
bd48e4ab6d Move invite data to a note
Done in order to clarify that this API "should probably have something like this" rather than "will have this".
2015-01-21 13:09:16 +00:00
Kegsay
e309db547a Specifically reference join_rules
In reference to SPEC-63
2015-01-21 11:58:45 +00:00
Kegsay
03eaa21508 Add blurb on invites for initialSync 2015-01-21 11:56:55 +00:00
Kegsay
51a7681ece Merge pull request #4 from matrix-org/use-cases
Add Client-Server v2 General API Design
2015-01-21 10:30:27 +00:00
Kegsay
fcbdc39674 Add section on device IDs for reg/login
Final cleanup before merge
2015-01-21 10:28:01 +00:00
Kegsay
ccf8408e92 More tweaks from comments 2015-01-21 10:19:48 +00:00
Kegsay
31deddccdf Add presence API from notes 2015-01-21 09:53:47 +00:00
Kegsay
23d3e50812 Add use case justification for regex 2015-01-20 17:48:43 +00:00
Erik Johnston
5279541c28 Update erikj_federation.rst
Update state resolution rules to indicate what you should do if none of the merged events are allowed by the newly merged auth events.
2015-01-20 11:08:43 +00:00
Kegsay
3b35e95630 Tweaks based on feedback 2015-01-19 17:37:23 +00:00
Kegsay
61b8664286 Clarify profile propagation section more 2015-01-19 17:24:28 +00:00
Kegsay
a1964b466b Add profile propagation notes
After much IRL discussion
2015-01-19 17:17:33 +00:00
Kegsay
ef0091f3f2 Remove session section
This is no longer required.
2015-01-19 12:03:52 +00:00
Erik Johnston
38efa9c5c2 Reword auth resolution section 2015-01-16 16:09:07 +00:00
Erik Johnston
91aba39fe7 Reword note about auth chains 2015-01-16 15:17:09 +00:00
Erik Johnston
5f99858575 Mention possible types for auth events. 2015-01-16 15:12:47 +00:00
Erik Johnston
bb968e5bdd Clarify m.room.create auth 2015-01-16 15:12:34 +00:00
Erik Johnston
78a697c535 Briefly touch on how to handle incoming events 2015-01-16 10:24:43 +00:00
Erik Johnston
406742afaa A few notes on how we could do state resolution of auth events 2015-01-16 10:15:07 +00:00
Erik Johnston
4b76181f74 Rearrange sections 2015-01-16 10:15:07 +00:00
Matthew Hodgson
b19a799a0e notes on how to build pstn gateway ASes 2015-01-15 01:57:03 +00:00
Erik Johnston
b28f404240 Add ToC 2015-01-14 16:30:25 +00:00
Erik Johnston
7108316ea8 Mention the fields that the server should compute when creating events 2015-01-14 16:24:33 +00:00
Erik Johnston
232e2675dd Brief mention of state conflict resolution 2015-01-14 16:24:33 +00:00
Erik Johnston
f09e5a676f Mention state resolution algorithm 2015-01-14 16:24:33 +00:00
Erik Johnston
7d32717c9b A couple of more notes on auth resolution. 2015-01-14 16:24:33 +00:00
Kegsay
540b3a41ff RSTify; typos 2015-01-14 15:15:40 +00:00
Mark Haines
ee41165610 Remove cs-v2-http-api since it's in the client_server_v2_http_api branch now 2015-01-14 11:57:07 +00:00
Mark Haines
6324f8c1ca Fix the size of the reference id hash tuple 2015-01-14 11:49:46 +00:00
Erik Johnston
90ad08e866 Merge branch 'master' of github.com:matrix-org/matrix-doc 2015-01-14 11:39:39 +00:00
Erik Johnston
48f9670b87 More comments on auth chain resolution 2015-01-14 10:59:28 +00:00
Kegsay
4b23a16abb Few minor RST tweaks 2015-01-14 10:53:49 +00:00
Kegsay
8ca0c65fd3 RST Formatting for github 2015-01-14 10:44:47 +00:00
Kegsay
a1aaf78186 Typing API, Action ID, Event ordering changes
Apply most changes discussed in https://github.com/matrix-org/matrix-doc/pull/4#issuecomment-69751210
- Revert typing API to be like v1
- Revert Action IDs to be like Transaction IDs are for v1. Keep the echo down the event stream though.
- Add batching notes to some Action APIs and remove ordering by action ID.
Sessions still need to scrapped.
2015-01-14 09:28:41 +00:00
Matthew Hodgson
91ad3924fc initial http api proposal for initialsync, eventstream and history
+ our theoretical design workflow atm
2015-01-14 01:08:27 +00:00
Mark Haines
ae9aacd89d Add a JSON schema for matrix federation events 2015-01-13 19:03:11 +00:00
Matthew Hodgson
b557e71121 update AS API to merge in feedback from the pull request 2015-01-13 16:25:28 +00:00
Matthew Hodgson
e283d8e4ea WIP http api definition for cs-v2 2015-01-13 13:20:45 +00:00
Matthew Hodgson
1c69ba974f some comments on general_api 2015-01-13 13:20:25 +00:00
Kegan Dougal
d5099b2656 Add session API. Add server-generated events.
Moved 'Inviting' API from Final to ONGOING in light of issues brought up
from PR comments and irl discussions.
2015-01-13 09:51:53 +00:00
Kegan Dougal
d987afe3e2 80 characters 2015-01-13 09:17:13 +00:00
Erik Johnston
569d496430 Rearrange sections 2015-01-12 16:57:02 +00:00