matrix/thirdparty/synapse.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #2708 from matrix-org/rav/replication_logcontext_leaks	Richard van der Hoff	2017-11-27	1	-2/+4
\|\ \| \| \| \|	Fix some logcontext leaks in replication resource
\| *	Fix some logcontext leaks in replication resource	Richard van der Hoff	2017-11-23	1	-2/+4
\| \| \| \| \| \| \| \| \| \|	The @measure_func annotations rely on the wrapped function respecting the logcontext rules. Add the necessary yields to make this work.
* \|	Merge pull request #2707 from matrix-org/rav/fix_urlpreview	Richard van der Hoff	2017-11-27	1	-1/+5
\|\ \ \| \| \| \| \| \|	Fix OPTIONS on preview_url
\| * \|	Fix OPTIONS on preview_url	Richard van der Hoff	2017-11-23	1	-1/+5
\| \|/ \| \| \| \| \| \|	Fixes #2706
* \|	Merge pull request #2705 from matrix-org/rav/improve_tracebacks	Richard van der Hoff	2017-11-27	1	-3/+9
\|\ \ \| \|/ \|/\|	Improve tracebacks on exceptions
\| *	Improve tracebacks on exceptions	Richard van der Hoff	2017-11-27	1	-3/+9
\|/ \| \| \| \|	Use failure.Failure to recover our failure, which will give us a useful stacktrace, unlike the rethrown exception.
*	Merge pull request #2701 from matrix-org/rav/one_mediarepo_to_rule_them_all	Richard van der Hoff	2017-11-22	6	-13/+48
\|\ \| \| \| \|	Try to avoid having multiple PreviewUrlResource instances
\| *	Add config option to disable media_repo on main synapse	Richard van der Hoff	2017-11-22	4	-9/+30
\| \| \| \| \| \| \| \|	... to stop us doing the cache cleanup jobs on the master.
\| *	Build MediaRepositoryResource as a homeserver dependency	Richard van der Hoff	2017-11-22	4	-5/+19
\|/ \| \| \| \| \|	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.
*	Merge pull request #2700 from matrix-org/rav/worker_docs	Richard van der Hoff	2017-11-21	1	-21/+133
\|\ \| \| \| \| \| \| \| \| \| \|	* Improve documentation of workers Fixes https://github.com/matrix-org/synapse/issues/2554
\| *	Improve documentation of workers	Richard van der Hoff	2017-11-21	1	-21/+133
\| \| \| \| \| \| \| \|	Fixes https://github.com/matrix-org/synapse/issues/2554
* \|	Merge pull request #2698 from matrix-org/rav/remove_dead_dependencies	Richard van der Hoff	2017-11-21	1	-16/+15
\|\ \ \| \| \| \| \| \|	Clean up dependency list
\| * \|	Clean up dependency list	Richard van der Hoff	2017-11-21	1	-16/+15
\| \|/ \| \| \| \| \| \| \| \|	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.
* \|	Merge pull request #2689 from matrix-org/rav/unlock_account_data_upsert	Richard van der Hoff	2017-11-21	1	-36/+49
\|\ \ \| \| \| \| \| \|	Avoid locking account_data tables for upserts
\| * \|	Avoid locking account_data tables for upserts	Richard van der Hoff	2017-11-16	1	-36/+49
\| \| \|
* \| \|	sanity checks	Matthew Hodgson	2017-11-21	1	-1/+4
\| \|/ \|/\|
* \|	don't double-invite in sync_room_to_group.pl	Matthew Hodgson	2017-11-19	1	-3/+6
\| \|
* \|	Merge pull request #2688 from matrix-org/rav/unlock_more_upsert	Richard van der Hoff	2017-11-17	2	-5/+51
\|\ \ \| \| \| \| \| \|	Avoid locking for upsert on pushers tables
\| * \|	Avoid locking for upsert on pushers tables	Richard van der Hoff	2017-11-16	2	-5/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* replace the upsert into deleted_pushers with an insert * no need to lock for upsert on pusher_throttle
* \| \|	Merge branch 'master' into develop	Richard van der Hoff	2017-11-17	2	-1/+9
\|\ \ \
\| * \ \	Merge branch 'release-v0.25.1'	Richard van der Hoff	2017-11-17	3	-2/+10
\| \|\ \ \
\| \| * \| \|	Bump version in __init__.py v0.25.1 github/release-v0.25.1 release-v0.25.1	Richard van der Hoff	2017-11-17	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Prep changelog for v0.25.1	Richard van der Hoff	2017-11-17	1	-0/+8
\| \| \| \| \|
\| \| * \| \|	Fix auth handler #2678	Jurek	2017-11-17	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Revert "Merge pull request #2679 from jkolo/fix_auth_handler"	Richard van der Hoff	2017-11-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This PR was against master, not develop :( This reverts commit 203058a027193b6a07a148319a9a728bf7f8420c, reversing changes made to 552f123bea1014680ab798b7e34cd1b23424a189.
\| * \| \| \|	Merge pull request #2679 from jkolo/fix_auth_handler	Richard van der Hoff	2017-11-16	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix auth handler
\| \| * \| \| \|	Fix auth handler #2678	Jurek	2017-11-15	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge pull request #2686 from matrix-org/luke/as-flair	Luke Barnard	2017-11-17	4	-1/+49
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add automagical AS Publicised Group(s)
\| * \| \| \| \|	Add extra space before inline comment	Luke Barnard	2017-11-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Extract group_id from the dict for multiple use	Luke Barnard	2017-11-16	1	-4/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Fix tests	Luke Barnard	2017-11-16	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove unused GROUP_ID_REGEX	Luke Barnard	2017-11-16	1	-2/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Document get_groups_for_user	Luke Barnard	2017-11-16	1	-0/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Flake8	Luke Barnard	2017-11-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Use a generator instead of a list	Luke Barnard	2017-11-16	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Make sure we check AS groups for lookup on bulk	Luke Barnard	2017-11-16	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Check group_id belongs to this domain	Luke Barnard	2017-11-16	2	-3/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Add automagical AS Publicised Group(s)	Luke Barnard	2017-11-16	2	-0/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	via registration file "users" namespace: ```YAML ... namespaces: users: - exclusive: true regex: '.luke.' group_id: '+all_the_lukes:hsdomain' ... ``` This is part of giving App Services their own groups for matching users. With this, ghost users will be given the appeareance that they are in a group and that they have publicised the fact, but _only_ from the perspective of the `get_publicised_groups_for_user` API.
* \| \| \| \| \|	typo	Matthew Hodgson	2017-11-17	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	quick and dirty room membership<->group membership sync script	Matthew Hodgson	2017-11-17	1	-0/+39
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Fix auth handler #2678	Jurek	2017-11-16	1	-1/+1
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge pull request #2684 from matrix-org/rav/unlock_upsert	Richard van der Hoff	2017-11-16	2	-49/+74
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Start work on avoiding table locks for upserts
\| * \| \|	Fix broken ref to IntegrityError	Richard van der Hoff	2017-11-16	1	-1/+1
\| \| \| \|
\| * \| \|	Avoid locking `pushers` table on upsert	Richard van der Hoff	2017-11-16	1	-27/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now that _simple_upsert will retry on IntegrityError, we don't need to lock the table.
\| * \| \|	_simple_upsert: retry on IntegrityError	Richard van der Hoff	2017-11-16	1	-6/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wrap the call to _simple_upsert_txn in a loop so that we retry on an integrityerror: this means we can avoid locking the table provided there is an unique index.
\| * \| \|	Cleanup in _simple_upsert_txn	Richard van der Hoff	2017-11-16	1	-16/+17
\|/ / / \| \| \| \| \| \| \| \| \|	Bail out early to reduce indentation
* \| \|	Merge pull request #2661 from matrix-org/rav/statereadstore	Richard van der Hoff	2017-11-15	3	-249/+237
\|\ \ \ \| \| \| \| \| \| \| \|	Pull out bits of StateStore to a mixin
\| * \| \|	Pull out bits of StateStore to a mixin	Richard van der Hoff	2017-11-14	2	-237/+226
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... so that we don't need to secretly gut-wrench it for use in the slaved stores. I haven't done the other stores yet, but we should. I'm tired of the workers breaking every time we tweak the stores because I forgot to gut-wrench the right method. fixes https://github.com/matrix-org/synapse/issues/2655.
\| * \| \|	Revert "Revert "move _state_group_cache to statestore""	Richard van der Hoff	2017-11-14	2	-13/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We're going to fix this properly on this branch, so that the _state_group_cache can end up in StateGroupReadStore. This reverts commit ab335edb023d66cd0be439e045b10ca104b73cb5.
* \| \| \|	Merge pull request #2677 from matrix-org/rav/spec_r0.3.0	Richard van der Hoff	2017-11-15	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Declare support for r0.3.0
\| * \| \| \|	Declare support for r0.3.0	Richard van der Hoff	2017-11-15	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-11-15	1	-0/+8
\|\ \ \ \ \ \| \|/ / / / \|/\| \| / / \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge branch 'release-v0.25.0' of github.com:matrix-org/synapse v0.25.0	Erik Johnston	2017-11-15	85	-689/+1783
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Bump changelog github/release-v0.25.0 release-v0.25.0	Erik Johnston	2017-11-15	1	-0/+8
\| \| \| \|
* \| \| \|	Merge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcs	Richard van der Hoff	2017-11-15	10	-96/+23
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Remove preserve_context_over_{fn, deferred}
\| * \| \| \|	Remove __PreservingContextDeferred too	Richard van der Hoff	2017-11-14	1	-30/+0
\| \| \| \| \|
\| * \| \| \|	Remove preserve_context_over_{fn, deferred}	Richard van der Hoff	2017-11-14	10	-66/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Both of these functions ae known to leak logcontexts. Replace the remaining calls to them and kill them off.
* \| \| \| \|	Merge pull request #2650 from matrix-org/dbkr/push_include_content_option	David Baker	2017-11-15	2	-15/+32
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Rename redact_content option to include_content
\| * \| \| \| \|	Print instead of logging	David Baker	2017-11-13	1	-11/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	because we had to wait until the logger was set up
\| * \| \| \| \|	Make the commented config have the default	David Baker	2017-11-09	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	better comments	David Baker	2017-11-08	1	-2/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Log if any of the old config flags are set	David Baker	2017-11-08	1	-2/+24
\| \| \| \| \| \|
\| * \| \| \| \|	Rename redact_content option to include_content	David Baker	2017-11-08	2	-16/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The redact_content option never worked because it read the wrong config section. The PR introducing it (https://github.com/matrix-org/synapse/pull/2301) had feedback suggesting the name be changed to not re-use the term 'redact' but this wasn't incorporated. This reanmes the option to give it a less confusing name, and also means that people who've set the redact_content option won't suddenly see a behaviour change when upgrading synapse, but instead can set include_content if they want to. This PR also updates the wording of the config comment to clarify that this has no effect on event_id_only push. Includes https://github.com/matrix-org/synapse/pull/2422
* \| \| \| \| \|	Merge pull request #2648 from krombel/update_prometheus	Richard van der Hoff	2017-11-14	3	-1/+78
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update prometheus-config to new format
\| * \| \| \| \| \|	Make clear that the config has changed since prometheus v2	Krombel	2017-11-14	3	-2/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This restores the config that is usable for prometheus pre v2.0.0 The new config only works for Prometheus v2+
\| * \| \| \| \| \|	update prometheus-config to new format	Krombel	2017-11-07	2	-23/+67
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2671 from matrix-org/rav/room_list_fixes	Richard van der Hoff	2017-11-14	1	-20/+30
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reshuffle room list request code
\| * \| \| \| \| \| \|	Reshuffle room list request code	Richard van der Hoff	2017-11-14	1	-27/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I'm not entirely sure if this will actually help anything, but it simplifies the code and might give further clues about why room list search requests are blowing out the get_current_state_ids caches.
\| * \| \| \| \| \| \|	Add a load of logging to the room_list handler	Richard van der Hoff	2017-11-14	1	-0/+13
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So we can see what it gets up to.
* \| \| \| \| \| \|	Merge pull request #2673 from matrix-org/erikj/fix_port_script_groups	Richard van der Hoff	2017-11-14	1	-0/+7
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|	Add new boolean columns to port script
\| * \| \| \| \| \|	Less s's	Erik Johnston	2017-11-14	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add new boolean columns to port script	Erik Johnston	2017-11-14	1	-0/+7
\|/ / / / / /
* \| \| \| \| /	Bump version and changelog v0.25.0-rc1	Erik Johnston	2017-11-14	2	-1/+51
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Merge pull request #2658 from matrix-org/rav/store_heirarchy_init	Richard van der Hoff	2017-11-14	22	-44/+44
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Make __init__ consistent across Store hierarchy
\| * \| \| \|	Fix tests for Store.__init__ update	Richard van der Hoff	2017-11-13	5	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the test to pass the right number of args to the Store constructors
\| * \| \| \|	Make __init__ consitstent across Store heirarchy	Richard van der Hoff	2017-11-13	17	-33/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add db_conn parameters to the `__init__` methods of the *Store classes, so that they are all consistent, which makes the multiple inheritance work correctly (and so that we can later extract mixins which can be used in the slavedstores)
* \| \| \| \|	Merge pull request #2668 from turt2live/travis/whoami	Richard van der Hoff	2017-11-14	1	-0/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add a route for determining who you are
\| * \| \| \| \|	Remove redundent call	Travis Ralston	2017-11-13	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Travis Ralston <travpc@gmail.com>
\| * \| \| \| \|	Add a route for determining who you are	Travis Ralston	2017-11-12	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Useful for applications which may have an access token, but no idea as to who owns it. Signed-off-by: Travis Ralston <travpc@gmail.com>
* \| \| \| \| \|	Merge pull request #2669 from matrix-org/rav/cache_urlpreview_failure	Richard van der Hoff	2017-11-13	1	-41/+47
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache failures in url_preview handler
\| * \| \| \| \| \|	Bit more logging	Richard van der Hoff	2017-11-10	1	-0/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Cache failures in url_preview handler	Richard van der Hoff	2017-11-10	1	-41/+45
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reshuffle the caching logic in the url_preview handler so that failures are cached (and to generally simplify things and fix the logcontext leaks).
* \| \| \| \| \|	Merge pull request #2663 from matrix-org/rav/invalid_request_utf8	Richard van der Hoff	2017-11-13	1	-1/+2
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Fix 500 on invalid utf-8 in request
\| * \| \| \| \|	Merge branch 'develop' into rav/invalid_request_utf8	Richard van der Hoff	2017-11-13	6	-18/+46
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Revert "move _state_group_cache to statestore"	Erik Johnston	2017-11-13	2	-12/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit f5cf3638e9c6086e1c33ddad8eda9298cf53a58e.
* \| \| \| \| \|	Up cache size of get_global_account_data_by_type_for_user	Erik Johnston	2017-11-13	1	-1/+1
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #2662 from matrix-org/rav/fix_mxids_again	Richard van der Hoff	2017-11-10	3	-5/+32
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Downcase userid on registration
\| * \| \| \| \|	Add some more comments appservice user registration	Richard van der Hoff	2017-11-10	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explain why we don't validate userids registered via app services
\| * \| \| \| \|	Downcase userids for shared-secret registration	Richard van der Hoff	2017-11-10	2	-3/+21
\| \| \| \| \| \|
\| * \| \| \| \|	Downcase userid on registration	Richard van der Hoff	2017-11-09	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Force username to lowercase before attempting to register https://github.com/matrix-org/synapse/issues/2660
\| * \| \| \| \|	Revert "Allow upper-case characters in mxids"	Richard van der Hoff	2017-11-09	1	-3/+3
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit b70b64690330c25cbd04c1b2cacf8276b566efc8.
\| * / / /	Fix 500 on invalid utf-8 in request	Richard van der Hoff	2017-11-10	1	-1/+2
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If somebody sends us a request where the the body is invalid utf-8, we should return a 400 rather than a 500. (json.loads throws a UnicodeError in this situation) We might as well catch all Exceptions here: it seems very unlikely that we would get a request that *isn't caused by invalid json.
* \| \| \|	Merge pull request #2659 from ↵	Richard van der Hoff	2017-11-09	1	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/rav/apparently_we_dont_follow_our_own_spec_now Allow upper-case characters in mxids
\| * \| \| \|	Allow upper-case characters in mxids	Richard van der Hoff	2017-11-09	1	-3/+3
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Because we're never going to be able to fix this :'(
* \| \| \|	Fix typo	Erik Johnston	2017-11-09	1	-1/+1
\| \| \| \|
* \| \| \|	Register group servlet	Erik Johnston	2017-11-09	1	-0/+1
\| \| \| \|
* \| \| \|	Merge pull request #2657 from matrix-org/erikj/group_visibility_namespace	Luke Barnard	2017-11-09	1	-9/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Namespace visibility options for groups
\| * \| \| \|	Namespace visibility options for groups	Erik Johnston	2017-11-09	1	-9/+19
\|/ / / /
* \| \| \|	Merge pull request #2656 from matrix-org/rav/fix_deactivate	Richard van der Hoff	2017-11-09	1	-2/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix 'NoneType' not iterable in /deactivate
\| * \| \| \|	Fix 'NoneType' not iterable in /deactivate	Richard van der Hoff	2017-11-09	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make sure we actually return a value from user_delete_access_tokens
* \| \| \| \|	Merge pull request #2651 from matrix-org/erikj/update_group_room_settings	Erik Johnston	2017-11-09	6	-29/+120
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Change so that update group room visibility isn't an upsert
\| * \| \| \| \|	Add brackets	Erik Johnston	2017-11-09	1	-2/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Have an explicit API to update room config	Erik Johnston	2017-11-08	6	-1/+100
\| \| \| \| \| \|
\| * \| \| \| \|	Revert "Modify group room association API to allow modification of is_public"	Erik Johnston	2017-11-08	6	-32/+22
\|/ / / / /
* \| \| \| \|	Merge pull request #2631 from xyzz/fix_appservice_event_backlog	Erik Johnston	2017-11-08	2	-8/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix appservices being backlogged and not receiving new events due to a bug in notify_interested_services
\| * \| \| \| \|	Remove useless assignment in notify_interested_services	Ilya Zhuravlev	2017-11-07	1	-1/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Fix appservice tests to account for new behavior of notify_interested_services	Ilya Zhuravlev	2017-11-02	1	-3/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Fix appservices being backlogged and not receiving new events due to a bug ↵	Ilya Zhuravlev	2017-11-02	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in notify_interested_services
* \| \| \| \| \|	Merge pull request #2637 from spantaleev/avoid-noop-media-deletes	Erik Johnston	2017-11-08	1	-0/+6
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|	Avoid no-op media deletes
\| * \| \| \| \|	Avoid no-op media deletes	Slavi Pantaleev	2017-11-04	1	-0/+6
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
* \| \| \| \|	Merge pull request #2649 from matrix-org/rav/fix_delta_on_state_res	Richard van der Hoff	2017-11-08	3	-33/+58
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug in state group storage
\| * \| \| \| \|	s/items/iteritems/	Richard van der Hoff	2017-11-08	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Update deltas when doing auth resolution	Richard van der Hoff	2017-11-07	1	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes a bug where the persisted state groups were different to those actually being used after auth resolution.
\| * \| \| \| \|	factor out _update_context_for_auth_events	Richard van der Hoff	2017-11-07	1	-20/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is duplicated, so let's factor it out before fixing it
\| * \| \| \| \|	move _state_group_cache to statestore	Richard van der Hoff	2017-11-07	2	-13/+12
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	this is internal to statestore, so let's keep it there.
* \| \| \| \|	Merge pull request #2643 from matrix-org/matthew/user_dir_typos	Matthew Hodgson	2017-11-07	6	-14/+55
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Fix various embarrassing typos around user_directory and add some doc.
\| * \| \| \|	create new indexes before dropping old ones to keep safetynet in place	Matthew Hodgson	2017-11-07	1	-2/+4
\| \| \| \| \|
\| * \| \| \|	s/users_in_pubic_room/users_in_public_rooms/g	Matthew Hodgson	2017-11-04	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	s/users_in_pubic_room/users_in_public_rooms/g	Matthew Hodgson	2017-11-04	2	-10/+32
\| \| \| \| \|
\| * \| \| \|	fix copyright....	Matthew Hodgson	2017-11-04	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	s/popualte/populate/	Matthew Hodgson	2017-11-04	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	s/intial/initial/	Matthew Hodgson	2017-11-04	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	simplify instructions for regenerating user_dir	Matthew Hodgson	2017-11-04	1	-0/+17
\| \|/ / /
* \| \| \|	Merge pull request #2636 from farialima/me-master	Erik Johnston	2017-11-07	1	-13/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix for #2635: correctly update rooms avatar/display name when modified by admin
\| * \| \| \|	removed unused import flagged by flake8a	Francois Granade	2017-11-03	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Fix for issue 2635: correctly update rooms avatar/display name when modified ↵	Francois Granade	2017-11-03	1	-12/+8
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	by admin
* \| \| \|	Revert "Merge branch 'master' of github.com:matrix-org/synapse into develop"	Erik Johnston	2017-11-07	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit f9b255cd62fe724e16b2222f6af623b2d39282ab, reversing changes made to 1bd654dabde776bbb7ee365c115b307cd6a110b8.
* \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-11-07	1	-10/+1
\|\\| \| \| \| \|_\|/ \|/\| \|
\| * \|	Merge pull request #2598 from matrix-org/revert-2596-erikj/attestation_jitter	Erik Johnston	2017-10-27	1	-12/+1
\| \|\ \ \| \| \| \| \| \| \| \|	Revert "Add jitter to validity period of attestations"
\| \| * \|	Revert "Add jitter to validity period of attestations"	Erik Johnston	2017-10-27	1	-12/+1
\| \|/ /
\| * \|	Merge pull request #2596 from matrix-org/erikj/attestation_jitter	Erik Johnston	2017-10-27	1	-1/+12
\| \|\ \ \| \| \| \| \| \| \| \|	Add jitter to validity period of attestations
* \| \ \	Merge pull request #2647 from matrix-org/luke/get-group-users-is-privileged	Luke Barnard	2017-11-07	2	-3/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Return whether a user is an admin within a group
\| * \| \| \|	Remember to pick is_admin out of the db	Luke Barnard	2017-11-07	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Return whether a user is an admin within a group	Luke Barnard	2017-11-07	1	-2/+3
\|/ / / /
* \| \| \|	Merge pull request #2576 from maximevaillancourt/exclude-noscript-url-preview	Matthew Hodgson	2017-11-07	1	-1/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Ignore <noscript> tags when generating URL preview descriptions
\| * \| \| \|	Ignore noscript tags when generating URL previews	Maxime Vaillancourt	2017-10-25	1	-1/+8
\| \| \| \| \|
* \| \| \| \|	Merge pull request #2646 from matrix-org/rav/logging_for_limiter	Richard van der Hoff	2017-11-07	1	-7/+17
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|	Logging and logcontext fixes for Limiter
\| * \| \| \|	Logging and logcontext fixes for Limiter	Richard van der Hoff	2017-11-07	1	-7/+17
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \|	Merge pull request #2630 from matrix-org/luke/fix-rooms-in-group	David Baker	2017-11-02	1	-3/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Make the get_rooms_in_group API more sane
\| * \| \| \|	Make the get_rooms_in_group API more sane	Luke Barnard	2017-11-02	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return entries with is_public = True when they're public and is_public = False otherwise.
* \| \| \| \|	Merge pull request #2629 from matrix-org/rav/register_inhibit_login	David Baker	2017-11-02	1	-12/+16
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	support inhibit_login in /register
\| * \| \| \|	support inhibit_login in /register	Richard van der Hoff	2017-11-02	1	-12/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow things to pass inhibit_login when registering to ... inhibit logins.
* \| \| \| \|	Merge pull request #2628 from matrix-org/rav/module_api_hooks	David Baker	2017-11-02	1	-0/+34
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add more hooks to ModuleApi
\| * \ \ \ \	Merge remote-tracking branch 'origin/develop' into rav/module_api_hooks	David Baker	2017-11-02	3	-45/+137
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #2627 from matrix-org/rav/custom_rest_endpoints	David Baker	2017-11-02	3	-0/+74
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a hook for custom rest endpoints
\| * \| \| \| \| \|	Add a hook for custom rest endpoints	Richard van der Hoff	2017-11-02	3	-0/+74
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let the user specify custom modules which can be used for implementing extra endpoints.
* \| \| \| \| \|	Merge pull request #2626 from matrix-org/rav/refactor_module_api	David Baker	2017-11-02	3	-70/+83
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Factor _AccountHandler proxy out to ModuleApi
* \ \ \ \ \ \	Merge pull request #2625 from matrix-org/rav/named_resource_refactor	David Baker	2017-11-02	1	-46/+64
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Factor out _configure_named_resource
\| * \| \| \| \| \|	Factor out _configure_named_resource	Richard van der Hoff	2017-11-02	1	-46/+64
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was a bit of a code vomit, so let's factor it out to preserve some sanity
\| \| * / / /	Add more hooks to ModuleApi	Richard van der Hoff	2017-11-02	1	-0/+34
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add `get_user_by_req` and `invalidate_access_token`
\| * / / /	Factor _AccountHandler proxy out to ModuleApi	Richard van der Hoff	2017-11-02	3	-70/+83
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We're going to need to use this from places that aren't password auth, so let's move it to a proper class.
* \| \| \|	Merge pull request #2624 from matrix-org/rav/password_provider_notify_logout	David Baker	2017-11-02	3	-7/+42
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Notify auth providers on logout
\| * \| \| \|	Notify auth providers on logout	Richard van der Hoff	2017-11-01	3	-7/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide a hook by which auth providers can be notified of logouts.
* \| \| \| \|	Merge pull request #2623 from matrix-org/rav/callbacks_for_auth_providers	David Baker	2017-11-02	3	-7/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Allow password_auth_providers to return a callback
\| * \| \| \| \|	Fix user-interactive password auth	Richard van der Hoff	2017-11-01	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this got broken in the previous commit
\| * \| \| \| \|	Allow password_auth_providers to return a callback	Richard van der Hoff	2017-11-01	3	-6/+17
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... so that they have a way to record access tokens.
* \| \| \| \|	Merge pull request #2622 from matrix-org/rav/db_access_for_auth_providers	David Baker	2017-11-02	1	-0/+16
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Let auth providers get to the database
\| * \| \| \|	Let auth providers get to the database	Richard van der Hoff	2017-10-31	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Somewhat open to abuse, but also somewhat unavoidable :/
* \| \| \| \|	Merge pull request #2620 from matrix-org/rav/auth_non_password	Richard van der Hoff	2017-11-01	2	-32/+139
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Let password auth providers handle arbitrary login types
\| * \| \| \| \|	Let password auth providers handle arbitrary login types	Richard van der Hoff	2017-11-01	2	-32/+139
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide a hook where password auth providers can say they know about other login types, and get passed the relevant parameters
* \| \| \| \|	Merge pull request #2621 from matrix-org/rav/refactor_accesstoken_delete	David Baker	2017-11-01	6	-27/+62
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Move access token deletion into auth handler
\| * \ \ \ \	Merge remote-tracking branch 'origin/develop' into ↵	David Baker	2017-11-01	15	-98/+65
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rav/refactor_accesstoken_delete
\| * \| \| \| \| \|	Move access token deletion into auth handler	Richard van der Hoff	2017-11-01	6	-27/+62
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \|	Merge pull request #2617 from matrix-org/matthew/auto-displayname	Matthew Hodgson	2017-11-01	1	-2/+4
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	automatically set default displayname on register
\| * \| \| \| \|	switch to setting default displayname in the storage layer	Matthew Hodgson	2017-11-01	2	-10/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to avoid clobbering guest user displaynames on registration
\| * \| \| \| \|	automatically set default displayname on register	Matthew Hodgson	2017-11-01	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to avoid leaking ugly MXIDs and cluttering up the timeline with displayname changes as well as membership joins for autojoin rooms (e.g. the status autojoin rooms), automatically set the displayname to match the localpart of the mxid upon registration.
* \| \| \| \| \|	Merge pull request #2615 from matrix-org/rav/break_auth_device_dep	David Baker	2017-11-01	3	-13/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Break dependency of auth_handler on device_handler
\| * \| \| \| \| \|	Break dependency of auth_handler on device_handler	Richard van der Hoff	2017-11-01	3	-13/+6
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I'm going to need to make the device_handler depend on the auth_handler, so I need to break this dependency to avoid a cycle. It turns out that the auth_handler was only using the device_handler in one place which was an edge case which we can more elegantly handle by throwing an error rather than fixing it up.
* \| \| \| \| \|	Merge pull request #2613 from matrix-org/rav/kill_refresh_tokens	David Baker	2017-11-01	6	-63/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the last vestiges of refresh_tokens
\| * \| \| \| \| \|	Fix tests for refresh_token removal	Richard van der Hoff	2017-11-01	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove the last vestiges of refresh_tokens	Richard van der Hoff	2017-10-31	5	-60/+14
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #2618 from matrix-org/dbkr/log_login_requests	David Baker	2017-11-01	1	-0/+10
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Log login requests
\| * \| \| \| \|	Apparently this is python	David Baker	2017-11-01	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Log login requests	David Baker	2017-11-01	1	-0/+10
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Carefully though, to avoid logging passwords
* \| \| \| \|	Merge pull request #2612 from matrix-org/luke/groups-room-relationship-is-public	Luke Barnard	2017-11-01	6	-22/+32
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Modify group room association API to allow modification of is_public
\| * \| \| \|	Leave `is_public` as required argument of update_room_group_association	Luke Barnard	2017-11-01	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Update docs for updating room group association	Luke Barnard	2017-11-01	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	Flake8	Luke Barnard	2017-10-31	2	-5/+9
\| \| \| \| \|
\| * \| \| \|	Modify group room association API to allow modification of is_public	Luke Barnard	2017-10-31	6	-19/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	also includes renamings to make things more consistent.
* \| \| \| \|	Merge pull request #2610 from matrix-org/rav/schema_for_pw_providers	Richard van der Hoff	2017-10-31	4	-0/+90
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	DB schema interface for password auth providers
\| * \| \| \| \|	fix tests	Richard van der Hoff	2017-10-31	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	DB schema interface for password auth providers	Richard van der Hoff	2017-10-31	3	-0/+89
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide an interface by which password auth providers can register db schema files to be run at startup
* \| \| \| \|	Merge pull request #2611 from matrix-org/dbkr/port_script_drop_nuls	Richard van der Hoff	2017-10-31	1	-7/+19
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Make the port script drop NUL values in all tables
\| * \| \| \|	Make the port script drop NUL values in all tables	David Baker	2017-10-31	1	-7/+19
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Postgres doesn't support NULs in strings so it makes the script throw an exception and stop if any values contain \0. Drop them with appropriate warning.
* \| \| \|	Merge pull request #2609 from matrix-org/rav/refactor_login	David Baker	2017-10-31	2	-57/+78
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Refactor some logic from LoginRestServlet into AuthHandler
\| * \| \| \|	Refactor some logic from LoginRestServlet into AuthHandler	Richard van der Hoff	2017-10-31	2	-57/+78
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I'm going to need some more flexibility in handling login types in password auth providers, so as a first step, move some stuff from LoginRestServlet into AuthHandler. In particular, we pass everything other than SAML, JWT and token logins down to the AuthHandler, which now has responsibility for checking the login type and fishing the password out of the login dictionary, as well as qualifying the user_id if need be. Ideally SAML, JWT and token would go that way too, but there's no real need for it right now and I'm trying to minimise impact. This commit should be non-functional.
* \| \| \| \|	Merge pull request #2607 from matrix-org/rav/cleanup_ldap_hacks	Richard van der Hoff	2017-10-31	1	-20/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Clean up backwards-compat hacks for ldap
\| * \| \| \| \|	Clean up backwards-compat hacks for ldap	Richard van der Hoff	2017-10-31	1	-20/+19
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	try to make the backwards-compat flows follow the same code paths as the modern impl. This commit should be non-functional.
* \| \| \| \|	Merge pull request #2608 from matrix-org/rav/password_provider_doc	David Baker	2017-10-31	1	-0/+39
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Start some documentation on password providers
\| * \| \| \|	Start some documentation on password providers	Richard van der Hoff	2017-10-31	1	-0/+39
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Document the existing interface, before I start adding new stuff.
* \| \| \|	Merge pull request #2605 from matrix-org/luke/fix-group-creation-error-wording	Richard van der Hoff	2017-10-30	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix wording on group creation error
\| * \| \| \|	Fix wording on group creation error	Luke Barnard	2017-10-30	1	-1/+1
\|/ / / /
* \| \| \|	fix typo	Matthew Hodgson	2017-10-29	1	-1/+1
\| \| \| \|
* \| \| \|	move url_previews to MD as RST does my head in	Matthew Hodgson	2017-10-29	1	-0/+2
\| \| \| \|
* \| \| \|	Merge pull request #2599 from matrix-org/erikj/groups_invite	Erik Johnston	2017-10-27	1	-1/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix typo when checking if user is invited to group
\| * \| \| \|	Fix typo when checking if user is invited to group	Erik Johnston	2017-10-27	1	-1/+4
\|/ / / /
* \| \| \|	Fix bad merge	Erik Johnston	2017-10-27	1	-1/+3
\| \| \| \|
* \| \| \|	Merge branch 'erikj/attestation_jitter' of github.com:matrix-org/synapse ↵	Erik Johnston	2017-10-27	1	-1/+11
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \|	into develop
\| * \| \|	Add jitter to validity period of attestations	Erik Johnston	2017-10-27	1	-1/+12
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \|	This helps ensure that the renewals of attestations are spread out more evenly.
* \| \|	Merge branch 'erikj/attestation_local_fix' of github.com:matrix-org/synapse ↵	Erik Johnston	2017-10-27	3	-9/+36
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	into develop
\| * \| \|	Import logger	Erik Johnston	2017-10-27	1	-0/+5
\| \| \| \|
\| * \| \|	Fixup	Erik Johnston	2017-10-27	2	-5/+5
\| \| \| \|
\| * \| \|	Remove incorrect attestations	Erik Johnston	2017-10-27	2	-0/+19
\| \| \| \|
\| * \| \|	Log if we try to do attestations for our own user and group	Erik Johnston	2017-10-27	1	-2/+8
\| \| \| \|
\| * \| \|	Don't generate group attestations for local users	Erik Johnston	2017-10-27	1	-2/+3
\| \|/ /
* \| \|	Merge pull request #2595 from matrix-org/erikj/attestation_commnet	Erik Johnston	2017-10-27	1	-0/+22
\|\ \ \ \| \| \| \| \| \| \| \|	Add comment about attestations
\| * \| \|	Add comment about attestations	Erik Johnston	2017-10-27	1	-0/+22
\| \| \| \|
* \| \| \|	Merge pull request #2591 from matrix-org/rav/device_delete_auth	Richard van der Hoff	2017-10-27	1	-5/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Device deletion: check UI auth matches access token
\| * \| \| \|	Device deletion: check UI auth matches access token	Richard van der Hoff	2017-10-27	1	-5/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(otherwise there's no point in the UI auth)
* \| \| \| \|	Merge pull request #2589 from matrix-org/rav/as_deactivate_account	Richard van der Hoff	2017-10-27	2	-17/+33
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Allow ASes to deactivate their own users
\| * \| \| \| \|	Allow ASes to deactivate their own users	Richard van der Hoff	2017-10-27	2	-17/+33
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #2582 from matrix-org/luke/group-is-public	Luke Barnard	2017-10-27	6	-98/+190
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	Add is_public to groups table to allow for private groups
\| * \| \| \|	Request is_public from database	Luke Barnard	2017-10-27	1	-1/+3
\| \| \| \| \|
\| * \| \| \|	group is dict	Luke Barnard	2017-10-27	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Create groups with is_public = True	Luke Barnard	2017-10-27	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Fix create_group to pass requester_user_id	Luke Barnard	2017-10-27	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Correct logic for checking private group membership	Luke Barnard	2017-10-27	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Make it work	Luke Barnard	2017-10-26	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Recreate groups table instead of adding column	Luke Barnard	2017-10-26	1	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding a column with non-constant default not possible in sqlite3
\| * \| \| \|	Awful hack to get default true	Luke Barnard	2017-10-26	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Add groups table to BOOLEAN_COLUMNS in synapse_port_db	Luke Barnard	2017-10-26	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Bump schema version to 46	Luke Barnard	2017-10-26	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	delint	Luke Barnard	2017-10-26	2	-15/+67
\| \| \| \| \|
\| * \| \| \|	Add is_public to groups table to allow for private groups	Luke Barnard	2017-10-26	3	-95/+116
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent group API access to non-members for private groups Also make all the group code paths consistent with `requester_user_id` always being the User ID of the requesting user.
* \| \| \| \|	Merge pull request #2586 from matrix-org/rav/frontend_proxy_auth_header	Richard van der Hoff	2017-10-27	2	-28/+87
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Front-end proxy: pass through auth header
\| * \| \| \| \|	Docstring for post_urlencoded_get_json	Richard van der Hoff	2017-10-27	1	-0/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Front-end proxy: pass through auth header	Richard van der Hoff	2017-10-26	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So that access-token-in-an-auth-header works.
\| * \| \| \| \|	SimpleHTTPClient: add support for headers	Richard van der Hoff	2017-10-26	1	-28/+69
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sometimes we need to pass headers into these methods
* \| \| \| \| \|	Merge pull request #2585 from matrix-org/rav/unstable_to_r0	Richard van der Hoff	2017-10-27	1	-2/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support /keys/upload on /r0 as well as /unstable
\| * \| \| \| \| \|	Support /keys/upload on /r0 as well as /unstable	Richard van der Hoff	2017-10-26	1	-2/+1
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(So that we can stop riot relying on it in /unstable)
* \| \| \| \| \|	Merge pull request #2584 from matrix-org/rav/fix_httpclient_logcontexts	Richard van der Hoff	2017-10-27	1	-10/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix logcontext leaks in httpclient
\| * \| \| \| \| \|	Fix logcontext leaks in httpclient	Richard van der Hoff	2017-10-26	1	-10/+9
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`preserve_context_over_fn` is borked
* \| \| \| \| \|	Merge pull request #2574 from matrix-org/erikj/room_list_fixes	Erik Johnston	2017-10-27	4	-11/+22
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|	Add logging and fix log contexts for publicRooms
\| * \| \| \| \|	Update room_list.py	Erik Johnston	2017-10-26	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Do logcontexts outside ResponseCache	Erik Johnston	2017-10-25	5	-13/+21
\| \| \| \| \| \|
\| * \| \| \| \|	Add logging and fix log contexts for publicRooms	Erik Johnston	2017-10-25	2	-1/+4
\| \| \| \| \| \|
* \| \| \| \| \|	spell out need for libxml2 for lxml to work	Matthew Hodgson	2017-10-27	1	-1/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #2581 from matrix-org/rav/fix_init_with_no_logfile	Richard van der Hoff	2017-10-26	1	-1/+5
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Fix error when running synapse with no logfile
\| * \| \| \| \|	Fix error when running synapse with no logfile	Richard van der Hoff	2017-10-26	1	-1/+5
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes 'UnboundLocalError: local variable 'sighup' referenced before assignment'
* \| \| \| \|	Merge pull request #2579 from krombel/move_unstable_to_r0	Richard van der Hoff	2017-10-26	5	-27/+13
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	register some /unstable endpoints in /r0 as well
\| * \| \| \|	add release endpoints for /thirdparty	Krombel	2017-10-26	1	-7/+4
\| \| \| \| \|
\| * \| \| \|	register some /unstable endpoints in /r0 as well	Krombel	2017-10-26	4	-20/+9
\|/ / / /
* \| \| \|	Merge pull request #2578 from matrix-org/rav/code_style_imports	Richard van der Hoff	2017-10-26	1	-46/+113
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Code_style updates
\| * \| \| \|	Document import rules	Richard van der Hoff	2017-10-26	1	-0/+44
\| \| \| \| \|
\| * \| \| \|	code_style: more formatting	Richard van der Hoff	2017-10-26	1	-34/+57
\| \| \| \| \|
\| * \| \| \|	code_style.rst: a couple of tidyups	Richard van der Hoff	2017-10-26	1	-9/+9
\| \|/ / /
* \| \| \|	Merge pull request #2577 from matrix-org/erikj/fix_port	Erik Johnston	2017-10-26	1	-0/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Fix port script
\| * \| \|	Fix port script	Erik Johnston	2017-10-26	1	-0/+1
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We changed _simple_update_one_txn to use _simple_update_txn but didn't yank it out in the port script. Fixes #2565
* \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-10-25	2	-1/+9
\|\\| \|
\| * \|	Merge branch 'release-v0.24.1' of github.com:matrix-org/synapse v0.24.1	Erik Johnston	2017-10-24	64	-159/+219
\| \|\ \