Commit graph

1842 commits

Author SHA1 Message Date
David Baker
ae1c576648 Merge remote-tracking branch 'origin/master' into erikj/create_room_is_direct 2016-10-03 15:17:55 +01:00
Richard van der Hoff
1f45724bfd Merge pull request #394 from matrix-org/rav/required_response_fields
Mark required fields in response objects as such
2016-10-03 14:14:36 +01:00
Richard van der Hoff
2dde1a8d28 Merge pull request #390 from matrix-org/erikj/filter_url
Add contains_url filter option and /messages filter
2016-10-03 14:13:55 +01:00
Richard van der Hoff
23d5073820 Mark required fields in response objects as such
Actually this means we can remove a bunch of code which special-cased this.
2016-10-03 14:03:23 +01:00
Richard van der Hoff
91e899338d Merge pull request #393 from matrix-org/rav/speculator_api
Serve the api docs from the speculator
2016-10-03 13:40:44 +01:00
Richard van der Hoff
1320a86cbe Serve the api docs from the speculator
There are a few parts to this:

* when we generate the spec for a particular git sha, also run the script which
  turns our yaml api descriptions into a swagger json file.

* tweak serveSpec to add another header when serving the generated json.

* add a link to the generated index which will (via js hackery) redirect to our
  hosted swagger UI at http://matrix.org/docs/api/client-server, with a "url"
  query-param pointing at the generated json.

Also, factor makeTempDir out of gitClone, so that we can give clearer log lines.
2016-10-03 12:36:46 +01:00
Matthew Hodgson
08001b7768 remove spurious blank clients from try-it-now page 2016-10-01 18:49:41 +01:00
Erik Johnston
069aa86a10 Update wording and add example to filter param 2016-09-30 15:06:11 +01:00
Erik Johnston
a10fe9fa43 Update changelog 2016-09-30 15:04:42 +01:00
Erik Johnston
7919e8e159 Update wording. 2016-09-30 15:02:27 +01:00
Erik Johnston
b121feebce Comment what the is_direct flag actually does 2016-09-30 11:24:51 +01:00
Erik Johnston
51248dd0c8 Update changelog 2016-09-29 17:22:43 +01:00
Erik Johnston
d01d1a07a6 Add changelog 2016-09-29 17:19:54 +01:00
Erik Johnston
37f6769a3c Spec filter param on /messagse 2016-09-29 13:40:20 +01:00
Erik Johnston
085131b617 Add contains_url filter option 2016-09-29 13:37:08 +01:00
Erik Johnston
3a5cbd14c3 Add /createRoom is_direct flag 2016-09-29 11:25:12 +01:00
Richard van der Hoff
459f4b953d swagger-http-server: add a --port argument 2016-09-27 12:18:01 +01:00
Oddvar Lovaas
6d7f543612 Merge pull request #385 from freelock/master
Drupal API module and Concourse Notification Resource additions to Try Matrix page
2016-09-26 17:12:59 +01:00
John Locke
c010173381 Add Drupal Matrix_api module to Try Matrix page 2016-09-23 21:48:33 -07:00
John Locke
c08aa51b18 Add concourse notification resource to Try Matrix page 2016-09-23 21:48:10 -07:00
Oddvar Lovaas
1ea836bb1b Remove howtos from build script 2016-09-21 16:22:49 +01:00
Oddvar Lovaas
d7d7f53884 Remove duplicates, add redirect 2016-09-21 16:03:34 +01:00
Oddvar Lovaas
7b559686d5 Merge pull request #384 from matrix-org/rav/misc_docs
Miscellaneous doc fixes
2016-09-21 10:42:36 +01:00
Richard van der Hoff
11961247f7 Miscellaneous doc fixes
Fix some egregious lies and oldthings in the getting-involved and faq pages.
2016-09-21 10:03:57 +01:00
Richard van der Hoff
09c4701524 Merge pull request #383 from matthiasbeyer/fix-link-markup
Fix link markup
2016-09-21 09:09:44 +01:00
Matthias Beyer
cefb63dd80 Fix link markup 2016-09-21 09:29:05 +02:00
Oddvar Lovaas
edcab06e2d Fix spacing, re-add ios redirect page 2016-09-19 15:39:26 +01:00
Oddvar Lovaas
6e915b9119 Rename Vector -> Riot 2016-09-19 15:34:37 +01:00
Oddvar Lovaas
9e58f4236a Re-write F-droid paragraph 2016-09-14 17:24:21 +01:00
Oddvar Lovaas
bdc869d8e7 Merge pull request #382 from exul/faq/client-and-server-questions
Split Implementation into Clients and Server and add questions
2016-09-14 16:45:57 +01:00
Andreas Brönnimann
a89669aa1f Add new questions about servers and clients
Also fix some outdate questions

