12448 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Richard van der Hoff	03287c350e	remove redundant changelog file ... this change has been released	2018-10-18 15:09:34 +01:00
Richard van der Hoff	c632bc8654	Merge branch 'master' into develop	2018-10-18 15:07:03 +01:00
Richard van der Hoff	926da4dda8	0.33.7	2018-10-18 14:57:32 +01:00
Erik Johnston	e77f24d80a	Merge pull request #4049 from matrix-org/erikj/synctl_colour ... Only colourise synctl output when attached to tty	2018-10-18 10:51:14 +01:00
Richard van der Hoff	8c2b8d7f0b	fix changelog formatting	2018-10-17 17:42:12 +01:00
Richard van der Hoff	c7d0f34a3c	v0.33.7rc2	2018-10-17 17:40:19 +01:00
Richard van der Hoff	52e3d3813b	prep changelog	2018-10-17 17:40:01 +01:00
Richard van der Hoff	0fd2321629	Fix incorrect truncation in get_missing_events ... It's quite important that get_missing_events returns the *latest* events in the room; however we were pulling event ids out of the database until we got *at least* 10, and then taking the *earliest* of the results. We also shouldn't really be relying on depth, and should be checking the room_id.	2018-10-17 17:35:26 +01:00
Richard van der Hoff	f1bfe6167a	Merge pull request #4052 from matrix-org/rav/ship_resources_as_package_data ... Ship the email templates as package_data	2018-10-17 17:34:22 +01:00
Erik Johnston	4e726783ea	Merge pull request #4050 from matrix-org/erikj/fix_py37_iteration ... Fix bug where we raised StopIteration in a generator	2018-10-17 17:07:19 +01:00
Erik Johnston	a5aea15a6b	Assume isatty is always defined, and catch AttributeError. Also don't bother checking colour==Normal	2018-10-17 17:06:49 +01:00
Richard van der Hoff	c8f2c19991	Put the warning blob at the top of the file	2018-10-17 16:56:22 +01:00
Richard van der Hoff	1519572961	Ship the email templates as package_data ... move the example email templates into the synapse package so that they can be used as package data, which should mean that all of the packaging mechanisms (pip, docker, debian, arch, etc) should now come with the example templates. In order to grandfather in people who relied on the templates being in the old place, check for that situation and fall back to using the defaults if the templates directory does not exist.	2018-10-17 16:46:02 +01:00
Erik Johnston	3a5d8d5891	Newsfile	2018-10-17 16:12:45 +01:00
Erik Johnston	f6a0a02a62	Fix bug where we raised StopIteration in a generator ... This made python 3.7 unhappy	2018-10-17 16:10:52 +01:00
Erik Johnston	1af16acd4c	Newsfile	2018-10-17 13:48:09 +01:00
Erik Johnston	df33c164de	Only colourise synctl output when attached to tty	2018-10-17 13:47:53 +01:00
Will Hunt	d6a7797dd1	Fix roomlist since tokens on Python 3 (#4046) ... Thanks @Half-Shot !!!	2018-10-17 23:04:55 +11:00
Richard van der Hoff	6ec9d8ba0a	Merge pull request #4045 from matrix-org/rav/fix_get_missing_events ... Fix incorrect truncation in get_missing_events	2018-10-17 11:40:03 +01:00
Amber Brown	80736fd8ed	Merge pull request #4041 from matrix-org/rav/run_tests_in_docker ... run the circle builds in docker containers	2018-10-17 20:10:44 +11:00
Richard van der Hoff	fc0f13dd03	Fix incorrect truncation in get_missing_events ... It's quite important that get_missing_events returns the *latest* events in the room; however we were pulling event ids out of the database until we got *at least* 10, and then taking the *earliest* of the results. We also shouldn't really be relying on depth, and should be checking the room_id.	2018-10-16 21:10:04 +01:00
Richard van der Hoff	10405153c2	Use wget rather than curl ... the docker image doesn't have wget	2018-10-16 16:47:26 +01:00
Richard van der Hoff	017eb9d17a	changelog	2018-10-16 16:31:47 +01:00
Erik Johnston	4a28d3d36f	Update event_auth table for rejected events	2018-10-16 16:28:42 +01:00
Erik Johnston	15133477ee	Fix up use of resolve_events_with_factory	2018-10-16 16:28:42 +01:00
Erik Johnston	fc954960e9	Newsfile	2018-10-16 16:28:42 +01:00
Erik Johnston	947c7443eb	Add some state res v2 tests	2018-10-16 16:28:39 +01:00
Erik Johnston	6bd856caa2	User event.sender rather than alias event.user_id	2018-10-16 16:16:13 +01:00
Erik Johnston	e238013c44	Add v2 state res algorithm. ... We hook this up to the vdh test room version.	2018-10-16 16:16:13 +01:00
Richard van der Hoff	a94967bc5f	run the circle builds in docker containers ... Docker containers spin up faster than entire VMs.	2018-10-16 15:29:08 +01:00
Richard van der Hoff	b8a5b0097c	Various cleanups in the federation client code (#4031) ... - Improve logging: log things in the right order, include destination and txids in all log lines, don't log successful responses twice - Fix the docstring on TransportLayerClient.send_transaction - Don't use treq.request, which is overcomplicated for our purposes: just use a twisted.web.client.Agent. - simplify the logic for setting up the bodyProducer - fix bytes/str confusions	2018-10-16 10:44:49 +01:00
Amber Brown	24bc15eab4	update changelog	2018-10-15 22:23:13 +11:00
Amber Brown	4e50fe3edb	update changelog	2018-10-15 22:22:49 +11:00
Amber Brown	f726f2dc6c	version bump	2018-10-15 22:21:45 +11:00
David Baker	03c11032c3	Merge pull request #4019 from matrix-org/dbkr/e2e_backups ... E2E backups	2018-10-15 10:19:43 +01:00
Amber Brown	f9ce1b4eb0	Merge pull request #4033 from intelfx/py37-hotfixes ... py3: python3.7 hotfixes	2018-10-15 20:13:19 +11:00
Slavi Pantaleev	c187638ee9	Add information about the matrix-docker-ansible-deploy playbook ... Signed-off-by: Slavi Pantaleev <slavi@devture.com>	2018-10-14 21:50:18 +03:00
Ivan Shapovalov	06bc8d2fe5	synapse/app: frontend_proxy.py: actually make workers work on py3	2018-10-14 20:08:39 +03:00
Ivan Shapovalov	fb216a22db	synapse/visibility.py: fix SyntaxError on py3.7	2018-10-14 20:08:17 +03:00
Travis Ralston	164f8e4843	isort	2018-10-12 15:11:59 -06:00
Travis Ralston	7bb651de6a	More sane handling of group errors and pep8	2018-10-12 14:53:30 -06:00
Travis Ralston	e3586f7c06	Merge branch 'develop' into travis/fix-federated-group-requests	2018-10-12 14:49:58 -06:00
David Baker	a45f2c3a00	missed one	2018-10-12 14:33:55 +01:00
Amber Brown	381d2cfdf0	Make workers work on Py3 (#4027)	2018-10-13 00:14:08 +11:00
David Baker	8c0ff0287a	Linting soothes the savage PEP8 monster	2018-10-12 13:47:43 +01:00
David Baker	306361b31b	Misc PR feedback bits	2018-10-12 11:48:56 +01:00
David Baker	bddfad253a	Don't mangle exceptions	2018-10-12 11:48:02 +01:00
David Baker	86ef9760a7	Split /room_keys/version into 2 servlets	2018-10-12 11:35:08 +01:00
David Baker	83e72bb2f0	PR feedback pt. 1	2018-10-12 11:26:18 +01:00
Richard van der Hoff	8ddd0f273c	Comments on get_all_new_events_stream ... just some docstrings to clarify the behaviour here	2018-10-12 09:55:41 +01:00