b46f0e30b8
Checkout SHA of origin/master rather than merging
9 years ago
a0cf485919
speculator: Specify merge target
9 years ago
d6bdde4cee
Merge pull request #88 from matrix-org/markjh/initial_sync_archived_flag
...
Add flag to initial sync to say we want rooms that the user has left
9 years ago
51ab51ae26
Only documents in matrix-doc!
9 years ago
d42c3195e6
Use 'true' rather than '1' for archived flag
9 years ago
241096dc81
Add a flag to initial sync to indicate we want rooms that the user has left
9 years ago
2ab9372b16
new nav bar. todo: get animation working.
9 years ago
a320d58948
Merge pull request #84 from matrix-org/markjh/v2_sync_templating
...
Add the fields required by the templating system to v2 sync
9 years ago
7805ca87df
If build.py throws, actually print stdout. Also run jenkins.sh in verbose mode.
9 years ago
dffe9b3e4c
more questions
9 years ago
91fb2ae723
edit oddvar's FAQ entries and add a bunch more questions
9 years ago
85c035bd82
Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc
9 years ago
ed9028f0fc
merge again...
9 years ago
2621c22956
fix barefaced lie regarding the passivity of ASes
9 years ago
f62fa6b980
Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc
9 years ago
10f3e7e84f
Merge branch 'master' of github.com:matrix-org/matrix-doc
9 years ago
6e6585cebc
FAQ draft
9 years ago
f759dc30d2
major refresh of the existing FAQ content (WIP)
9 years ago
7ae2573113
fix barefaced lie regarding the passivity of ASes
9 years ago
034241eb20
Missing symlink for the v2 swagger APIs
9 years ago
509d178d58
Fix the receipts API to be valid swagger
9 years ago
4f606cf3a7
Add the fields required by the templating system to v2 sync
9 years ago
5a5a6565ff
Merge pull request #68 from matrix-org/markjh/v2_sync_api
...
Swagger documentation for the v2 sync API
9 years ago
39faccb00d
CS API is not just v1 surely
9 years ago
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
0e5b00feaa
Fix event type in v2 sync example
9 years ago
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
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
ed0f6d3ff3
Typo
9 years ago
97cdd8106c
s|client/api/v2_alpha|/client/v2_alpha|
9 years ago
99ca68ba6d
Merge pull request #71 from matrix-org/erikj/disable_federation
...
Add flag to disable federation.
9 years ago
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
ead79614ff
Merge pull request #78 from matrix-org/module-typing2
...
Typing module
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
Daniel Wagner-Hall