Commit graph

2362 commits

Author SHA1 Message Date
Richard van der Hoff e9c1b87a1d Remove git log reference
We keep the changelog up to date anyway, so there's not much point in trying to
get people to use `git log`
2017-11-15 16:34:18 +00:00
Richard van der Hoff f526dff51d Fix changelog 2017-11-15 16:32:53 +00:00
Richard van der Hoff 0ce58fdb28 Prepare for next spec dev cycle 2017-11-15 16:23:14 +00:00
Richard van der Hoff e3ed76373a Prep changelog for 0.3.0 2017-11-15 15:52:30 +00:00
Richard van der Hoff 9b0bdb799e
Merge pull request #1054 from vberger/patch-2
Specify namespaces for tags
2017-11-15 07:07:45 +00:00
Richard van der Hoff 2128924933
Merge pull request #1072 from maxidor/max/ss/version
Document federation version endpoint
2017-11-15 07:05:52 +00:00
Richard van der Hoff 4b7e4deaae
Merge pull request #1017 from QMatrixClient/master
Add operationId key to every call
2017-11-15 06:59:56 +00:00
Maxime Dor 1045bc721d Document federation version endpoint 2017-11-15 04:16:30 +01:00
Kitsune Ral 828086a86c Supply operationId for freshly added IS and AS operations 2017-11-15 07:53:36 +09:00
Kitsune Ral a68b7e1bbd Supply operationId with freshly added operations
Signed-off-by: Alexey Rusakov <ktirf@users.sf.net>
2017-11-15 07:37:02 +09:00
Kitsune Ral b53083732b Merge remote-tracking branch 'remotes/origin/master' 2017-11-15 07:32:44 +09:00
Kitsune Ral 868af0a7a1 Provide doc-comments with makeHandler(); cleanup 2017-11-15 07:28:25 +09:00
Richard van der Hoff 427e0bb83b make jenkins and travis use a common script 2017-11-14 19:19:58 +00:00
Richard van der Hoff b0a17e957d
Merge pull request #1069 from matrix-org/dbkr/is_bulk_lookup
Spec IS bulk_lookup endpoint
2017-11-14 17:25:25 +00:00
David Baker 5147a3b975 Fix broken links & grammar 2017-11-14 17:14:56 +00:00
David Baker 45af878e11 Merge remote-tracking branch 'origin/master' into dbkr/is_bulk_lookup 2017-11-14 17:11:39 +00:00
David Baker d728e67751
Merge pull request #1068 from matrix-org/dbkr/threepid_add_msisdn
Document threepids
2017-11-14 17:05:39 +00:00
David Baker 14df31458b Attempt to clarify example a little 2017-11-14 15:39:25 +00:00
David Baker 9c5972ffe3 More formatting / grammar 2017-11-14 15:31:02 +00:00
Maxime Dor 836e6c81d1 Fix spelling 2017-11-14 15:15:49 +00:00
David Baker e12c0b54ff Formatting & grammar 2017-11-14 15:12:30 +00:00
David Baker 4526ff2ea6 Double backticks in rst :/ 2017-11-14 15:11:30 +00:00
David Baker 1e4cba6b55 Don't linkify email addresses in examples 2017-11-14 15:10:11 +00:00
David Baker 3487f5d75a Spell out what we mean by a 3pid
(and consequently rejig all the fixed-width formatting)
2017-11-14 15:08:56 +00:00
David Baker ff85ec055e Move 3pid types down 2017-11-14 15:07:22 +00:00
David Baker 8d557ec9dc Actually this isn't necessary in this section 2017-11-14 15:05:58 +00:00
David Baker e80675c9e9 Link in markdown, not swagger 2017-11-14 15:03:51 +00:00
David Baker 493b936209 Make these links more specific too 2017-11-14 15:01:58 +00:00
David Baker b789f61522 Make link more specific 2017-11-14 14:58:30 +00:00
Maxime Dor cdfff67878 Create spec for IS bulk lookup 2017-11-14 14:55:16 +00:00
Travis Ralston 0f5a4efce6 Spec URL previews (#1064)
* Spec URL previews
* Require authentication on /upload and /preview_url
2017-11-14 14:52:51 +00:00
David Baker 6edb90a08e Document threepids
Adds the /msisdn' 3pid type and generally fleshes out what a 3pid
is and how they work.

This merges most of the work from Max Dor in https://github.com/matrix-org/matrix-doc/pull/1039
with some tweaks and additions.
2017-11-14 14:36:38 +00:00
Richard van der Hoff 202a265d85 Config for travis-ci 2017-11-14 13:12:38 +00:00
Richard van der Hoff 0cbf533625 Use petstore for continuserv swagger docs
Matrix.org's swagger browser is behind https, which means it can't read the
swagger from a continuserv on http. Use the petstore instead.
2017-11-14 13:02:43 +00:00
Richard van der Hoff 85340a9e00
Merge pull request #1063 from turt2live/travis/whoami
Spec /account/whoami
2017-11-14 09:54:49 +00:00
Kitsune Ral 33463e3907 Factor out parser.validate callback 2017-11-14 15:16:42 +09:00
Travis Ralston 2468c38482 Add required property to whoami
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 18:47:38 -07:00
Travis Ralston 41db12713d Update whoami endpoint
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 14:22:20 -07:00
Travis Ralston 9cf2b59f4e Make it less obvious where this was copy/pasted from
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-12 23:56:28 -07:00
Travis Ralston 2b3c84503c Add /account/whoami to changelog
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-12 23:54:47 -07:00
Travis Ralston b1801ea6db Spec /account/whoami
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-12 23:49:40 -07:00
Kitsune Ral 77a9daccec Validation that operationId is present
Signed-off-by: Alexey Rusakov <ktirf@users.sf.net>
2017-11-13 12:11:11 +09:00
Kitsune Ral 66268260c7 Merge remote-tracking branch 'remotes/origin/master' 2017-11-13 07:46:29 +09:00
Kitsune Ral 1d4410b638 operationid -> operationId
Signed-off-by: Alexey Rusakov <ktirf@users.sf.net>
2017-11-13 07:46:03 +09:00
Richard van der Hoff 88fb2e9abd
Merge pull request #1045 from maxidor/max/cs/unknow_filter_status
Add status for unknown user's filter ID
2017-11-09 18:29:12 +00:00
Richard van der Hoff 5697466a35
Merge pull request #1060 from maxidor/max/cs/sync-missing_event_id
Add missing optional key for sync format
2017-11-09 18:18:08 +00:00
Maxime Dor 099a7e90ae Change return code following feedback 2017-11-09 15:32:32 +01:00
Maxime Dor dcaaf84395 Be clear that event_id is not applicable everywhere 2017-11-09 15:28:44 +01:00
Maxime Dor efa9b5a8f1 Add missing required key for sync format 2017-11-09 02:10:23 +01:00
Richard van der Hoff 3630e69c2e s/bug/spec-bug 2017-11-08 09:06:50 +00:00