Kegsay
8c092e3d11
Merge pull request #74 from matrix-org/module-presence
...
Presence module
2015-10-02 16:24:53 +01:00
Kegan Dougal
417c5b53c4
Remove duplicate sentences from merge conflicts
2015-10-02 16:24:33 +01:00
Daniel Wagner-Hall
b29fdebec2
Give example of verification dance
2015-10-02 09:14:31 -05:00
Kegan Dougal
458383585f
Stub sections
2015-10-02 15:03:55 +01:00
Kegsay
ead79614ff
Merge pull request #78 from matrix-org/module-typing2
...
Typing module
2015-10-02 14:36:30 +01:00
Daniel Wagner-Hall
9d8dc7971d
Review comments
2015-10-02 08:33:12 -05:00
Kegsay
68df99409a
Merge pull request #83 from matrix-org/module-content-repo
...
Content Repo Module
2015-10-02 11:27:41 +01:00
Erik Johnston
ccdd376f30
Merge pull request #63 from matrix-org/erikj/room_create_preset
...
Update the room creation API spec to include new keys: 'preset' and 'initial_state'
2015-10-02 11:13:06 +01:00
Kegan Dougal
09ac367847
Merge branch 'master' into module-content-repo
...
Conflicts:
templating/matrix_templates/units.py
2015-10-02 10:46:46 +01:00
Kegan Dougal
4dabcd112e
Remove redundant info now we have the http api template. Minor tweaks to display of schema with no names but a type
2015-10-02 10:44:50 +01:00
Erik Johnston
912a8ca760
Be more explicit about keys that are clobbered
2015-10-02 10:30:45 +01:00
Erik Johnston
dbc72c43ac
s/private_chat_shared_power/trusted_private_chat/
2015-10-02 10:28:29 +01:00
Daniel Wagner-Hall
af7d2ca9fc
Update 3pid invite spec
...
This takes into account:
1) That finding the existing servers of a room is hard
2) Federation
2015-10-01 22:19:11 -05:00
Kegan Dougal
87b6dd845e
Flesh out content repo; modify templating to support headers
...
Edit content-repo.yaml to include examples and headers.
Restructure content module to conform to the module template.
Adjust the HTTP API template to give 1 more char to the response
param to fit "Content-Disposition" correctly.
Edit the templating system to support displaying enums for
swagger APIs (before it was just JSON schema). Also add support
for introspecting headers from swagger. Finally, replace - with
_ when forming the {{ template_var }} else things whine.
2015-10-01 17:55:16 +01:00
Kegsay
8aad238cda
Merge pull request #80 from matrix-org/module-receipts
...
Receipts module
2015-10-01 17:33:38 +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
1520f3647f
Merge branch 'master' into module-typing2
...
Conflicts:
specification/modules/typing_notifications.rst
2015-10-01 15:47:46 +01:00
Kegan Dougal
cc6f256b24
Merge branch 'master' into module-presence
...
Conflicts:
specification/modules/presence.rst
2015-10-01 15:46:52 +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
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
Kegan Dougal
097dc50180
Minor tweaks
2015-09-30 15:51:20 +01:00
Kegan Dougal
a82f2ad4ac
Flesh out typing module
2015-09-30 15:51:12 +01:00
Kegan Dougal
2b7e02c080
Add sections for typing. Add swagger, JSON schema and example m.typing event
2015-09-30 15:51:04 +01:00
Kegan Dougal
52f6496cf0
Merge branch 'master' into module-presence
2015-09-30 10:56:17 +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
069e4e39f4
Move presence specific sections from intro to presence module
2015-09-30 10:22:51 +01:00
Erik Johnston
73b4090f52
Add private_chat_shared_power
2015-09-30 10:22:12 +01:00
Kegan Dougal
0a04672d76
Start converting the presence module. Add Rationale admonition.
2015-09-29 17:57:44 +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
Erik Johnston
83b9497664
Add context and example
2015-09-29 16:21:10 +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
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
Erik Johnston
4776e0c04c
Add creation_content key
2015-09-28 14:49:55 +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