Commit graph

1778 commits

Author SHA1 Message Date
Oddvar Lovaas
fee90f135b Update instructions 2016-08-11 17:07:12 +01:00
Oddvar Lovaas
cffd4c34ea Change to sorting by date (mostly) 2016-08-11 17:05:50 +01:00
Matthew Hodgson
9cb626982a s/user/username/ typo 2016-08-10 18:09:44 -05:00
Matthew Hodgson
1551e34ea5 Merge pull request #369 from sim6/fix_faq_federation_api_link
Fix FAQ Federation API link
2016-08-09 17:21:56 -05:00
Matthew Hodgson
946374a737 Merge pull request #368 from sim6/format_faq_links
Format FAQ links
2016-08-09 17:21:36 -05:00
Simó Albert i Beltran
a90074ec78 Fix FAQ Federation API link
Signed-off-by: Simó Albert i Beltran <sim6@probeta.net>
2016-08-09 23:26:00 +02:00
Simó Albert i Beltran
82897a52a1 Format FAQ links
Signed-off-by: Simó Albert i Beltran <sim6@probeta.net>
2016-08-09 23:21:09 +02:00
Richard van der Hoff
e910a39594 Merge pull request #367 from matrix-org/rav/document_cas_login
document CAS login and m.login.token login
2016-08-09 16:48:08 +01:00
Richard van der Hoff
07fa64d73d Update changelog 2016-08-09 16:46:49 +01:00
Richard van der Hoff
0248afe6ac login with invalid token gives a 403 2016-08-09 16:28:29 +01:00
Richard van der Hoff
1f1dfdd91c More clarifications 2016-08-09 15:51:12 +01:00
Richard van der Hoff
ec81b4c9fe More PR feedback
Add a couple of TODO sections
2016-08-09 12:16:20 +01:00
Richard van der Hoff
4b0e546eeb PR feedback
Fix some typos, and clarify several aspects of server behaviour.
2016-08-09 12:02:38 +01:00
Richard van der Hoff
41368dc5a7 document CAS login
Following the spirit of "document how it is, not how we wish it was", document
the CAS login bits.
2016-08-08 17:33:48 +01:00
Mark Haines
20eab7714f Merge pull request #366 from matrix-org/markjh/filename
Document the optional parameter for specifying a filename
2016-08-03 14:13:21 +01:00
Oddvar Lovaas
f3d6f6a387 Remove spare () 2016-08-02 18:12:23 +01:00
Oddvar Lovaas
04b71fb571 Add NaChat and Twitter bridgew1 2016-08-02 18:09:50 +01:00
Mark Haines
ba64d9fe5a Remove thing from jenkins.sh 2016-08-02 14:18:55 +01:00
Mark Haines
f55bf46c7c Print the git revision in jenkins.sh 2016-08-02 14:09:36 +01:00
Mark Haines
d0785d80cc Poke jenkins 2016-08-02 14:05:25 +01:00
Mark Haines
d2fe2f1ff6 Fix jenkins 2016-08-02 13:59:46 +01:00
Mark Haines
618f94699b Document the optional parameter for specifying a filename to download an attachment as 2016-08-02 13:49:54 +01:00
David Baker
4f206e3223 Merge pull request #365 from matrix-org/rav/pushrules_spec
Clean up the pushrules API doc
2016-07-27 16:18:31 +01:00
Richard van der Hoff
8328e485ea Clean up the pushrules API doc
* make it clearer which fields go in which parts of the rule
* the example given appeared to be for a content rule, so use a content rule
  consistently through the examples.
