11595 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Hodgson	f0cede5556	missing import	2018-08-12 19:14:31 -04:00
Matthew Hodgson	54ac18e832	use parse_string	2018-08-12 19:14:31 -04:00
Matthew Hodgson	66a4ca1d28	404 nicely if you try to interact with a missing current version	2018-08-12 19:14:31 -04:00
Matthew Hodgson	72788cf9c1	support DELETE /version with no args	2018-08-12 19:14:31 -04:00
Matthew Hodgson	edc427a351	flake8	2018-08-12 19:14:31 -04:00
Matthew Hodgson	fe87890b18	implement remaining tests and make them work	2018-08-12 19:14:31 -04:00
Matthew Hodgson	f6a3067868	linting	2018-08-12 19:14:31 -04:00
Matthew Hodgson	15d513f16f	fix idiocies and so make tests pass	2018-08-12 19:14:31 -04:00
Matthew Hodgson	174be586e5	first cut at a UT	2018-08-12 19:14:31 -04:00
Matthew Hodgson	b5eee511c7	don't needlessly return user_id	2018-08-12 19:14:31 -04:00
Matthew Hodgson	93d174bcc4	improve docstring	2018-08-12 19:14:31 -04:00
Matthew Hodgson	5e42c45c96	switch get_current_version_info back to being get_version_info	2018-08-12 19:14:31 -04:00
Matthew Hodgson	982edca380	fix flakes	2018-08-12 19:14:31 -04:00
Matthew Hodgson	234611f347	fix typos	2018-08-12 19:14:31 -04:00
Matthew Hodgson	14b3da63a3	add a tonne of docstring; make upload_room_keys properly assert version	2018-08-12 19:14:31 -04:00
Matthew Hodgson	9f0791b7bd	add a tonne of docstring; make upload_room_keys properly assert version	2018-08-12 19:14:31 -04:00
Matthew Hodgson	9f500cb39e	more docstring for the e2e_room_keys rest	2018-08-12 19:14:31 -04:00
Matthew Hodgson	8d14598e90	add storage docstring; remove unused set_e2e_room_keys	2018-08-12 19:14:31 -04:00
Matthew Hodgson	ca0b052307	fix factoring out of _should_replace_room_key	2018-08-12 19:14:31 -04:00
Matthew Hodgson	cac0253799	rename room_key_version table correctly, and fix opt args	2018-08-12 19:14:31 -04:00
Matthew Hodgson	0abb205b47	blindly incorporate PR review - needs testing & fixing	2018-08-12 19:14:31 -04:00
Matthew Hodgson	69e51c7ba4	make /room_keys/version work	2018-08-12 19:14:31 -04:00
Matthew Hodgson	8ae64b270f	implement /room_keys/version too (untested)	2018-08-12 19:14:31 -04:00
Matthew Hodgson	cf1e2000f6	document the API	2018-08-12 19:13:09 -04:00
Matthew Hodgson	6b8c07abc2	make it work and fix pep8	2018-08-12 19:13:09 -04:00
Matthew Hodgson	0bc4627a73	interim WIP checkin; doesn't build yet	2018-08-12 18:23:10 -04:00
Matthew Hodgson	53ace904b2	total WIP skeleton for /room_keys API	2018-08-12 18:23:10 -04:00
Amber Brown	67dbe4c899	0.33.2 changelog	2018-08-09 19:21:07 +10:00
Amber Brown	dafe90a6be	0.33.2	2018-08-09 19:20:41 +10:00
Amber Brown	3d6f9fba19	fix the changelog & template	2018-08-09 19:19:30 +10:00
Amber Brown	23cd86554e	fix changelog	2018-08-07 21:20:42 +10:00
Amber Brown	848431be1d	fix for rc1	2018-08-07 21:13:22 +10:00
Amber Brown	cf8ef11f35	changelog	2018-08-07 21:11:24 +10:00
Amber Brown	3b9662339b	version	2018-08-07 21:10:52 +10:00
Will Hunt	16d9701892	Return M_NOT_FOUND when a profile could not be found. (#3596)	2018-08-03 19:08:05 +01:00
Michael Kaye	df7f9871c1	Merge pull request #3644 from matrix-org/michaelkaye/refactor_docker_locations_v2 ... Refactor Dockerfile location	2018-08-03 13:44:35 +01:00
Michael Kaye	42960aa047	Update README.md ... Link to contrib/docker	2018-08-03 09:16:01 +01:00
Michael Kaye	c3f596180f	Update README.md ... Link to docker/README.md	2018-08-03 09:15:19 +01:00
Michael Kaye	637b11b9ed	Update README.rst ... Link to contrib/docker	2018-08-03 09:13:54 +01:00
Michael Kaye	feacd13932	Update README.rst ... wrap at 80ish	2018-08-03 09:10:41 +01:00
Amber Brown	8a86d7ea96	Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragment ... Mention the word "newsfragment" in CONTRIBUTING.rst	2018-08-03 04:40:18 +10:00
Michael Kaye	70baa61e95	newsfragment	2018-08-02 18:58:43 +01:00
Michael Kaye	4c4a123bd0	Mention the word "newsfragment" in CONTRIBUTING.rst	2018-08-02 18:53:44 +01:00
Michael Kaye	489949879e	Add news entry	2018-08-02 18:49:50 +01:00
Michael Kaye	1758f4e1c7	Address SPAG issues	2018-08-02 18:21:34 +01:00
Michael Kaye	26a37f3d4d	Do not include docker files in python build	2018-08-02 18:21:34 +01:00
Michael Kaye	0d25724419	Refactor docker locations and README. ... This addresses #3224	2018-08-02 18:21:32 +01:00
Richard van der Hoff	1fa98495d0	Merge pull request #3639 from matrix-org/rav/refactor_error_handling ... Clean up handling of errors from outbound requests	2018-08-02 17:38:24 +01:00
Richard van der Hoff	bdae8f2e68	Merge pull request #3638 from matrix-org/rav/refactor_federation_client_exception_handling ... Factor out exception handling in federation_client	2018-08-02 17:37:46 +01:00
Richard van der Hoff	704c3e6239	Merge branch 'master' into develop	2018-08-02 15:43:30 +01:00