b7e98a263a
Merge pull request #89 from matrix-org/daniel/speculator
...
speculator: Specify merge target
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
213cb25290
Wrap correctly
9 years ago
f2a6950cc3
Minor tweaks; allow objects without props/parents if a title is set
...
This allows us to do things like {Tweaks} where Tweaks is defined somewhere
else.
9 years ago
dc3c02aff5
Review comments
9 years ago
21a40b317d
Merge branch 'master' into daniel/threepidinvites-2
9 years ago
9c95ee5c1f
Modify wording and formatting
9 years ago
befa23624e
It's dangerous to go alone, take this.
9 years ago
65504db7bb
Display nested keys on arrays of objects. Make it valid swagger.
9 years ago
31ae4b3859
Swaggerify push notification API
...
Edit units.py to support nested JSON request keys
9 years ago
a9618a981b
Swaggerify the /enabled endpoint
9 years ago
56ce432399
Get profile tag keys displaying correctly.
9 years ago
f6da9d7760
Give valid swagger. Split out rule/ruleset to separate definitions.
9 years ago
2ab9372b16
new nav bar. todo: get animation working.
9 years ago
db25276856
Start adding in push definitions
...
This is going to be painful to represent due to how the push API allows
mixed types (strings or objects) and mixed top-level keys ("content" rule kind
allowing "pattern" as a top-level key). We may wish to re-visit the design
of this API for v2.
9 years ago
9540069acd
Use valid JSON
9 years ago
c5edc60c4c
Add push YAML for pushers endpoint.
...
Also display "required" text on required JSON body request params. Also
increase the size of the request param column to support longer param names
present in the pushers API.
9 years ago
d3ed517ebf
Finish laying out rough sections
9 years ago
a7400508c6
Define module titles from the template
9 years ago
319ba8f404
Combine push files into one
...
We can fork it out again if it makes sense, but certainly 2/3 of the files
were very small and it just adds more complexity when refactoring.
9 years ago
91ca36509b
Flesh out IM module
9 years ago
c47fb12aed
Merge branch 'master' into module-im
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
656bee78c4
Merge branch 'master' into module-im
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
Daniel Wagner-Hall