364 Commits

Author	SHA1	Message	Date
Travis Ralston	984db8bb08	Create 3860.misc	2018-09-13 12:06:04 -06:00
Amber Brown	7c27c4d51c	merge (#3576)	2018-09-14 03:11:11 +10:00
Erik Johnston	6c0f8d9d50	Merge pull request #3856 from matrix-org/erikj/speed_up_purge ... Make purge history slightly faster	2018-09-13 16:14:46 +01:00
Amber Brown	cb64fe2cb7	Merge pull request #3859 from matrix-org/erikj/add_iterkeys ... Fix handling of redacted events from federation	2018-09-14 01:06:44 +10:00
Erik Johnston	13193a6e2b	Newsfile	2018-09-13 15:46:45 +01:00
Amber Brown	3126b88d35	fix circleci merged builds (#3858) ... * fix * changelog	2018-09-14 00:44:31 +10:00
Amber Brown	bfa0b759e0	Attempt to figure out what's going on with timeouts (#3857)	2018-09-14 00:15:51 +10:00
Erik Johnston	93139a1fb8	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_purge	2018-09-13 12:57:09 +01:00
Erik Johnston	e7cd7cb0f0	Newsfile	2018-09-13 12:55:40 +01:00
Amber Brown	b7d2fb5eb9	Remove some superfluous logging (#3855)	2018-09-13 19:59:32 +10:00
Neil Johnson	f30a303590	Merge pull request #3846 from matrix-org/neilj/expose-registered-users ... expose number of real reserved users	2018-09-12 17:14:04 +01:00
Matthew Hodgson	2ac1abbc7e	show heroes if a room has a 'deleted' name/canonical_alias (#3851)	2018-09-12 17:11:05 +01:00
Erik Johnston	fa0d464fa4	Merge pull request #3853 from matrix-org/erikj/log_outbound_each_time ... Log outbound requests when we retry	2018-09-12 16:55:40 +01:00
Erik Johnston	3db016b641	Newsfile	2018-09-12 16:25:18 +01:00
Neil Johnson	8decd6233d	improve naming	2018-09-12 16:22:15 +01:00
Erik Johnston	54f8616d2c	Merge pull request #3841 from matrix-org/erikj/manhole_key_length ... Change the manhole SSH key to have more bits	2018-09-12 14:33:39 +01:00
Amber Brown	65cd8ccc79	Add JUnit summaries to CircleCI as well as merged runs (#3704)	2018-09-12 23:29:21 +10:00
Amber Brown	7ca097f77e	Port federation/ to py3 (#3847)	2018-09-12 23:23:32 +10:00
Neil Johnson	5cea4e16c7	towncrier	2018-09-12 12:03:31 +01:00
Amber Brown	546aee7e52	Merge pull request #3835 from krombel/fix_3821 ... fix VOIP crashes under Python 3	2018-09-12 20:44:18 +10:00
Amber Brown	33716c4aea	Merge pull request #3826 from matrix-org/rav/logging_for_keyring ... add some logging for the keyring queue	2018-09-12 20:43:47 +10:00
Amber Brown	bc635026c5	Merge pull request #3824 from matrix-org/rav/fix_jwt_import ... Fix jwt import check	2018-09-12 20:41:57 +10:00
Amber Brown	02aa41809b	Port rest/ to Python 3 (#3823)	2018-09-12 20:41:31 +10:00
Amber Brown	8fd93b5eea	Port crypto/ to Python 3 (#3822)	2018-09-12 20:16:31 +10:00
Erik Johnston	649c647955	Newsfile	2018-09-12 11:03:42 +01:00
Matthew Hodgson	b041115415	Speed up lazy loading (#3827) ... * speed up room summaries by pulling their data from room_memberships rather than room state * disable LL for incr syncs, and log incr sync stats (#3840)	2018-09-12 00:50:39 +01:00
Erik Johnston	9a68778ac2	Newsfile	2018-09-11 10:44:40 +01:00
Mathijs van Gorcum	e957428a15	Newsfile	2018-09-10 14:53:05 +00:00
Krombel	3572a206d3	add changelog	2018-09-10 14:33:08 +02:00
Richard van der Hoff	1e4c7fff5f	changelog	2018-09-07 16:37:30 +01:00
Amber Brown	9a5ea511b5	Merge pull request #3810 from matrix-org/erikj/send_tags_down_sync_on_join ... Send existing room tags down sync on join	2018-09-07 23:28:42 +10:00
Richard van der Hoff	edda9f5cac	changelog	2018-09-07 14:23:35 +01:00
Amber Brown	771d213ac5	Merge branch 'master' into develop	2018-09-07 21:45:38 +10:00
Amber Brown	b60749a1ec	changelog	2018-09-07 21:41:57 +10:00
Amber Brown	52ec6e9dfa	Port tests/ to Python 3 (#3808)	2018-09-07 02:58:18 +10:00
Neil Johnson	c5440b2ca0	Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count ... guest users should not be part of mau total	2018-09-06 17:45:55 +01:00
Erik Johnston	7298efd361	Newsfile	2018-09-06 17:13:33 +01:00
Amber Brown	654324eded	Merge pull request #3805 from matrix-org/erikj/limit_transaction_pdus_edus ... Limit the number of PDUs/EDUs per fedreation transaction	2018-09-07 01:33:31 +10:00
Amber Brown	1d371fc5b3	Merge pull request #3806 from matrix-org/erikj/limit_postgres_travis ... Only start postgres instance for postgres tests on Travis CI	2018-09-07 01:06:21 +10:00
Erik Johnston	b07a2cbee9	Spelling	2018-09-06 15:53:02 +01:00
Amber Brown	70fd75cd1d	Merge pull request #3788 from matrix-org/erikj/remove_conn_id ... Remove conn_id from repl prometheus metrics	2018-09-07 00:48:19 +10:00
Erik Johnston	5d848992bf	Newsfile	2018-09-06 15:28:46 +01:00
Erik Johnston	28f5bfdcf7	Newsfile	2018-09-06 15:25:58 +01:00
Amber Brown	ee7c8bd2b5	Merge pull request #3795 from matrix-org/erikj/faster_sync_state ... User iter* during sync state calculations	2018-09-07 00:24:43 +10:00
Amber Brown	135f3b4390	Merge pull request #3804 from matrix-org/rav/fix_openssl_dep ... bump dep on pyopenssl to 16.x	2018-09-07 00:23:39 +10:00
Amber Brown	2608ebc04c	Port handlers/ to Python 3 (#3803)	2018-09-07 00:22:23 +10:00
Richard van der Hoff	b3c2ebba32	changelog	2018-09-06 12:55:17 +01:00
Jan Christian Grünhage	af3125226d	Create 3802.misc	2018-09-06 10:46:00 +02:00
Neil Johnson	92657be7d0	towncrier	2018-09-05 22:33:45 +01:00
Richard van der Hoff	dfba1d843d	Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filter ... Implement 'event_format' filter param in /sync	2018-09-05 16:24:14 +01:00