10092 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnston	dfbc45302e	PEP8	2017-11-28 15:23:26 +00:00
Erik Johnston	c4c1d170af	Fix wrong avatars when inviting multiple users when creating room ... We reused the `content` dictionary between invite requests, which meant they could end up reusing the profile info for a previous user	2017-11-28 15:19:15 +00:00
Richard van der Hoff	fd04968f32	federation_client script: Support for posting content	2017-11-28 11:59:24 +00:00
Luke Barnard	c2a1194424	Merge pull request #2715 from matrix-org/luke/group-guest-access ... Allow guest access to group APIs for reading	2017-11-28 11:58:54 +00:00
Luke Barnard	ab1b2d0ff2	Allow guest access to group APIs for reading	2017-11-28 11:23:00 +00:00
Richard van der Hoff	5a4da5bf78	Merge pull request #2697 from matrix-org/rav/fix_urlcache_index_error ... Fix error on sqlite 3.7	2017-11-27 12:25:48 +00:00
Richard van der Hoff	84b31a3e7a	Merge pull request #2713 from matrix-org/rav/no_upsert_forever ... Avoid retrying forever on IntegrityError	2017-11-27 12:19:35 +00:00
Richard van der Hoff	df6c72ede3	Merge pull request #2711 from matrix-org/rav/fix_dns_errhandler ... Fix error handling on dns lookup	2017-11-27 12:19:18 +00:00
Richard van der Hoff	04bb79f139	Merge pull request #2710 from matrix-org/rav/remove_dead_code ... Tiny code cleanups	2017-11-27 12:15:44 +00:00
Richard van der Hoff	e828a7380a	Merge pull request #2708 from matrix-org/rav/replication_logcontext_leaks ... Fix some logcontext leaks in replication resource	2017-11-27 12:15:33 +00:00
Richard van der Hoff	7ef22a41a3	Merge pull request #2707 from matrix-org/rav/fix_urlpreview ... Fix OPTIONS on preview_url	2017-11-27 12:15:14 +00:00
Richard van der Hoff	96387bd26f	Merge pull request #2705 from matrix-org/rav/improve_tracebacks ... Improve tracebacks on exceptions	2017-11-27 12:07:52 +00:00
Richard van der Hoff	6be01f599b	Improve tracebacks on exceptions ... Use failure.Failure to recover our failure, which will give us a useful stacktrace, unlike the rethrown exception.	2017-11-27 12:05:58 +00:00
Richard van der Hoff	63ccaa5873	Avoid retrying forever on IntegrityError	2017-11-27 12:00:07 +00:00
Richard van der Hoff	8b38096a89	Fix error handling on dns lookup ... pass the right arguments to the errback handler Fixes "TypeError('eb() takes exactly 2 arguments (1 given)',)"	2017-11-24 16:47:48 +00:00
Richard van der Hoff	795b0849f3	Add a comment which might save some confusion	2017-11-24 00:34:56 +00:00
Richard van der Hoff	7f14f0ae38	Remove dead sync_callback ... This is never used; let's remove it to stop confusing things.	2017-11-24 00:32:04 +00:00
Richard van der Hoff	0edf085b68	Fix some logcontext leaks in replication resource ... The @measure_func annotations rely on the wrapped function respecting the logcontext rules. Add the necessary yields to make this work.	2017-11-23 23:19:43 +00:00
Richard van der Hoff	8132a6b7ac	Fix OPTIONS on preview_url ... Fixes #2706	2017-11-23 17:52:31 +00:00
Richard van der Hoff	6b48b3e277	fix sql fails	2017-11-22 18:06:24 +00:00
Richard van der Hoff	2908f955d1	Check database in has_completed_background_updates ... so that the right thing happens on workers.	2017-11-22 18:02:15 +00:00
Richard van der Hoff	79eba878a7	Merge pull request #2701 from matrix-org/rav/one_mediarepo_to_rule_them_all ... Try to avoid having multiple PreviewUrlResource instances	2017-11-22 16:46:09 +00:00
Richard van der Hoff	68ca864141	Add config option to disable media_repo on main synapse ... ... to stop us doing the cache cleanup jobs on the master.	2017-11-22 16:20:27 +00:00
Richard van der Hoff	e1fd4751de	Build MediaRepositoryResource as a homeserver dependency ... This avoids the scenario where we have four different PreviewUrlResources configured on a single app, each of which have their own caches and cache clearing jobs.	2017-11-22 16:19:49 +00:00
Richard van der Hoff	148c113fbe	Merge pull request #2700 from matrix-org/rav/worker_docs ... * Improve documentation of workers Fixes https://github.com/matrix-org/synapse/issues/2554	2017-11-21 18:28:40 +00:00
Richard van der Hoff	a0c6688976	Improve documentation of workers ... Fixes https://github.com/matrix-org/synapse/issues/2554	2017-11-21 18:28:13 +00:00
Richard van der Hoff	d5a7c56ef9	Merge pull request #2698 from matrix-org/rav/remove_dead_dependencies ... Clean up dependency list	2017-11-21 17:38:42 +00:00
Richard van der Hoff	0b4aa2dc21	Merge pull request #2689 from matrix-org/rav/unlock_account_data_upsert ... Avoid locking account_data tables for upserts	2017-11-21 13:39:14 +00:00
Matthew Hodgson	3ab2cfec47	sanity checks	2017-11-21 12:10:20 +00:00
Richard van der Hoff	7298ed7c51	Clean up dependency list ... remove those that aren't used at all, and replace the ones that don't have builders with simple getters rather than dynamically-generated methods.	2017-11-21 11:15:41 +00:00
Richard van der Hoff	7098b65cb8	Fix error on sqlite 3.7 ... Create the url_cache index on local_media_repository as a background update, so that we can detect whether we are on sqlite or not and create a partial or complete index accordingly. To avoid running the cleanup job before we have built the index, add a bailout which will defer the cleanup if the bg updates are still running. Fixes https://github.com/matrix-org/synapse/issues/2572.	2017-11-21 11:14:17 +00:00
Oliver Kurz	83d8d4d8cd	Allow use of higher versions of saml2 ... The package was pinned to <4.0 with 07cf96eb because "from saml2 import config" did not work. This seems to have been fixed in the mean time in the saml2 package and therefore should not stop to use a more recent version. Signed-off-by: Oliver Kurz <okurz@suse.de>	2017-11-20 11:14:39 +01:00
Matthew Hodgson	2145ee1976	don't double-invite in sync_room_to_group.pl	2017-11-19 00:48:47 +00:00
Richard van der Hoff	59a7275258	Merge pull request #2688 from matrix-org/rav/unlock_more_upsert ... Avoid locking for upsert on pushers tables	2017-11-17 13:09:31 +00:00
Richard van der Hoff	d8a05418f9	Merge branch 'master' into develop	2017-11-17 12:13:14 +00:00
Richard van der Hoff	b102e93571	Merge branch 'release-v0.25.1'	2017-11-17 12:03:07 +00:00
Luke Barnard	cdf6fc15b0	Merge pull request #2686 from matrix-org/luke/as-flair ... Add automagical AS Publicised Group(s)	2017-11-17 10:13:46 +00:00
Richard van der Hoff	74bbeb4373	Bump version in __init__.py	2017-11-17 10:10:53 +00:00
Richard van der Hoff	2187724ad2	Prep changelog for v0.25.1	2017-11-17 10:09:16 +00:00
Jurek	eded7084d2	Fix auth handler #2678	2017-11-17 10:07:27 +00:00
Matthew Hodgson	34c3d0a386	typo	2017-11-17 01:54:02 +00:00
Matthew Hodgson	9d50b6f0ea	quick and dirty room membership<->group membership sync script	2017-11-17 01:54:02 +00:00
Luke Barnard	ab1dc84779	Add extra space before inline comment	2017-11-16 18:22:40 +00:00
Luke Barnard	7fb0e98b03	Extract group_id from the dict for multiple use	2017-11-16 18:18:30 +00:00
Luke Barnard	e836bdf734	Fix tests	2017-11-16 18:14:39 +00:00
Richard van der Hoff	c46139a17e	Avoid locking account_data tables for upserts	2017-11-16 18:08:01 +00:00
Luke Barnard	d8391f0541	Remove unused GROUP_ID_REGEX	2017-11-16 18:05:57 +00:00
Luke Barnard	4e8374856d	Document get_groups_for_user	2017-11-16 18:03:46 +00:00
Luke Barnard	270f9cd23a	Flake8	2017-11-16 18:03:31 +00:00
Luke Barnard	9d83d52027	Use a generator instead of a list	2017-11-16 17:57:34 +00:00