Signed-off-by: Andreas Brönnimann <foss@exul.org>
2016-09-08 21:45:47 +02:00
Andreas Brönnimann
f4c093a58d Split Implementations into Servers and Clients
Signed-off-by: Andreas Brönnimann <foss@exul.org>
2016-09-08 21:29:17 +02:00
Richard van der Hoff
65d1888e08 Merge pull request #381 from matrix-org/dbkr/clarify_highlight_and_sound
Clarify `highlight` and `sound` tweaks.
2016-09-08 13:06:46 +01:00
David Baker
9a1db01d92 Clarify highlight and sound tweaks. 2016-09-08 11:59:49 +01:00
Richard van der Hoff
026a507380 Merge pull request #379 from Ralith/nix-shell
Add a nix-shell environment suitable for building
2016-08-31 10:38:03 +01:00
Richard van der Hoff
4833710bc5 Merge pull request #378 from Ralith/redaction
Fix inconsistencies regarding redacted_because
2016-08-31 10:37:09 +01:00
Benjamin Saunders
33d80408e0 Add a nix-shell environment suitable for building
This enables easy execution of scripts/*.py by Nix users.

Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
2016-08-30 21:26:35 -07:00
Benjamin Saunders
cade909e25 Fix inconsistencies regarding redacted_because
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
2016-08-30 21:18:55 -07:00
Richard van der Hoff
69b1827b10 Merge pull request #380 from matrix-org/rav/doc_accountdata_key
Add top-level account_data to /sync response
2016-08-30 17:58:08 +01:00
Richard van der Hoff
7478e7f3cf Add top-level account_data to /sync response 2016-08-30 17:43:20 +01:00
Richard van der Hoff
0474010d47 Merge pull request #376 from Ralith/user_id-sender
Fix some obsolete uses of user_id key in events
2016-08-30 16:02:05 +01:00
Benjamin Saunders
77b668a5dc Fix some obsolete uses of user_id key in events
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
2016-08-26 23:06:41 -07:00
Richard van der Hoff
2fa7aac3be Merge pull request #377 from Ralith/typos
Fix typo
2016-08-26 10:28:52 +01:00
Benjamin Saunders
80bfbbdd33 Fix typo
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
2016-08-26 02:23:16 -07:00
Oddvar Lovaas
3beffc66cb Move purple-matrix to client list 2016-08-23 13:44:07 +01:00
Oddvar Lovaas
df8805155d Merge pull request #375 from davidar/patch-1
Update 2015-06-26-tensor.md
2016-08-23 12:38:31 +02:00
David A Roberts
7935caf388 Update 2015-06-26-tensor.md 2016-08-23 20:14:37 +10:00
Richard van der Hoff
6c78a6aab0 Merge pull request #374 from matrix-org/matthew/fix_state_sending_desc
fix the descriptions of the /room/.../state APIs to not be the wrong way round
2016-08-18 15:01:44 +01:00
Matthew Hodgson
978d9ea6dd fix the descriptions of the /room/.../state APIs to not be the wrong way round 2016-08-18 14:04:21 +01:00
Oddvar Lovaas
16a4903656 Moved to correct date 2016-08-17 16:51:14 +01:00