9762 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnston	5ef5e14ecc	Merge pull request #2636 from farialima/me-master ... Fix for #2635: correctly update rooms avatar/display name when modified by admin	2017-11-07 13:49:27 +00:00
Erik Johnston	76c9af193c	Revert "Merge branch 'master' of github.com:matrix-org/synapse into develop" ... This reverts commit f9b255cd62, reversing changes made to 1bd654dabd.	2017-11-07 13:32:35 +00:00
Erik Johnston	f9b255cd62	Merge branch 'master' of github.com:matrix-org/synapse into develop	2017-11-07 13:31:03 +00:00
Krombel	44ad6dd4bf	update prometheus-config to new format	2017-11-07 13:35:35 +01:00
Luke Barnard	1bd654dabd	Merge pull request #2647 from matrix-org/luke/get-group-users-is-privileged ... Return whether a user is an admin within a group	2017-11-07 12:05:11 +00:00
Luke Barnard	38b265cb51	Remember to pick is_admin out of the db	2017-11-07 11:24:04 +00:00
Luke Barnard	5561c09091	Return whether a user is an admin within a group	2017-11-07 11:18:45 +00:00
Matthew Hodgson	3db5ff69b2	Merge pull request #2576 from maximevaillancourt/exclude-noscript-url-preview ... Ignore <noscript> tags when generating URL preview descriptions	2017-11-07 11:09:22 +00:00
Richard van der Hoff	ec12e7eada	Merge pull request #2646 from matrix-org/rav/logging_for_limiter ... Logging and logcontext fixes for Limiter	2017-11-07 10:47:00 +00:00
Matthew Hodgson	631fa4a1b7	create new indexes before dropping old ones to keep safetynet in place	2017-11-07 10:41:55 +00:00
Richard van der Hoff	bf993db11c	Logging and logcontext fixes for Limiter ... Add some logging to the Limiter in a similar spirit to the Linearizer, to help debug issues. Also fix a logcontext leak. Also refactor slightly to avoid throwing exceptions.	2017-11-07 00:48:57 +00:00
Matthew Hodgson	4ad883398f	s/users_in_pubic_room/users_in_public_rooms/g	2017-11-04 19:39:40 +00:00
Matthew Hodgson	d802e8ca6a	s/users_in_pubic_room/users_in_public_rooms/g	2017-11-04 19:38:13 +00:00
Matthew Hodgson	a100700630	fix copyright....	2017-11-04 19:35:49 +00:00
Matthew Hodgson	b6b075fd49	s/popualte/populate/	2017-11-04 19:35:33 +00:00
Matthew Hodgson	d1622e080f	s/intial/initial/	2017-11-04 19:35:14 +00:00
Matthew Hodgson	2ac6deafb7	simplify instructions for regenerating user_dir	2017-11-04 19:34:59 +00:00
Slavi Pantaleev	805196fbeb	Avoid no-op media deletes ... If there are no media entries to delete, avoid creating transactions, prepared statements and unnecessary log entries. Signed-off-by: Slavi Pantaleev <slavi@devture.com>	2017-11-04 09:50:15 +02:00
Francois Granade	f103b91ffa	removed unused import flagged by flake8a	2017-11-03 18:45:49 +01:00
Francois Granade	fa4f337b49	Fix for issue 2635: correctly update rooms avatar/display name when modified by admin	2017-11-03 18:25:04 +01:00
Ilya Zhuravlev	8a4a0ddea6	Fix appservice tests to account for new behavior of notify_interested_services	2017-11-02 23:19:57 +03:00
Ilya Zhuravlev	45fbe4ff67	Fix appservices being backlogged and not receiving new events due to a bug in notify_interested_services	2017-11-02 22:49:43 +03:00
David Baker	f851bc8182	Merge pull request #2630 from matrix-org/luke/fix-rooms-in-group ... Make the get_rooms_in_group API more sane	2017-11-02 17:23:17 +00:00
David Baker	9e09a1800b	Merge pull request #2629 from matrix-org/rav/register_inhibit_login ... support inhibit_login in /register	2017-11-02 16:51:35 +00:00
Luke Barnard	a34c586a89	Make the get_rooms_in_group API more sane ... Return entries with is_public = True when they're public and is_public = False otherwise.	2017-11-02 16:42:30 +00:00
Richard van der Hoff	6c3a02072b	support inhibit_login in /register ... Allow things to pass inhibit_login when registering to ... inhibit logins.	2017-11-02 16:31:07 +00:00
David Baker	4a6754baf2	Merge pull request #2628 from matrix-org/rav/module_api_hooks ... Add more hooks to ModuleApi	2017-11-02 15:37:14 +00:00
David Baker	4b36897cd9	Merge remote-tracking branch 'origin/develop' into rav/module_api_hooks	2017-11-02 15:19:17 +00:00
David Baker	d4553818a0	Merge pull request #2627 from matrix-org/rav/custom_rest_endpoints ... Add a hook for custom rest endpoints	2017-11-02 15:18:37 +00:00
David Baker	6b6f03ae05	Merge pull request #2626 from matrix-org/rav/refactor_module_api ... Factor _AccountHandler proxy out to ModuleApi	2017-11-02 15:15:30 +00:00
David Baker	77e3757fa9	Merge pull request #2625 from matrix-org/rav/named_resource_refactor ... Factor out _configure_named_resource	2017-11-02 15:11:30 +00:00
Richard van der Hoff	6b60f7dca0	Add more hooks to ModuleApi ... add `get_user_by_req` and `invalidate_access_token`	2017-11-02 14:37:39 +00:00
Richard van der Hoff	fcdfc911ee	Add a hook for custom rest endpoints ... Let the user specify custom modules which can be used for implementing extra endpoints.	2017-11-02 14:36:55 +00:00
Richard van der Hoff	1189be43a2	Factor _AccountHandler proxy out to ModuleApi ... We're going to need to use this from places that aren't password auth, so let's move it to a proper class.	2017-11-02 14:36:11 +00:00
Richard van der Hoff	6650a07ede	Factor out _configure_named_resource ... This was a bit of a code vomit, so let's factor it out to preserve some sanity	2017-11-02 14:33:37 +00:00
David Baker	b19d9e2174	Merge pull request #2624 from matrix-org/rav/password_provider_notify_logout ... Notify auth providers on logout	2017-11-02 10:55:17 +00:00
David Baker	1f080a6c97	Merge pull request #2623 from matrix-org/rav/callbacks_for_auth_providers ... Allow password_auth_providers to return a callback	2017-11-02 10:49:03 +00:00
David Baker	04897c9dc1	Merge pull request #2622 from matrix-org/rav/db_access_for_auth_providers ... Let auth providers get to the database	2017-11-02 10:41:25 +00:00
Richard van der Hoff	979eed4362	Fix user-interactive password auth ... this got broken in the previous commit	2017-11-01 17:03:20 +00:00
Richard van der Hoff	bc8a5c0330	Notify auth providers on logout ... Provide a hook by which auth providers can be notified of logouts.	2017-11-01 16:51:51 +00:00
Richard van der Hoff	4c8f94ac94	Allow password_auth_providers to return a callback ... ... so that they have a way to record access tokens.	2017-11-01 16:51:03 +00:00
Richard van der Hoff	846a94fbc9	Merge pull request #2620 from matrix-org/rav/auth_non_password ... Let password auth providers handle arbitrary login types	2017-11-01 16:45:33 +00:00
Richard van der Hoff	3cd6b22c7b	Let password auth providers handle arbitrary login types ... Provide a hook where password auth providers can say they know about other login types, and get passed the relevant parameters	2017-11-01 16:43:57 +00:00
David Baker	c9b9ef575b	Merge pull request #2621 from matrix-org/rav/refactor_accesstoken_delete ... Move access token deletion into auth handler	2017-11-01 16:26:06 +00:00
Matthew Hodgson	275826f234	Merge pull request #2617 from matrix-org/matthew/auto-displayname ... automatically set default displayname on register	2017-11-01 16:21:16 +00:00
David Baker	4f0488b307	Merge remote-tracking branch 'origin/develop' into rav/refactor_accesstoken_delete	2017-11-01 16:20:19 +00:00
David Baker	e5e930aec3	Merge pull request #2615 from matrix-org/rav/break_auth_device_dep ... Break dependency of auth_handler on device_handler	2017-11-01 16:06:31 +00:00
David Baker	fbbacb284e	Merge pull request #2613 from matrix-org/rav/kill_refresh_tokens ... Remove the last vestiges of refresh_tokens	2017-11-01 15:57:35 +00:00
Matthew Hodgson	9f7a555b4e	switch to setting default displayname in the storage layer ... to avoid clobbering guest user displaynames on registration	2017-11-01 15:51:30 +00:00
Richard van der Hoff	dd13310fb8	Move access token deletion into auth handler ... Also move duplicated deactivation code into the auth handler. I want to add some hooks when we deactivate an access token, so let's bring it all in here so that there's somewhere to put it.	2017-11-01 15:46:22 +00:00