Commit Graph

760 Commits (dffe9b3e4c2f0c12cae91346ad02b261183b5408)
 

Author SHA1 Message Date
Matthew Hodgson dffe9b3e4c more questions 9 years ago
Matthew Hodgson 91fb2ae723 edit oddvar's FAQ entries and add a bunch more questions 9 years ago
Matthew Hodgson 85c035bd82 Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc 9 years ago
Matthew Hodgson ed9028f0fc merge again... 9 years ago
Matthew Hodgson 2621c22956 fix barefaced lie regarding the passivity of ASes 9 years ago
Matthew Hodgson f62fa6b980 Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc 9 years ago
Oddvar Lovaas 10f3e7e84f Merge branch 'master' of github.com:matrix-org/matrix-doc 9 years ago
Oddvar Lovaas 6e6585cebc FAQ draft 9 years ago
Matthew Hodgson f759dc30d2 major refresh of the existing FAQ content (WIP) 9 years ago
Matthew Hodgson 7ae2573113 fix barefaced lie regarding the passivity of ASes 9 years ago
Mark Haines 5a5a6565ff Merge pull request #68 from matrix-org/markjh/v2_sync_api
Swagger documentation for the v2 sync API
9 years ago
Matthew Hodgson 39faccb00d CS API is not just v1 surely 9 years ago
Mark Haines 0ce533d153 Split the room_map into separate sections based on whether they are
"joined/invited/archived".

Rename the room_map to rooms and remove the grouping indirection. When we
want groups then we can add them under a separate key, either at the
top-level or as part of the events themselves.
9 years ago
Mark Haines 0e5b00feaa Fix event type in v2 sync example 9 years ago
Mark Haines bbb5fa9398 Fix the state_key in the example v2 response, include the "sender" key in the list of keys included with invite_state events 9 years ago
Mark Haines a7b808c5cd Add a invite_state key for holding the state that is bundled with an
invite. This is kept separate from the actual state for the room as
it may be derived from an incomplete, unverified copy of the state
that was bundled with an invite event received over federation.
9 years ago
Mark Haines ed0f6d3ff3 Typo 9 years ago
Mark Haines 97cdd8106c s|client/api/v2_alpha|/client/v2_alpha| 9 years ago
Erik Johnston 99ca68ba6d Merge pull request #71 from matrix-org/erikj/disable_federation
Add flag to disable federation.
9 years ago
Erik Johnston 3b4c3522e6 Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/disable_federation 9 years ago
Kegan Dougal db660d705a Merge branch 'release-0.2.0' 9 years ago
Kegan Dougal 28fd1aa205 Go into a bit more detail about feature profiles 9 years ago
Kegan Dougal 2fbf851a75 Merge branch 'master' into release-0.2.0 9 years ago
Kegsay 8c092e3d11 Merge pull request #74 from matrix-org/module-presence
Presence module
9 years ago
Kegan Dougal 417c5b53c4 Remove duplicate sentences from merge conflicts 9 years ago
Mark Haines 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
Mark Haines 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
Kegan Dougal c8ddf1af09 Add changelog 9 years ago
Kegsay ead79614ff Merge pull request #78 from matrix-org/module-typing2
Typing module
9 years ago
Daniel Wagner-Hall 7df3d9090a Merge pull request #81 from matrix-org/daniel/speculatormerge
speculator: Merge after fetching, so that /spec/head works
9 years ago
Daniel Wagner-Hall 0e8f1b5475 Quote args 9 years ago
Mark Haines a73cc50aa9 s|client/api/v2_alpha|client/v2_alpha| 9 years ago
Kegsay 68df99409a Merge pull request #83 from matrix-org/module-content-repo
Content Repo Module
9 years ago
Kegsay f38473efd9 Merge pull request #82 from matrix-org/daniel/reportport
speculator: Report listening port
9 years ago
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'
9 years ago
Kegan Dougal 09ac367847 Merge branch 'master' into module-content-repo
Conflicts:
	templating/matrix_templates/units.py
9 years ago
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 9 years ago
Erik Johnston 912a8ca760 Be more explicit about keys that are clobbered 9 years ago
Erik Johnston dbc72c43ac s/private_chat_shared_power/trusted_private_chat/ 9 years ago
Kegan Dougal 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
Daniel Wagner-Hall a69e03f577 speculator: Report listening port 9 years ago
Daniel Wagner-Hall 30232f20aa speculator: Merge after fetching, so that /spec/head works 9 years ago
Kegan Dougal 8c4d7f5051 Do not try to parse non-json request examples as json 9 years ago
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.
9 years ago
Kegsay 8aad238cda Merge pull request #80 from matrix-org/module-receipts
Receipts module
9 years ago
Kegsay 8b958f4ead Merge pull request #79 from matrix-org/module-voip
VoIP module
9 years ago
Kegan Dougal 560cd7a58f This isn't javascript. s/,/%/ 9 years ago
Kegan Dougal da2be7eae4 Merge branch 'master' into module-voip
Conflicts:
	specification/modules/voip_events.rst
9 years ago
Kegan Dougal 1520f3647f Merge branch 'master' into module-typing2
Conflicts:
	specification/modules/typing_notifications.rst
9 years ago
Kegan Dougal cc6f256b24 Merge branch 'master' into module-presence
Conflicts:
	specification/modules/presence.rst
9 years ago