Commit graph

170 commits

Author SHA1 Message Date
Travis Ralston
ee2ebe6792
Merge pull request #1568 from turt2live/travis/c2s/invite-room-state
Move `invite_room_state` to the correct place in the client-server API
2018-08-27 18:47:24 -06:00
Travis Ralston
87133d8505
Merge pull request #1574 from turt2live/travis/c2s/fix-directory-put
Clean up PUT /directory/room
2018-08-27 17:49:05 -06:00
Travis Ralston
4e885c3f77
Merge pull request #1550 from turt2live/travis/general/acls
Server ACLs
2018-08-27 17:48:43 -06:00
Travis Ralston
a0b17e6ed6
Merge pull request #1551 from turt2live/travis/c2s/push-rules
General improvements to the push rules module
2018-08-27 17:48:01 -06:00
Travis Ralston
ce0befd7d0 Changelog 2018-08-26 22:28:52 -06:00
Travis Ralston
5ceb132110 Changelog 2018-08-26 20:52:59 -06:00
Travis Ralston
9b19fc27de changelog 2018-08-24 11:09:55 -06:00
Travis Ralston
a95d7092eb Changelog 2018-08-22 15:27:48 -06:00
Travis Ralston
bce324818b Changelog 2018-08-22 15:26:27 -06:00
Travis Ralston
3869f68a5c Merge remote-tracking branch 'matrix-org/master' into travis/general/room-versions 2018-08-21 12:22:35 -06:00
Travis Ralston
e4f5c3d55e
Merge pull request #1518 from turt2live/travis/c2s/create-room-improvements
Add general clarity to the /createRoom endpoint
2018-08-21 12:04:56 -06:00
Will Hunt
4ab64e11af Add news frag 2018-08-20 18:20:20 +01:00
Travis Ralston
26746cf785
Merge pull request #1517 from turt2live/travis/c2s/auth-header
Dedicate a section on how to use access tokens
2018-08-20 10:08:18 -06:00
Richard van der Hoff
206f78cb48
Rename 1284.feature.rst to 1284.feature 2018-08-20 09:21:15 +01:00
Valentin Deniaud
98e2e8de71 changelog 2018-08-18 11:41:45 +02:00
Hubert Chathi
f5dc0eaed2
document msisdn-related endpoints in IS (#1507)
* add msisdn endpoints in Identity Server spec
* add in CS endpoints that use the IS msisdn endpoints
2018-08-17 12:00:13 -04:00
Travis Ralston
ef7570e62d Changelog 2018-08-15 17:29:06 -06:00
Travis Ralston
b159f21857 changelog 2018-08-15 16:34:23 -06:00
Travis Ralston
ae02e8834d changelog 2018-08-15 16:25:04 -06:00
Travis Ralston
7751750396 changelog 2018-08-15 16:23:33 -06:00
Hubert Chathi
292d334509
document new login identifier object (#1390) 2018-08-10 16:19:17 -04:00
Travis Ralston
9e6f2b2fd0 Add newsfragment 2018-07-18 08:29:13 -06:00
Travis Ralston
baf19cc741 Add newsfragment for 1379 2018-07-13 10:05:21 -06:00
Travis Ralston
1e500fd005 Add newsfragment for third party network endpoints
Specifying multiple entries for the same PR would be covered under: https://github.com/hawkowl/towncrier/pull/119
2018-07-12 13:18:27 -06:00
Travis Ralston
67665fa3a6 Merge remote-tracking branch 'matrix-org/master' into travis/towncrier 2018-07-12 12:17:25 -06:00
Travis Ralston
91c59e7384
Merge pull request #1353 from matrix-org/anoa/as_thirdparty_lookup
Thirdparty Entity Lookup API
2018-07-12 11:19:12 -06:00
Travis Ralston
0faae54fc1
Merge pull request #1400 from turt2live/travis/search-improvements
Clarify some of the properties on the search result
2018-07-12 10:36:18 -06:00
Travis Ralston
e164392d93 Merge remote-tracking branch 'matrix-org/master' into travis/towncrier 2018-07-11 08:36:01 -06:00
Travis Ralston
b6f9e13d46 Add newsfragment 2018-07-10 15:09:53 -06:00
Travis Ralston
c999b7c2e2 Add newsfragment 2018-07-10 13:00:37 -06:00
Travis Ralston
e9f7d2096e Add changelog entry for CORS 2018-07-10 08:39:34 -06:00
Travis Ralston
c79010f0d6
Merge pull request #1365 from turt2live/travis/cors
Document the CORS/preflight headers
2018-07-10 08:35:37 -06:00
Travis Ralston
c65c6e2e70 Add changelog entries removed in the merge from master 2018-07-09 12:25:34 -06:00
Travis Ralston
f68c82bd6c Don't let the newsfragments wink out of existence 2018-07-06 17:32:57 -06:00
Travis Ralston
34089e302c Add general documentation for maintainers 2018-07-06 17:06:08 -06:00
Travis Ralston
ee9abc5fd7 Convert unstable changelog to towncrier 2018-07-06 16:41:54 -06:00
Travis Ralston
9277e4c52d Add initial towncrier support 2018-07-06 16:32:27 -06:00
Travis Ralston
d7a979da63 Merge remote-tracking branch 'matrix-org/master' into travis/all-the-auth 2018-07-06 11:33:24 -06:00
Travis Ralston
dd9414472b Merge remote-tracking branch 'matrix-org/master' into travis/cors 2018-07-06 08:51:32 -06:00
Travis Ralston
e7a6ff1064
Merge branch 'master' into travis/spec-reason 2018-07-06 07:02:11 -06:00
Travis Ralston
4485b2f025
Merge branch 'master' into travis/server-name-join 2018-07-05 11:23:13 -06:00
Travis Ralston
c1c1f28c79
Merge branch 'master' into travis/dont-forget-to-leave 2018-07-05 10:55:48 -06:00
Travis Ralston
3935861445
Merge pull request #1380 from turt2live/travis/define-roomevent
Define RoomEvent on /rooms/{roomId}/messages
2018-07-05 10:54:54 -06:00
Travis Ralston
f98f603048
Merge pull request #1381 from turt2live/travis/general-clarifications
Rename some titles to avoid confusion between request and response schemas
2018-07-05 10:54:22 -06:00
Andrew Morgan
cc3724b54a fix indentation, error messages. add rest of PR 2018-07-05 11:55:25 +01:00
Travis Ralston
0867ab2365 Add to changelog 2018-07-04 20:14:19 -06:00
Travis Ralston
e0cdfd8897
Merge branch 'master' into patch-1 2018-07-04 19:43:58 -06:00
Travis Ralston
95e8f1bdde Add to changelog 2018-07-04 19:21:03 -06:00
Travis Ralston
a19bbc8089 Add to changelog 2018-07-04 15:32:53 -06:00
Travis Ralston
67e74bd8c5 Merge remote-tracking branch 'matrix-org/master' into travis/cors 2018-07-04 14:20:53 -06:00