Commit graph

208 commits

Author SHA1 Message Date
Kegsay
bfec7752cb Merge pull request #9 from matrix-org/v2-presence
Presence modifications from MatrixPresence notes.
2015-05-18 14:02:09 +01:00
Matthew Hodgson
58c28598af lots of fixes based on kegan's review of https://github.com/matrix-org/matrix-doc/pull/13 2015-03-19 14:21:08 +01:00
Matthew Hodgson
e60ffd6909 unix line-endings please... 2015-03-19 14:08:48 +01:00
Matthew Hodgson
598e9b3113 big reshuffle:
* try to make 00_basis slightly more accessible and less terse
 * move CS API before Events, as it's meaningless to dive into specific events if you haven't been introduced to how the CS API works
 * Try to improve the beginning of the CS API by merging back in some of kegan's original v1 content (which has subsequently been deleted somewhere along the line?)
 * document m.presence event consistently
 * move typing from drafts to spec
 * move push stuff from drafts to spec
...and lots of other stuff

move push & typing from drafts into main spec.
2015-03-16 00:14:03 -04:00
David Baker
80a7daf0aa Add length to profile tag spec. 2015-03-13 14:33:22 +00:00
David Baker
c38c33929a Put diagram in literal block 2015-03-13 11:43:30 +00:00
David Baker
fa1820ef3b Add ascii art diagram explaining architecture. 2015-03-13 11:32:03 +00:00
David Baker
712da51c8c Spec additions to the push API for the web client 2015-03-11 16:25:44 +00:00
David Baker
bea6c84e46 Includign a filename extension is probably incorrect. 2015-03-11 16:21:31 +00:00
David Baker
bfde21fa9e Specify that suppress notices should be an override rule. 2015-03-06 10:11:30 +00:00
David Baker
fe5372621e More indenting for a code block 2015-03-04 17:12:05 +00:00
David Baker
04b8c661d0 add .m.rule.suppress_notices 2015-03-04 15:31:49 +00:00
David Baker
b6dd67129e Specify that we never alert for event we sent ourself. 2015-03-02 14:35:44 +00:00
David Baker
63593de4b8 Rename room-with-two-members rule because when/if we have actual one-to-one rooms, this will reflect reality better. 2015-03-02 13:27:31 +00:00
David Baker
686c6fd03a Blank lines before preformatted blocks 2015-02-26 18:56:20 +00:00
David Baker
98ecd3c97d SYN-267 Specify a set of standard server default rules and specify no notifications if no rules match. 2015-02-26 18:49:34 +00:00
David Baker
75036ee053 Remove the 'default' attribute, make all rules have rule IDs & make server default rules IDs start with '.'. 2015-02-25 16:18:29 +00:00
David Baker
a39ad63a0b SYN-270 Spec enable/disable API for push rules. 2015-02-25 15:02:26 +00:00
Kegan Dougal
42857df26f Syntax fixes 2015-02-19 14:28:18 +00:00
Kegsay
94352a6d68 Merge pull request #10 from matrix-org/push
Push HTTP API
2015-02-19 11:51:00 +00:00
Kegsay
b8e5dc9e37 Merge pull request #7 from matrix-org/as-http-api
HTTP API for Application Services
2015-02-19 11:49:12 +00:00
Kegsay
8aae3e5842 Add TODO section 2015-02-19 11:48:45 +00:00
Kegsay
5ef9d52702 Merge pull request #5 from matrix-org/application-services
Application Service General API doc
2015-02-19 11:45:17 +00:00
Kegsay
3ce1e55954 Move TODO comments into the doc in prep for merging 2015-02-19 11:44:10 +00:00
David Baker
f0cc0e082c Add room_id in push poke to spec. 2015-02-19 10:13:21 +00:00
Matthew Hodgson
f3a498d0bb document the concept of a standard external_url field for gatewayed events 2015-02-16 22:09:10 +00:00
Kegsay
bcba42651a Add support for exclusive namespaces
As per https://github.com/matrix-org/matrix-doc/pull/5#issuecomment-73071259
2015-02-16 13:10:25 +00:00
David Baker
7a0f7b4b43 Add that rules with no conditions always match. 2015-02-13 13:40:44 +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
Matthew Hodgson
246531813b typo 2015-02-12 20:23:43 +00:00
Kegan Dougal
2b4641d1f0 Merge branch 'master' into v2-presence 2015-02-09 09:23:53 +00:00
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