Commit graph

226 commits

Author SHA1 Message Date
Kegan Dougal
56f4467ced Fix syntax error 2015-02-09 09:19:45 +00:00
Kegan Dougal
7a59d401f6 Fix syntax errors 2015-02-09 09:17:55 +00:00
Kegan Dougal
2740e50a9f Merge branch 'master' into push 2015-02-09 09:14:39 +00:00
Kegan Dougal
74225013c5 Merge branch 'as-http-api' of github.com:matrix-org/matrix-doc into as-http-api 2015-02-09 09:13:52 +00:00
Kegan Dougal
fa055e14ad Merge branch 'master' into as-http-api 2015-02-09 09:13:31 +00:00
Kegan Dougal
65b3cf3740 Merge branch 'master' into application-services 2015-02-09 09:12:58 +00:00
Matthew Hodgson
2c8b875cf1 typoe 2015-02-08 02:33:53 +00:00
Matthew Hodgson
6c5d07a0d1 typoe 2015-02-08 02:32:06 +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
36395c2611 Add info on M_EXCLUSIVE 2015-02-06 11:01:20 +00:00
Kegsay
e7c522b606 Add information on exclusive namespaces 2015-02-05 16:06:47 +00:00
David Baker
7c0d1c86d8 How to tell server default rules from other rules. 2015-02-05 14:56:07 +00:00
David Baker
8360be247b Leave out what characters are allowed in a rule ID as we allow most thigs in matrix usernames currently. 2015-02-05 13:15:34 +00:00
David Baker
94af47ffd4 Server default riules will have a rule_id when you need it to work out what the rule does. 2015-02-05 13:03:10 +00:00
David Baker
e6c9e77d35 Change server default rules. 2015-02-05 10:49:48 +00:00
David Baker
8184855d5a add note about scope of rule_ids. 2015-02-04 16:30:57 +00:00
David Baker
dbbf9626b4 Fix various incorreect examples in the doc. 2015-02-04 11:34:32 +00:00
David Baker
f24e951b02 s/instance_handle/profile_tag/ 2015-02-03 16:21:09 +00:00
David Baker
91d12dc955 Replace set_sound with more generic set_tweaks. 2015-02-03 15:38:12 +00:00
David Baker
8920d58cc4 Strongly recommend standard URI scheme for notification pokes. 2015-02-03 14:35:01 +00:00
David Baker
067e4bb777 Add docs for http notification poke protocol. 2015-02-03 14:21:56 +00:00
David Baker
1a5678786f Doc deleting & getting rules. 2015-02-02 18:36:04 +00:00
David Baker
c40b97aaf5 Rule adding API with examples 2015-02-02 18:16:36 +00:00
David Baker
88178e376e Oops, before is *more* important. 2015-02-02 17:26:58 +00:00
David Baker
0c79798f70 More WIP API docs and remove spurious line. 2015-02-02 17:10:09 +00:00
David Baker
b7a6e8f7b5 Finish non-API doc parts of push rules. 2015-02-02 16:25:53 +00:00
David Baker
f68fa8d6f8 Push rules c/s spec. 2015-02-02 15:14:45 +00:00
David Baker
c27fb8a262 Add WIP docs for the client-server bit of push. 2015-02-02 13:49:18 +00:00
David Baker
0a07d68818 Add overview on push. 2015-01-28 18:20:28 +00:00
Kegan Dougal
0e2a3a892f Presence modifications from MatrixPresence notes.
- Idle is no longer a flag but a full state like online|offline.
- Clarify status examples.
- Add device ID to presence state API given it is per device.
- Add note on device specificity on event stream presence parameter.
- Add global appear-offline API.
2015-01-22 09:46:25 +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
90dfee1c27 Remove TODO note on regex 2015-01-20 17:49:09 +00:00
Kegsay
23d3e50812 Add use case justification for regex 2015-01-20 17:48:43 +00:00
Kegsay
7a2b6abee5 Flesh out ID conventions
Going down the API route.
2015-01-20 14:22:48 +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
Kegsay
ae0fb938ad Update IRC example to reflect new room ID 2015-01-19 10:45:51 +00:00
Kegsay
117b090192 Add registration API extension.
For AS provisioning of users with its namespace.
2015-01-19 10:33:08 +00:00
Kegsay
603361bfd6 Update user and room query APIs
Expect the AS to create these entities, rather than the HS.
2015-01-19 10:20:39 +00:00