Commit graph

3477 commits

Author SHA1 Message Date
Travis Ralston c65c6e2e70 Add changelog entries removed in the merge from master 2018-07-09 12:25:34 -06:00
Travis Ralston f418c20ff2 Merge remote-tracking branch 'matrix-org/master' into travis/towncrier 2018-07-09 12:25:15 -06:00
Travis Ralston 08f6912825 Ask Travis to install 3.5 explicitly 2018-07-09 12:13:58 -06:00
Travis Ralston 44db84f3d8
Merge pull request #1371 from turt2live/travis/all-the-auth
Getting presence requires authentication
2018-07-09 10:31:40 -06:00
Travis Ralston a4f8e0807a Print the python version being used in the CI build. 2018-07-09 08:41:20 -06:00
Travis Ralston f68c82bd6c Don't let the newsfragments wink out of existence 2018-07-06 17:32:57 -06:00
Travis Ralston 63b926a4aa Make Travis CI use python 3 2018-07-06 17:19:04 -06:00
Travis Ralston 34089e302c Add general documentation for maintainers 2018-07-06 17:06:08 -06:00
Travis Ralston c2f85788de Add documentation about how to add to the changelog 2018-07-06 16:54:14 -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 f54d5a4039 Convert build scripts to python 3 2018-07-06 15:21:07 -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 516000bdc3 Fix error reference in media repo 2018-07-06 08:53:04 -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 ab75fc4b20 Merge remote-tracking branch 'matrix-org/master' into travis/better-errors 2018-07-06 08:46:50 -06:00
Travis Ralston e1885e4cd3
Merge pull request #1362 from turt2live/travis/spec-reason
Explicitly declare that the kick/ban reason will be on the membership event
2018-07-06 07:06:50 -06:00
Travis Ralston e7a6ff1064
Merge branch 'master' into travis/spec-reason 2018-07-06 07:02:11 -06:00
Travis Ralston 1722734a51
Merge pull request #1364 from turt2live/travis/server-name-join
Document the server_name query parameter on /join/{roomIdOrAlias}
2018-07-06 07:00:24 -06:00
Will Hunt ff3c379339
Merge pull request #1189 from Half-Shot/hs/upload-limits
GET media/config 🎉
2018-07-06 11:37:35 +00:00
Will Hunt 77f4ac54aa
Wordy intro sentence for description 2018-07-06 10:36:17 +01:00
Will Hunt 2e6cc8045c
Better indent of description 2018-07-06 10:29:05 +01:00
Will Hunt d5ce87e956
Split summary up into description and summary 2018-07-06 10:27:03 +01:00
Stuart Mumford be5232914a
Maybe a swagger 2018-07-05 21:41:05 -06:00
Stuart Mumford b7c3a74022
artifacts 2018-07-05 21:31:57 -06:00
Stuart Mumford fe43b79e73
what's even the point 2018-07-05 21:29:12 -06:00
Stuart Mumford 86b0045195
virtualenvs are the worst 2018-07-05 21:25:15 -06:00
Stuart Mumford d1c8ec9e48
add circle config 2018-07-05 21:21:47 -06:00
Travis Ralston bbf63d116c Fix reference to error.yaml in forget room API 2018-07-05 16:55:11 -06:00
Travis Ralston 55c27d6212
Merge branch 'master' into travis/better-errors 2018-07-05 13:40:17 -06:00
Richard van der Hoff 3f8aa2eccd
Merge pull request #1369 from turt2live/travis/apis-unstable
Clearly say that the server/server API is unstable and subject to change
2018-07-05 20:38:35 +01:00
Richard van der Hoff f9a0a49e96 Add a bunch more people to the speculator trusted list 2018-07-05 20:27:40 +01:00
Travis Ralston 4485b2f025
Merge branch 'master' into travis/server-name-join 2018-07-05 11:23:13 -06:00
Travis Ralston 9abbbfb81e
Merge pull request #1378 from turt2live/travis/dont-forget-to-leave
Document that clients must leave before forgetting rooms
2018-07-05 11:03:15 -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 e81e0328c2 Fix single protocol metadata endpoint path, remove 500s 2018-07-05 17:50:34 +01:00
Travis Ralston 16860ddd22 De-quote 2018-07-05 10:46:53 -06:00
Travis Ralston 887a6fb18f
Merge pull request #1336 from remram44/patch-1
Consolidate backwards-compatible client changes
2018-07-05 10:35:16 -06:00
Andrew Morgan 4c38012122 I can spell 2018-07-05 12:58:42 +01:00
Andrew Morgan 8e22e9e85a Fix title underline length 2018-07-05 12:00:20 +01:00
Andrew Morgan e6218b56ab Switch properties to schema 2018-07-05 11:59:10 +01:00
Andrew Morgan a6dad76c01 Fix indentation 2018-07-05 11:56:30 +01:00
Andrew Morgan cc3724b54a fix indentation, error messages. add rest of PR 2018-07-05 11:55:25 +01:00
Will Hunt 92f3989f2b Dirty replace of DNS name -> hostname 2018-07-05 11:37:06 +01:00
Travis Ralston 0867ab2365 Add to changelog 2018-07-04 20:14:19 -06:00
Kitsune Ral dfdc5f9bef search.yaml: Rename some titles to avoid confusion between request and response schemas
Signed-off-by: Alexey Rusakov <Alexey.Rusakov@pm.me>
2018-07-04 20:11:08 -06:00
Travis Ralston 436b410698 Document the error code when someone tries to forget a room they are in 2018-07-04 20:02:30 -06:00
Travis Ralston e0cdfd8897
Merge branch 'master' into patch-1 2018-07-04 19:43:58 -06:00