Commit graph

680 commits

Author SHA1 Message Date
Daniel Wagner-Hall
30232f20aa speculator: Merge after fetching, so that /spec/head works 2015-10-01 19:13:09 -05:00
Kegsay
8aad238cda Merge pull request #80 from matrix-org/module-receipts
Receipts module
2015-10-01 17:33:38 +01:00
Kegsay
8b958f4ead Merge pull request #79 from matrix-org/module-voip
VoIP module
2015-10-01 17:33:27 +01:00
Kegan Dougal
560cd7a58f This isn't javascript. s/,/%/ 2015-10-01 15:54:45 +01:00
Kegan Dougal
da2be7eae4 Merge branch 'master' into module-voip
Conflicts:
	specification/modules/voip_events.rst
2015-10-01 15:48:42 +01:00
Kegan Dougal
6000887201 Merge branch 'master' into module-receipts
Conflicts:
	specification/modules/receipts.rst
2015-10-01 15:44:53 +01:00
Kegan Dougal
c972dad8b3 Flesh out receipts module. Add receipts swagger
Add templating support for v2 apis.
2015-10-01 15:41:54 +01:00
Kegsay
4a7a682c0f Merge pull request #65 from matrix-org/spec-feature-profiles
Spec feature profiles
2015-10-01 12:16:30 +01:00
Kegan Dougal
365a9076b9 Add nested dict template support; Add x-pattern
For cases where event schema specify `patternProperties` it would be nice
to give that pattern a "human-readable" form rather than a raw regex. This
is now supported by specifying `x-pattern` in the value part of the specified
pattern e.g. `patternProperties:{ "^.*":{ x-pattern: "$THING", ... } }`

Templating had limited record type descriptions limited to value primitives
e.g. `{string: integer}`. It now supports inspecting the values recursively
if the value is `object`.

Updated `m.receipt` to take both these points into account to make it read
better. Tweak receipt module text.
2015-10-01 12:11:26 +01:00
Kegan Dougal
3b73b07bab Clarifications that room invites are m.call.invites not actual invites 2015-10-01 11:11:08 +01:00
Kegan Dougal
e82661413e Add /turnServer endpoint 2015-10-01 11:04:42 +01:00
Erik Johnston
abe5d08ac6 Merge pull request #64 from matrix-org/erikj/invite_state
Bundle some state into invites
2015-10-01 09:25:06 +01:00
Kegan Dougal
d092b22848 Rename to 'Managing history visibility' 2015-10-01 09:23:08 +01:00
Kegan Dougal
6c3e70d272 Start fleshing out voip module 2015-09-30 17:32:44 +01:00
Kegan Dougal
91b6347f74 Explain what 'embedded' clients are 2015-09-30 16:48:47 +01:00
Kegan Dougal
be9402b66f Move feature profiles section to modules as a sub-section 2015-09-30 16:43:09 +01:00
Kegan Dougal
0320e8cef3 Table tweaks from PR 2015-09-30 16:41:47 +01:00
Erik Johnston
9964dd1401 Make explicit the state event only includes some keys 2015-09-30 16:11:34 +01:00
Kegsay
f74cb4d54c Merge pull request #76 from matrix-org/speculator-speedup
Modify how speculator uses git repos
2015-09-30 15:53:25 +01:00
Kegsay
e5fecbb87f Merge pull request #75 from matrix-org/continuserv-speedup
Speed up continuserv
2015-09-30 15:42:29 +01:00
Kegan Dougal
b6f0b67da6 Speed up continuserv
Ignore .git directory as that shouldn't affect spec generation. Also, when
we receive writes from the OS, wait a bit before re-generating the spec to
clump together multiple writes rather than re-generating one after another
and waiting for no more writes before serving the request.
2015-09-30 15:21:32 +01:00
Kegan Dougal
ede43fbe9f Modify how speculator uses git repos
Modified so it has a "master" repo and local A/B repos which pull from the
"master". This saves an extra git clone operation per HTTP request.
2015-09-30 14:31:26 +01:00
Kegsay
4aad6976fd Merge pull request #73 from matrix-org/paragraphs
Fix paragraph CSS and adjust where paragraphs are in the RST
2015-09-30 10:54:23 +01:00
Kegan Dougal
a49d5f67f1 Delete rather than comment out the offending CSS 2015-09-30 10:54:06 +01:00
Kegan Dougal
4e1e82f995 Fix paragraph CSS and adjust where paragraphs are in the RST
The CSS for `nature.css` was such that it was preventing `p` tags from
having sufficient vertical whitespace. This meant that you couldn't insert
any kind of spacing between lengthy sections (they just appeared as new lines).

