Matthew Hodgson
7b310db783
Merge pull request #13 from matrix-org/ua925_reshuffle
...
merge huge UA925 reshuffle into master; kegan's happy with the end result here.
2015-03-23 15:37:31 +00:00
Matthew Hodgson
c3f29ea720
Merge branch 'master' into ua925_reshuffle
2015-03-23 15:36:36 +00: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
d40f6c1d7c
lots of fixes based on kegan's review of https://github.com/matrix-org/matrix-doc/pull/13
2015-03-19 14:20:58 +01:00
Matthew Hodgson
e60ffd6909
unix line-endings please...
2015-03-19 14:08:48 +01:00
David Baker
62cf5e0cd4
Add max length to pushkey
2015-03-18 13:55:23 +00: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
342146eafd
Add IRC bridge AS example.
2015-02-20 15:06:43 +00:00
Kegan Dougal
838af288c9
Test swagger commit
2015-02-20 14:29:51 +00:00
Kegsay
5cb656fba7
Minor swagger HTML tweaks
2015-02-20 11:32:53 +00:00
Kegan Dougal
a6fa4e53fb
Update gendoc.py
...
Copy howto to tmp/ so the $GIT_VERSION can be dropped in.
2015-02-20 11:25:05 +00:00
Kegan Dougal
505c804426
Update scripts to look in the right places. Update jsfiddles to be more obvious in the HOWTO.
2015-02-20 10:49:36 +00:00
Kegan Dougal
31ec39db7f
Actually add the README
2015-02-20 10:43:54 +00:00
Kegan Dougal
c4056bec1b
Shuffle around structure of matrix-doc and add a README.
2015-02-20 10:43:20 +00:00
Matthew Hodgson
d552a043f8
remove LI section entirely until we decide how best to discourage it, otherwise it looks like we're endorsing it
2015-02-19 20:23:11 +00:00
Kegan Dougal
006932c70f
Be clearer when specifying the version of the spec.
2015-02-19 17:25:15 +00:00
Kegsay
6af1627b51
Minor tweak for matrix.org example
2015-02-19 17:16:59 +00:00
Kegsay
4fd5b9ced8
Update doc style
...
We use RST everywhere, which dictates most of the style, so the styles mentioned previously were either obsolete or inaccurate. Updated the doc to be clearer on things which RST does not specify/care about.
2015-02-19 17:14:25 +00:00
Kegan Dougal
1388612c48
Add a README, spell matrix correctly.
2015-02-19 16:53:54 +00:00
Kegan Dougal
5a0e40b984
Mark CS API as v1 in the spec.
2015-02-19 16:36:53 +00:00
Kegan Dougal
4b0e858529
Add $GIT_VERSION to the spec which is replaced by the gendoc script.
2015-02-19 16:32:45 +00:00
Kegan Dougal
df448df813
Redo gendoc script.
2015-02-19 16:00:21 +00:00
Kegan Dougal
42857df26f
Syntax fixes
2015-02-19 14:28:18 +00:00
Kegsay
8e75c5ed67
Add in passive application services
2015-02-19 14:17:31 +00:00
Kegan Dougal
74b7769c08
Merge branch 'master' of github.com:matrix-org/matrix-doc
2015-02-19 13:42:12 +00:00
Kegan Dougal
f60c0ac96b
Fix indentation levels on specification.
2015-02-19 13:42:01 +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
