Commit graph

226 commits

Author SHA1 Message Date
Richard van der Hoff
3939ccf20c Remove e2e drafts from master
This is now being tracked in the main spec, on the drafts/e2e branch.
2015-12-07 14:45:46 +00:00
Daniel Wagner-Hall
873b0dcecf Replace version numbers with release numbers 2015-12-04 11:09:35 +00:00
Daniel Wagner-Hall
4baba85fe5 Draftify e2e in anticipation of a spec release 2015-12-03 11:52:11 +00:00
Daniel Wagner-Hall
2f3a00fe34 Consistently spell homeserver as homeserver 2015-12-02 19:23:33 +00:00
Mark Haines
4e42aab245 Fix up the multi-hash ratchet thing 2015-11-25 15:13:13 +00:00
Richard van der Hoff
181d3f976d Initial proposal for websockets support. 2015-11-20 15:29:54 +00:00
Mark Haines
03a0377c76 Plans for end-to-end in matrix 2015-11-16 20:07:56 +00:00
Kegsay
c8f6ed1107 More formatting.. 2015-11-10 11:31:31 +00:00
Kegsay
51fe4a90b6 More formatting fixes 2015-11-10 11:28:27 +00:00
Kegsay
c1866ebebc Fix table formatting 2015-11-10 11:26:06 +00:00
Daniel Wagner-Hall
436a35e9f6 Document macaroon type=login 2015-11-09 16:04:31 +00:00
Daniel Wagner-Hall
0c1eb50ef4 Merge pull request #26 from matrix-org/macaroons
Spec macaroons and token refresh
2015-09-25 13:18:27 +01:00
Daniel Wagner-Hall
f5d436bd80 Remove extraneous ) 2015-09-25 13:18:09 +01:00
Daniel Wagner-Hall
6c1491b3ba Respond to some review comments 2015-09-25 13:17:11 +01:00
Kegan Dougal
f2c952ec58 Reshuffle spec into sections roughly right as per PR #52 2015-09-21 14:13:18 +01:00
Daniel Wagner-Hall
3b44fb92f9 Clarify == case 2015-09-14 17:13:54 +01:00
Daniel Wagner-Hall
0341c30824 Minor typo and formatting fixes 2015-09-14 10:39:22 +01:00
Daniel Wagner-Hall
902c7d3ea6 Add draft macaroon caveat specification 2015-08-19 15:00:22 +01:00
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