15743 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Aaron Raimist	24cc31ee96	Fix link to user_dir_populate.sql in the user directory docs (#6388)	2019-11-21 17:38:14 +00:00
Andrew Morgan	3916e1b97a	Clean up newline quote marks around the codebase (#6362)	2019-11-21 12:00:14 +00:00
Matthew Hodgson	9cc168e42e	update macOS installation instructions	2019-11-20 18:44:45 +00:00
Brendan Abolivier	e2a20326e8	Lint	2019-11-20 15:08:47 +00:00
Brendan Abolivier	486be06f48	Changelog	2019-11-20 15:08:03 +00:00
Andrew Morgan	41e4566682	1.6.0rc1	2019-11-20 14:12:42 +00:00
Andrew Morgan	234f55f3c4	Docker: Change permissions for data dir before attempting to write to it (#6389)	2019-11-20 13:32:31 +00:00
Brendan Abolivier	6356f2088f	Test if a purge can make /messages return 500 responses	2019-11-20 12:09:06 +00:00
Manuel Stahl	4f5ca455bf	Move admin endpoints into separate files (#6308)	2019-11-20 11:49:11 +00:00
Brendan Abolivier	83446a18fb	Merge pull request #6335 from matrix-org/erikj/rc_login_cleanups ... Only do `rc_login` ratelimiting on succesful login.	2019-11-20 09:52:38 +00:00
Brendan Abolivier	271c322d08	Lint	2019-11-20 09:29:48 +00:00
Brendan Abolivier	cdd3cb870d	Fix worker mode	2019-11-19 14:40:21 +00:00
Brendan Abolivier	a6fc6754f8	Fix 3PID invite exchange	2019-11-19 14:07:39 +00:00
Brendan Abolivier	97b863fe32	Lint again	2019-11-19 13:33:58 +00:00
Brendan Abolivier	bf9a11c54d	Lint again	2019-11-19 13:30:04 +00:00
Brendan Abolivier	7c24d0f443	Lint	2019-11-19 13:22:37 +00:00
Erik Johnston	c7376cdfe3	Apply suggestions from code review ... Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Co-Authored-By: Brendan Abolivier <babolivier@matrix.org>	2019-11-18 17:10:16 +00:00
Richard van der Hoff	870c00e278	Merge remote-tracking branch 'origin/develop' into rav/event_auth/4	2019-11-18 12:05:36 +00:00
Andrew Morgan	657d614f6a	Replace UPDATE with UPSERT on device_max_stream_id table (#6363)	2019-11-15 14:02:34 +00:00
James	53b6559a89	Add optional python dependencies to snap packaging (#6317) ... Signed-off-by: James Hebden <james@ec0.io>	2019-11-14 18:42:46 +00:00
Andrew Morgan	745a48625d	Fix guest -> real account upgrade with account validity enabled (#6359)	2019-11-14 12:02:05 +00:00
Andrew Morgan	6e1b40dc26	Replace instance variations of homeserver with correct case/spacing (#6357)	2019-11-14 11:02:58 +00:00
Andrew Morgan	a65a5ea125	Merge branch 'develop' of github.com:matrix-org/synapse into anoa/fix_account_data_sync ... * 'develop' of github.com:matrix-org/synapse: Blacklist PurgeRoomTestCase (#6361) Set room version default to 5	2019-11-14 10:26:56 +00:00
Andrew Morgan	473acedcdd	Merge branch 'develop' of github.com:matrix-org/synapse into anoa/homeserver_copy ... * 'develop' of github.com:matrix-org/synapse: Blacklist PurgeRoomTestCase (#6361) Set room version default to 5	2019-11-14 10:26:27 +00:00
Brendan Abolivier	a42567e4a8	Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5 ... Set room version default to 5	2019-11-14 10:21:00 +00:00
Andrew Morgan	c350bc2f92	Blacklist PurgeRoomTestCase (#6361)	2019-11-13 19:09:20 +00:00
Andrew Morgan	e1648dc576	sample config	2019-11-12 13:15:59 +00:00
Andrew Morgan	85f172ef96	Add changelog	2019-11-12 13:13:19 +00:00
Andrew Morgan	73d091be48	A couple more instances	2019-11-12 13:12:25 +00:00
Andrew Morgan	bc29a19731	Replace instance variations of homeserver with correct case/spacing	2019-11-12 13:08:12 +00:00
Richard van der Hoff	20d687516f	newsfile	2019-11-08 16:17:02 +00:00
Andrew Morgan	cd96b4586f	lint	2019-11-08 15:45:45 +00:00
Andrew Morgan	318dd21b47	Add changelog	2019-11-08 15:45:08 +00:00
Andrew Morgan	c4bdf2d785	Remove content from being sent for account data rdata stream	2019-11-08 15:44:02 +00:00
Richard van der Hoff	f41027f746	Use get_events_as_list rather than lots of calls to get_event ... It's more efficient and clearer.	2019-11-08 12:21:28 +00:00
Richard van der Hoff	f8407975e7	Update some docstrings and comments	2019-11-08 12:18:20 +00:00
Richard van der Hoff	772d414975	Simplify _update_auth_events_and_context_for_auth ... move event_key calculation into _update_context_for_auth_events, since it's only used there.	2019-11-08 11:40:11 +00:00
Brendan Abolivier	963ffb60b9	Merge pull request #6340 from matrix-org/babolivier/pagination_query ... Fix the SQL SELECT query in _paginate_room_events_txn	2019-11-08 11:12:24 +00:00
Brendan Abolivier	b16fa43386	Incorporate review	2019-11-08 10:34:09 +00:00
Erik Johnston	f713c01e2b	Merge pull request #6295 from matrix-org/erikj/split_purge_history ... Split purge API into events vs state and add PurgeEventsStorage	2019-11-08 10:19:15 +00:00
Erik Johnston	e4ec82ce0f	Move type annotation into docstring	2019-11-08 09:50:48 +00:00
Brendan Abolivier	46e5db9eb2	Merge pull request #6310 from matrix-org/babolivier/msc2326_bg_update ... MSC2326: Add background update to take previous events into account	2019-11-07 22:54:56 +00:00
Richard van der Hoff	c5abb67e43	Python 3.8 for tox (#6341) ... ... and update INSTALL.md to include py3.8. We'll also have to update the buildkite pipeline to run it	2019-11-07 17:14:13 +00:00
Brendan Abolivier	dad8d68c99	Update synapse/storage/data_stores/main/events_bg_updates.py ... Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-11-07 17:01:53 +00:00
Brendan Abolivier	6d360f099f	Update synapse/storage/data_stores/main/events_bg_updates.py ... Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-11-07 17:01:43 +00:00
Brendan Abolivier	c9b27d0044	Copy results	2019-11-07 16:47:45 +00:00
Brendan Abolivier	cd31201267	Revert "Back to using cursor_to_dict" ... This reverts commit 1186612d6c.	2019-11-07 16:47:15 +00:00
Brendan Abolivier	1186612d6c	Back to using cursor_to_dict	2019-11-07 16:46:41 +00:00
Brendan Abolivier	ec2cb9f298	Initialise value before looping	2019-11-07 16:18:40 +00:00
Brendan Abolivier	bb78276bdc	Incorporate review	2019-11-07 15:25:27 +00:00