This PR fixes this so you can actually have some whitespace between paragraphs.
As a result of this change, some parts of the spec appeared to have too much
whitespace. These were often sections which shouldn't have begun a new
paragraph anyway (e.g. a single sentence being an entire paragraph, `TODO`
blocks resulting in new paragraphs). This PR fixes the most offending areas
where we shouldn't have been inserting new paragraphs.
2015-09-30 10:43:02 +01:00
Kegan Dougal
cdf9f011e9 Add room history visibility as a module. 2015-09-29 16:33:34 +01:00
Kegan Dougal
82c27884ba Make E2E optional 2015-09-29 16:29:16 +01:00
Kegsay
c96f02c2b0 Merge pull request #69 from matrix-org/erikj/login_token
m.login.token
2015-09-29 13:26:29 +01:00
Kegsay
beafc74f81 Merge pull request #70 from matrix-org/spec-module-format
Modules format
2015-09-29 13:22:16 +01:00
Daniel Wagner-Hall
eec021ee8c Merge pull request #72 from matrix-org/daniel/generateathead
Support viewing the spec at head
2015-09-29 13:01:17 +01:00
Daniel Wagner-Hall
083a76096f Support viewing the spec at head 2015-09-29 12:41:07 +01:00
Erik Johnston
50e1b4c3a7 Fix up rst 2015-09-29 09:17:33 +01:00
Erik Johnston
6e6bc8a5a9 Mandate macaroon 2015-09-28 14:51:44 +01:00
Erik Johnston
ce53a17180 Add txn_id rationale 2015-09-28 14:51:10 +01:00
Kegan Dougal
5abea1f2bc Minor tweaks 2015-09-28 14:07:34 +01:00
Kegan Dougal
70518ae655 Clarify template suffixes 2015-09-28 14:03:54 +01:00
Kegan Dougal
643468e914 Mention swagger. Clarify how event type template vars are formed. 2015-09-28 14:01:54 +01:00
Kegan Dougal
c2fc1a2fb1 Add basic module template.
This has the core sections for events/server/client/security.
2015-09-28 13:41:31 +01:00
Kegan Dougal
db8f3c0d59 Desktop clients should have a GUI 2015-09-28 13:11:34 +01:00
Erik Johnston
97154cc6b2 s/nonce/txn_id/ 2015-09-28 13:09:54 +01:00
Erik Johnston
4c9f524cab Neaten things up 2015-09-28 09:32:03 +01:00
Erik Johnston
317c2f20d3 Draft login token spec 2015-09-28 09:29:35 +01:00
Erik Johnston
8c22b715ca Add title 2015-09-28 09:29:07 +01:00
Kegan Dougal
11c586c560 Merge branch 'master' into spec-feature-profiles
Conflicts:
	templating/build.py
2015-09-25 16:34:47 +01:00
Kegsay
e5f805c0d5 Merge pull request #67 from matrix-org/unused-template-vars
Detect unused {{ vars }} and whine loudly.
2015-09-25 16:33:35 +01:00
Kegsay
4d407c2731 Merge pull request #66 from matrix-org/speculator-htmldiff
speculator: Add HTML diffing
2015-09-25 16:33:23 +01:00
Kegan Dougal
9c882ea5e4 Detect unused {{ vars }} and whine loudly. 2015-09-25 16:24:31 +01:00
Daniel Wagner-Hall
2434dfaf1c Merge branch 'master' into speculator-htmldiff 2015-09-25 16:13:23 +01:00
Kegan Dougal
510553ee00 Remove smurf suffixes. Add anchor for feature profiles. 2015-09-25 15:29:33 +01:00
Kegan Dougal
9fac152d32 Explain what the clients are and the column reference 2015-09-25 15:26:58 +01:00