3b4c3522e6
Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/disable_federation
9 years ago
db660d705a
Merge branch 'release-0.2.0'
9 years ago
28fd1aa205
Go into a bit more detail about feature profiles
9 years ago
2fbf851a75
Merge branch 'master' into release-0.2.0
9 years ago
8c092e3d11
Merge pull request #74 from matrix-org/module-presence
...
Presence module
9 years ago
417c5b53c4
Remove duplicate sentences from merge conflicts
9 years ago
047419f2ad
Remove the room_id since it is redundent. Remove text about invite event handling till we've thought about it some more.
9 years ago
bde003fe86
Split the rooms out into a separate top level key.
...
Divide the rooms into separate groups in preparation for adding tag
support.
Further subdivide the rooms into "joined/invited/archived" based the
membership of the user in the room because that membership affects what
events the user can view from the room. E.g only users that are joined
to a room may see the ephemeral events for the room.
9 years ago
c8ddf1af09
Add changelog
9 years ago
b29fdebec2
Give example of verification dance
9 years ago
458383585f
Stub sections
9 years ago
ead79614ff
Merge pull request #78 from matrix-org/module-typing2
...
Typing module
9 years ago
9d8dc7971d
Review comments
9 years ago
7df3d9090a
Merge pull request #81 from matrix-org/daniel/speculatormerge
...
speculator: Merge after fetching, so that /spec/head works
9 years ago
0e8f1b5475
Quote args
9 years ago
a73cc50aa9
s|client/api/v2_alpha|client/v2_alpha|
9 years ago
68df99409a
Merge pull request #83 from matrix-org/module-content-repo
...
Content Repo Module
9 years ago
f38473efd9
Merge pull request #82 from matrix-org/daniel/reportport
...
speculator: Report listening port
9 years ago
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'
9 years ago
09ac367847
Merge branch 'master' into module-content-repo
...
Conflicts:
templating/matrix_templates/units.py
9 years ago
4dabcd112e
Remove redundant info now we have the http api template. Minor tweaks to display of schema with no names but a type
9 years ago
912a8ca760
Be more explicit about keys that are clobbered
9 years ago
dbc72c43ac
s/private_chat_shared_power/trusted_private_chat/
9 years ago
3d9dbe42e6
Bump to swagger-parser 3.2.1 - remove x- keys on headers
...
Removed x- keys due to https://github.com/BigstickCarpet/swagger-parser/issues/23
9 years ago
9cda004848
Fix ref
9 years ago
fdccf35c47
Banish more tabs
9 years ago
e996933a29
Banish the tabs
9 years ago
af7d2ca9fc
Update 3pid invite spec
...
This takes into account:
1) That finding the existing servers of a room is hard
2) Federation
9 years ago
d2c56fb7a3
Merge branch 'master' into daniel/threepidinvites-2
9 years ago
a69e03f577
speculator: Report listening port
9 years ago
30232f20aa
speculator: Merge after fetching, so that /spec/head works
9 years ago
8c4d7f5051
Do not try to parse non-json request examples as json
9 years ago
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.
9 years ago
8aad238cda
Merge pull request #80 from matrix-org/module-receipts
...
Receipts module
9 years ago
8b958f4ead
Merge pull request #79 from matrix-org/module-voip
...
VoIP module
9 years ago
560cd7a58f
This isn't javascript. s/,/%/
9 years ago
da2be7eae4
Merge branch 'master' into module-voip
...
Conflicts:
specification/modules/voip_events.rst
9 years ago
1520f3647f
Merge branch 'master' into module-typing2
...
Conflicts:
specification/modules/typing_notifications.rst
9 years ago
cc6f256b24
Merge branch 'master' into module-presence
...
Conflicts:
specification/modules/presence.rst
9 years ago
6000887201
Merge branch 'master' into module-receipts
...
Conflicts:
specification/modules/receipts.rst
9 years ago
c972dad8b3
Flesh out receipts module. Add receipts swagger
...
Add templating support for v2 apis.
9 years ago
4a7a682c0f
Merge pull request #65 from matrix-org/spec-feature-profiles
...
Spec feature profiles
9 years ago
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.
9 years ago
3b73b07bab
Clarifications that room invites are m.call.invites not actual invites
9 years ago
e82661413e
Add /turnServer endpoint
9 years ago
abe5d08ac6
Merge pull request #64 from matrix-org/erikj/invite_state
...
Bundle some state into invites
9 years ago
d092b22848
Rename to 'Managing history visibility'
9 years ago
6c3e70d272
Start fleshing out voip module
9 years ago
91b6347f74
Explain what 'embedded' clients are
9 years ago
be9402b66f
Move feature profiles section to modules as a sub-section
9 years ago
Erik Johnston