2016-07-27 13:54:35 +01:00
Richard van der Hoff
9a2af4fbc1 Changelog: Add /upload tweak 2016-07-25 09:14:26 +01:00
Richard van der Hoff
7ac2f51e4a /upload: fix example for filename
The example shouldn't be encoded, else it will be double-encoded by swagger.
2016-07-25 09:07:42 +01:00
Richard van der Hoff
60875770fc Merge pull request #364 from Ralith/upload-filename
Document filename query parameter for uploads
2016-07-25 08:22:35 +01:00
Benjamin Saunders
3e2dea4c52 Document filename query parameter for uploads
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
2016-07-24 23:27:56 -07:00
Oddvar Lovaas
81630300fe Add wq!libqmatrixclient 2016-07-20 15:13:04 +01:00
Richard van der Hoff
93cc75299c Merge pull request #363 from matrix-org/rav/tokenrefresh_expires_access_token
/tokenrefresh should expire the access token
2016-07-19 10:09:47 +01:00
Richard van der Hoff
ec20f15407 /tokenrefresh should expire the access token
It's possible for clients to call /tokenrefresh before the access_token has
expired, potentially leading to a proliferation of valid access_tokens.
2016-07-19 09:17:14 +01:00
Richard van der Hoff
66bfd0462b Merge pull request #362 from matrix-org/rav/create_room_behaviour
Spell out the state algorithm for createRoom
2016-07-18 14:57:47 +01:00
Richard van der Hoff
2370a4c970 Spell out the state algorithm for createRoom
Fixes https://matrix.org/jira/browse/SPEC-429.

Synapse currently follows the specified ordering, but does *not* give the
specified error when the state is invalid (instead it creates the room anyway
but gives a 403 M_FORBIDDEN). Still, I don't think that should be a real
problem for any real clients, and nothing would break if we changed this in
synapse, so it might as well go in the spec anyway.
2016-07-18 13:01:45 +01:00
Matthew Hodgson
c0490f2db2 cosmetics 2016-07-14 18:25:34 +01:00
Richard van der Hoff
a8127ece52 Merge branch 'release/client-server/r0.2.0' 2016-07-14 16:25:53 +01:00
Richard van der Hoff
a64f9bbb63 C-S spec: Fix 'unstable' in link to /context API 2016-07-14 16:23:59 +01:00
Richard van der Hoff
b5f9e896ba C-S spec: Fix 'unstable' in link to /context API 2016-07-14 16:20:59 +01:00
Richard van der Hoff
76ec390c73 changelog: Add "unreleased" placeholder 2016-07-14 15:44:17 +01:00
Richard van der Hoff
a2ab6854ff CS spec: Add r0.2.0 to historical version list 2016-07-14 15:40:49 +01:00
Richard van der Hoff
005a71ab00 Bump version in changelog 2016-07-14 15:19:47 +01:00
Richard van der Hoff
c71c9e4f6b Merge branch 'master' into release/client-server/r0.2.0 2016-07-14 15:17:40 +01:00
Richard van der Hoff
ae489260a1 Merge pull request #359 from matrix-org/rav/mxid_grammar
Define MXID grammar
2016-07-14 15:16:15 +01:00
Richard van der Hoff
72449294bc Moar TODO 2016-07-14 15:04:16 +01:00
Richard van der Hoff
0ac04f5649 Merge branch 'master' into release/client-server/r0.2.0 2016-07-14 14:40:46 +01:00
Richard van der Hoff
76fd85f054 Merge branch 'master' into release/client-server/r0.2.0 2016-07-14 14:38:59 +01:00
Richard van der Hoff
a2f1c6a7a6 Add a TODO about defining non-latin login creds 2016-07-14 14:38:04 +01:00
Erik Johnston
e5f5d0c55e Merge pull request #361 from matrix-org/erikj/account_deactivate
Spec /account/deactivate API
2016-07-14 11:15:32 +01:00
Richard van der Hoff
0e26238386 Update README
Structure and Contributing were both a bit out of date.
2016-07-14 10:52:30 +01:00
Erik Johnston
06d379ed5e Add to changelog 2016-07-14 10:18:48 +01:00
Richard van der Hoff
b5d68b8ff1 Link to doc style doc
(and update it to cover extra section characters)
2016-07-14 10:13:10 +01:00