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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix unit tests	Erik Johnston	2016-08-26	2	-41/+6
\|
*	Use state handler instead of get_users_in_room/get_joined_hosts	Erik Johnston	2016-08-26	12	-27/+44
\|
*	Merge pull request #1048 from matrix-org/erikj/fix_mail_name	Erik Johnston	2016-08-26	1	-19/+20
\|\ \| \| \| \|	Fix room name in email notifs
\| *	Fix room name in email notifs	Erik Johnston	2016-08-26	1	-19/+20
\|/
*	Merge pull request #1047 from matrix-org/erikj/state_ids	Erik Johnston	2016-08-26	22	-417/+822
\|\ \| \| \| \|	Avoid pulling the full state of a room out so often.
\| *	Add is_host_joined to slave storage	Erik Johnston	2016-08-26	2	-3/+6
\| \|
\| *	Typo	Erik Johnston	2016-08-26	1	-1/+0
\| \|
\| *	Make None optional	Erik Johnston	2016-08-26	1	-1/+1
\| \|
\| *	Measure _filter_events_for_server	Erik Johnston	2016-08-26	1	-0/+2
\| \|
\| *	Don't pull out full state for _filter_events_for_server	Erik Johnston	2016-08-26	1	-1/+25
\| \|
\| *	Cache check_host_in_room	Erik Johnston	2016-08-26	2	-14/+41
\| \|
\| *	Add measure on check_host_in_room	Erik Johnston	2016-08-26	1	-11/+12
\| \|
\| *	Fix tests	Erik Johnston	2016-08-26	1	-5/+46
\| \|
\| *	Add new state storage funcs to replication	Erik Johnston	2016-08-26	1	-0/+3
\| \|
\| *	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids	Erik Johnston	2016-08-26	8	-15/+77
\| \|\ \| \|/ \|/\|
* \|	Merge pull request #1043 from matrix-org/erikj/backfill_fix	Erik Johnston	2016-08-26	1	-1/+3
\|\ \ \| \| \| \| \| \|	Fix None check in backfill
\| * \|	Fix None check in backfill	Erik Johnston	2016-08-25	1	-1/+3
\| \| \|
* \| \|	Merge pull request #1044 from matrix-org/paul/third-party-lookup	Paul Evans	2016-08-25	5	-13/+21
\|\ \ \ \| \| \| \| \| \| \| \|	Root the 3PE lookup API within /_matrix/app/unstable
\| * \| \|	Just sprintf the 'kind' argument into uri directly	Paul "LeoNerd" Evans	2016-08-25	1	-3/+1
\| \| \| \|
\| * \| \|	Move ThirdPartyEntityKind into api.constants so the expectation becomes that ↵	Paul "LeoNerd" Evans	2016-08-25	4	-9/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the value is significant
\| * \| \|	Root the 3PE lookup API within /_matrix/app/unstable instead of at toplevel	Paul "LeoNerd" Evans	2016-08-25	1	-3/+16
\| \| \| \|
\| * \| \|	APP_SERVICE_PREFIX is never used; don't bother	Paul "LeoNerd" Evans	2016-08-25	1	-1/+0
\|/ / /
* \| \|	Merge pull request #1041 from matrix-org/paul/third-party-lookup	Paul Evans	2016-08-25	4	-4/+56
\|\ \ \ \| \|/ / \|/\| \|	Extend 3PE lookup APIs for metadata query
\| * \|	appease pep8	Paul "LeoNerd" Evans	2016-08-25	1	-3/+2
\| \| \|
\| * \|	Don't need toplevel cache on 3PE lookup metadata any more	Paul "LeoNerd" Evans	2016-08-25	1	-8/+0
\| \| \|
\| * \|	Implement a ResponseCache around 3PE lookup metadata lookups	Paul "LeoNerd" Evans	2016-08-25	1	-11/+21
\| \| \|
\| * \|	Kill PROTOCOL_META since I'm not using it any more	Paul "LeoNerd" Evans	2016-08-25	1	-7/+0
\| \| \|
\| * \|	Actually query over AS API for 3PE lookup metadata	Paul "LeoNerd" Evans	2016-08-25	2	-13/+21
\| \| \|
\| * \|	Move static knowledge of protocol metadata into AS handler; cache the result	Paul "LeoNerd" Evans	2016-08-24	2	-22/+25
\| \| \|
\| * \|	Declare 'gitter' known protocol, with user lookup	Paul "LeoNerd" Evans	2016-08-24	1	-0/+3
\| \| \|
\| * \|	Initial hack at the 3PN protocols metadata lookup API	Paul "LeoNerd" Evans	2016-08-24	3	-0/+44
\| \| \|
\| * \|	Move 3PU/3PL lookup APIs into /thirdparty containing entity	Paul "LeoNerd" Evans	2016-08-24	2	-4/+4
\| \| \|
\| \| *	Make sync not pull out full state	Erik Johnston	2016-08-25	2	-34/+74
\| \| \|
\| \| *	Fix up push to use get_current_state_ids	Erik Johnston	2016-08-25	4	-57/+87
\| \| \|
\| \| *	Pull out full state less	Erik Johnston	2016-08-25	2	-10/+15
\| \| \|
\| \| *	Add desc	Erik Johnston	2016-08-25	1	-1/+2
\| \| \|
\| \| *	Replace context.current_state with context.current_state_ids	Erik Johnston	2016-08-25	15	-270/+435
\| \| \|
\| \| *	Pull out event ids rather than full events for state	Erik Johnston	2016-08-25	4	-55/+119
\| \|/ \|/\|
* \|	Merge branch 'release-v0.17.1' of github.com:matrix-org/synapse into develop	Erik Johnston	2016-08-24	2	-1/+48
\|\ \
\| * \|	Bump changelog and version	Erik Johnston	2016-08-24	2	-1/+15
\| \| \|
\| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.1	Erik Johnston	2016-08-24	21	-106/+194
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge pull request #1042 from matrix-org/erikj/preserve_log_contexts	Erik Johnston	2016-08-24	17	-98/+134
\|\ \ \ \| \|_\|/ \|/\| \|	Preserve some logcontexts
\| * \|	Remove tracer	Erik Johnston	2016-08-24	1	-2/+1
\| \| \|
\| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2016-08-24	1	-2/+2
\| \|\ \ \| \|/ / \|/\| \| \| \| \|	erikj/preserve_log_contexts
* \| \|	Merge pull request #1040 from matrix-org/erikj/pagination	Erik Johnston	2016-08-24	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \|	Add None checks to backfill
\| * \ \	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/pagination	Erik Johnston	2016-08-24	2	-2/+13
\| \|\ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Add None checks to backfill	Erik Johnston	2016-08-24	1	-2/+2
\| \| \| \|
\| \| * \|	Preserve some logcontexts	Erik Johnston	2016-08-24	18	-99/+136
\| \|/ / \|/\| \|
* \| \|	Merge pull request #1039 from matrix-org/kegan/join-with-custom-content	Kegsay	2016-08-23	2	-2/+13
\|\ \ \ \| \|/ / \|/\| \|	Pass through user-supplied content in /join/$room_id
\| * \|	Pass through user-supplied content in /join/$room_id	Kegan Dougal	2016-08-23	2	-2/+13
\|/ / \| \| \| \| \| \| \| \| \| \| \| \|	It was always intended to allow custom keys on the join event, but this has at some point been lost. Restore it. If the user specifies keys like "avatar_url" then they will be clobbered.
* \|	Merge pull request #1038 from matrix-org/erikj/receved_txn_purge	Erik Johnston	2016-08-23	2	-4/+45
\|\ \ \| \| \| \| \| \|	Delete old received_transactions rows
\| * \|	Delete old received_transactions	Erik Johnston	2016-08-22	2	-4/+45
\| \| \|
\| \| *	Bump changelog and version v0.17.1-rc1	Erik Johnston	2016-08-22	2	-1/+34
\| \|/ \|/\|
* \|	Merge pull request #1028 from matrix-org/dbkr/notifications_api	Erik Johnston	2016-08-22	4	-0/+156
\|\ \ \| \| \| \| \| \|	Add the Notifications API
\| * \	Merge branch 'develop' into dbkr/notifications_api	Matthew Hodgson	2016-08-20	24	-91/+750
\| \|\ \
\| * \| \|	Explicit join	David Baker	2016-08-18	1	-2/+2
\| \| \| \|
\| * \| \|	Use tuple comparison	David Baker	2016-08-18	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hopefully easier to read
\| * \| \|	Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api	David Baker	2016-08-18	53	-644/+1549
\| \|\ \ \
\| * \ \ \	Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api	David Baker	2016-08-11	208	-3563/+9806
\| \|\ \ \ \
\| * \| \| \| \|	Include the ts the notif was received at	David Baker	2016-05-24	2	-5/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Actually make the 'read' flag correct	David Baker	2016-05-23	1	-4/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Add GET /notifications API	David Baker	2016-05-23	4	-0/+155
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1037 from matrix-org/markjh/add_stats_to_prometheus	Mark Haines	2016-08-22	1	-2/+26
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|	Add usage stats to prometheus monitoring
\| * \| \| \| \|	Update comment	Mark Haines	2016-08-22	1	-1/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Add usage stats to prometheus monitoring	Mark Haines	2016-08-22	1	-2/+25
\|/ / / / /
* \| \| \| \|	Merge pull request #1031 from matrix-org/erikj/measure_notifier	Erik Johnston	2016-08-22	6	-182/+186
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|	Add more Measure blocks
\| * \| \| \|	Add exception logging. Fix typo	Erik Johnston	2016-08-22	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Allow request handlers to override metric name	Erik Johnston	2016-08-22	1	-21/+31
\| \| \| \| \|
\| * \| \| \|	Use top level measure	Erik Johnston	2016-08-22	1	-15/+1
\| \| \| \| \|
\| * \| \| \|	Add a top level measure	Erik Johnston	2016-08-19	1	-45/+46
\| \| \| \| \|
\| * \| \| \|	Remove redundant measure	Erik Johnston	2016-08-19	1	-35/+34
\| \| \| \| \|
\| * \| \| \|	Only abort Measure on Exceptions	Erik Johnston	2016-08-19	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	defer.returnValue must not be called within Measure	Erik Johnston	2016-08-19	2	-9/+8
\| \| \| \| \|
\| * \| \| \|	Move defer.returnValue out of Measure	Erik Johnston	2016-08-19	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Update keyring Measure	Erik Johnston	2016-08-19	1	-85/+85
\| \| \| \| \|
\| * \| \| \|	Measure http.server render	Erik Johnston	2016-08-19	1	-28/+30
\| \| \| \| \|
\| * \| \| \|	Measure _get_event_from_row	Erik Johnston	2016-08-19	1	-41/+43
\| \| \| \| \|
\| * \| \| \|	Measure keyrings	Erik Johnston	2016-08-19	1	-34/+36
\| \| \| \| \|
\| * \| \| \|	Add measure blocks to notifier	Erik Johnston	2016-08-19	1	-15/+18
\| \| \| \| \|
* \| \| \| \|	Merge pull request #1032 from matrix-org/matthew/workerdoc	Matthew Hodgson	2016-08-19	2	-1/+98
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Matthew/workerdoc
\| * \| \| \| \|	PR feedback	Matthew Hodgson	2016-08-19	1	-5/+9
\| \| \| \| \| \|
\| * \| \| \| \|	quick guide to synapse scalability via workers	Matthew Hodgson	2016-08-19	1	-0/+93
\| \| \| \| \| \|
\| * \| \| \| \|	increase RAM reqs	Matthew Hodgson	2016-08-19	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #1030 from matrix-org/erikj/cache_contexts	Erik Johnston	2016-08-19	14	-87/+458
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Add concept of cache contexts
\| * \| \| \|	Ensure invalidation list does not grow unboundedly	Erik Johnston	2016-08-19	4	-20/+104
\| \| \| \| \|
\| * \| \| \|	Rename to on_invalidate	Erik Johnston	2016-08-19	3	-21/+15
\| \| \| \| \|
\| * \| \| \|	Make cache_context an explicit option	Erik Johnston	2016-08-19	3	-11/+30
\| \| \| \| \|
\| * \| \| \|	Move _bulk_get_push_rules_for_room to storage layer	Erik Johnston	2016-08-19	3	-34/+65
\| \| \| \| \|
\| * \| \| \|	Remove lru option	Erik Johnston	2016-08-19	9	-33/+18
\| \| \| \| \|
\| * \| \| \|	Add concept of cache contexts	Erik Johnston	2016-08-19	5	-20/+278
\| \| \| \| \|
* \| \| \| \|	Merge pull request #1029 from matrix-org/erikj/appservice_stream	Erik Johnston	2016-08-19	1	-2/+5
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Make get_new_events_for_appservice use indices
\| * \| \| \|	Make get_new_events_for_appservice use indices	Erik Johnston	2016-08-19	1	-2/+5
\|/ / / /
* \| \| \|	Merge pull request #1026 from matrix-org/paul/thirdpartylookup	Paul Evans	2016-08-18	7	-1/+189
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	3rd party entity lookup
\| * \| \|	Move validation logic for AS 3PE query response into ApplicationServiceApi ↵	Paul "LeoNerd" Evans	2016-08-18	2	-45/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	class, to keep the handler logic neater
\| * \| \|	More warnings about invalid results from AS 3PE query	Paul "LeoNerd" Evans	2016-08-18	1	-2/+7
\| \| \| \|
\| * \| \|	Avoid so much copypasta between 3PU and 3PL query by unifying around a ↵	Paul "LeoNerd" Evans	2016-08-18	4	-42/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ThirdPartyEntityKind enumeration
\| * \| \|	Minor syntax neatenings	Paul "LeoNerd" Evans	2016-08-18	2	-16/+10
\| \| \| \|
\| * \| \|	Appease pep8	Paul "LeoNerd" Evans	2016-08-18	1	-0/+2
\| \| \| \|
\| * \| \|	Authenticate 3PE lookup requests	Paul "LeoNerd" Evans	2016-08-18	1	-0/+6
\| \| \| \|
\| * \| \|	Copypasta the 3PU support code to also do 3PL	Paul "LeoNerd" Evans	2016-08-18	3	-3/+61
\| \| \| \|
\| * \| \|	Remove TODO note about request fields being strings - they're always strings	Paul "LeoNerd" Evans	2016-08-18	1	-2/+0
\| \| \| \|
\| * \| \|	Log a warning if an AS yields an invalid 3PU lookup result	Paul "LeoNerd" Evans	2016-08-18	1	-1/+6
\| \| \| \|
\| * \| \|	Scattergather the call out to ASes; validate received results	Paul "LeoNerd" Evans	2016-08-18	1	-7/+34
\| \| \| \|
\| * \| \|	Filter 3PU lookups by only ASes that declare knowledge of that protocol	Paul "LeoNerd" Evans	2016-08-18	3	-3/+22
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'origin/develop' into paul/thirdpartylookup	Paul "LeoNerd" Evans	2016-08-18	47	-549/+1206
\| \|\ \ \
\| * \| \| \|	Since empty lookups now return 200/empty list not 404, we can safely log ↵	Paul "LeoNerd" Evans	2016-08-18	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	failures as exceptions
\| * \| \| \|	Ensure that 3PU lookup request fields actually get passed in	Paul "LeoNerd" Evans	2016-08-18	1	-1/+5
\| \| \| \| \|
\| * \| \| \|	Extend individual list results into the main return list, don't append	Paul "LeoNerd" Evans	2016-08-18	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Don't catch the return-value-as-exception that @defer.inlineCallbacks will use	Paul "LeoNerd" Evans	2016-08-18	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Actually make 3PU lookup calls out to ASes	Paul "LeoNerd" Evans	2016-08-18	1	-1/+10
\| \| \| \| \|
\| * \| \| \|	Thread 3PU lookup through as far as the AS API object; which currently noöps it	Paul "LeoNerd" Evans	2016-08-17	3	-2/+33
\| \| \| \| \|
\| * \| \| \|	Initial empty implementation that just registers an API endpoint handler	Paul "LeoNerd" Evans	2016-08-17	2	-0/+40
\| \| \| \| \|
* \| \| \| \|	Merge pull request #1027 from matrix-org/erikj/appservice_stream	Erik Johnston	2016-08-18	7	-123/+367
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add appservice worker
\| * \| \| \| \|	Remove log lines	Erik Johnston	2016-08-18	1	-2/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Empty commit	Erik Johnston	2016-08-18	0	-0/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2016-08-18	1	-0/+1
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	erikj/appservice_stream
* \| \| \| \| \|	Jenkins: tox install setuptools	Erik Johnston	2016-08-18	1	-0/+1
\| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #1025 from matrix-org/erikj/appservice_stream	Erik Johnston	2016-08-18	5	-25/+113
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make AppserviceHandler stream events from database
\| \| * \| \| \|	Add appservice worker	Erik Johnston	2016-08-18	7	-123/+369
\| \|/ / / /
\| * / / /	Make AppserviceHandler stream events from database	Erik Johnston	2016-08-18	5	-25/+113
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is for two reasons: 1. Suppresses duplicates correctly, as the notifier doesn't do any duplicate suppression. 2. Makes it easier to connect the AppserviceHandler to the replication stream.
* \| \| \|	Missed a s/federation reader/media repository/ in a log message	Mark Haines	2016-08-18	1	-1/+1
\| \| \| \|
* \| \| \|	Merge pull request #1024 from matrix-org/markjh/media_repository	Mark Haines	2016-08-18	1	-0/+212
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Add a media repository worker
\| * \| \| \|	Add a media repository worker	Mark Haines	2016-08-18	1	-0/+212
\| \| \| \| \|
* \| \| \| \|	Merge pull request #1022 from matrix-org/erikj/as_notify_perf	Erik Johnston	2016-08-18	4	-130/+104
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make notify_interested_services faster
\| * \| \| \| \|	Make notify_interested_services faster	Erik Johnston	2016-08-17	4	-130/+104
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1023 from matrix-org/erikj/update_fix	Erik Johnston	2016-08-18	1	-0/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix push_display_name_rename schema update
\| * \| \| \| \| \|	Fix push_display_name_rename schema update	Erik Johnston	2016-08-17	1	-0/+3
\|/ / / / / /
* \| \| \| \| \|	Make push Measure finer grained	Erik Johnston	2016-08-17	1	-4/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1021 from matrix-org/erikj/mediasecurity_policy	Erik Johnston	2016-08-17	1	-0/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Set `Content-Security-Policy` on media repo
\| * \| \| \| \|	Set `Content-Security-Policy` on media repo	Erik Johnston	2016-08-17	1	-0/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is to inform browsers that they should sandbox the returned media. This is particularly cruical for javascript/HTML files.
* \| \| \| \|	Merge pull request #1011 from matrix-org/dbkr/contains_display_name_override	David Baker	2016-08-17	2	-16/+37
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Move display name rule
\| * \| \| \|	Empty commit to trigger re-test	David Baker	2016-08-17	0	-0/+0
\| \| \| \| \|
\| * \| \| \|	Add migration script	David Baker	2016-08-16	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To port existing rule actions & enable entries to the new name
\| * \| \| \|	Merge remote-tracking branch 'origin/develop' into ↵	David Baker	2016-08-16	11	-212/+324
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dbkr/contains_display_name_override
\| * \| \| \| \|	s/underride/override/ in the rule_id too	David Baker	2016-08-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Move display name rule	David Baker	2016-08-15	1	-16/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As per https://github.com/matrix-org/matrix-doc/pull/373 and comment
* \| \| \| \| \|	Add None check to _iterate_over_text	Erik Johnston	2016-08-17	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Change name of metric	Matrix	2016-08-17	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Move Measure block inside loop	Erik Johnston	2016-08-17	1	-9/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1019 from matrix-org/erikj/appservice_clean	Erik Johnston	2016-08-17	2	-32/+31
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up _ServiceQueuer
\| * \| \| \| \| \|	Clean up _ServiceQueuer	Erik Johnston	2016-08-17	2	-32/+31
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1018 from matrix-org/erikj/dead_appservice	Erik Johnston	2016-08-17	1	-39/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Remove dead appservice code
\| * \| \| \| \| \|	Remove dead appservice code	Erik Johnston	2016-08-17	1	-39/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #1017 from matrix-org/erikj/appservice_measure	Erik Johnston	2016-08-17	2	-19/+24
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Measure notify_interested_services
\| * \| \| \| \| \|	Update unit tests	Erik Johnston	2016-08-17	1	-0/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Measure notify_interested_services	Erik Johnston	2016-08-17	1	-19/+22
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1016 from matrix-org/erikj/short_circuit_cache	Erik Johnston	2016-08-17	1	-0/+3
\|\\| \| \| \| \| \| \| \|_\|/ / / / \|/\| \| \| \| \|	Don't update caches replication stream if tokens haven't advanced
\| * \| \| \| \|	Do it in storage function	Erik Johnston	2016-08-16	2	-1/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Don't update caches replication stream if tokens haven't advanced	Erik Johnston	2016-08-16	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #1015 from matrix-org/erikj/preview_url_fixes	Erik Johnston	2016-08-16	3	-160/+275
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix up preview URL API. Add tests.
\| * \| \| \| \|	Add lxml to jenkins-unittests.sh	Erik Johnston	2016-08-16	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Flake8	Erik Johnston	2016-08-16	1	-4/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix up preview URL API. Add tests.	Erik Johnston	2016-08-16	2	-158/+275
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This includes: - Splitting out methods of a class into stand alone functions, to make them easier to test. - Adding unit tests to split out functions, testing HTML -> preview. - Handle the fact that elements in lxml may have tail text.
* \| \| \| \|	Merge pull request #1012 from matrix-org/erikj/limit_backfill_uri	Erik Johnston	2016-08-16	1	-4/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Limit number of extremeties in backfill request
\| * \| \| \| \|	Limit number of extremeties in backfill request	Erik Johnston	2016-08-16	1	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This works around a bug where if we make a backfill request with too many extremeties it causes the request URI to be too long.
* \| \| \| \| \|	Merge pull request #1010 from matrix-org/erikj/refactor_deletions	Erik Johnston	2016-08-16	6	-47/+42
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to slaves.
\| * \| \| \| \|	Use cached get_user_by_access_token in slaves	Erik Johnston	2016-08-16	3	-2/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to ↵	Erik Johnston	2016-08-15	3	-45/+39
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	slaves.
* \| \| \| \|	Merge branch 'fix_integrity_retry' of https://github.com/Ralith/synapse into ↵	Erik Johnston	2016-08-16	1	-1/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \|	Ralith-fix_integrity_retry
\| * \| \| \|	Add missing database corruption recovery case	Benjamin Saunders	2016-08-14	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
* \| \| \| \|	Merge pull request #1009 from matrix-org/erikj/event_split	Erik Johnston	2016-08-15	24	-92/+367
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Split out /events to synchrotron
\| * \| \| \|	Doc get_next() context manager usage	Erik Johnston	2016-08-15	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Rename table. Add docs.	Erik Johnston	2016-08-15	4	-6/+16
\| \| \| \| \|
\| * \| \| \|	Remove broken cache stuff	Erik Johnston	2016-08-15	2	-21/+0
\| \| \| \| \|
\| * \| \| \|	Use cached version of get_aliases_for_room	Erik Johnston	2016-08-15	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Implement cache replication stream	Erik Johnston	2016-08-15	5	-30/+92
\| \| \| \| \|
\| * \| \| \|	Add some invalidations to a cache_stream	Erik Johnston	2016-08-15	7	-31/+117
\| \| \| \| \|
\| * \| \| \|	Always run txn.after_callbacks	Erik Johnston	2016-08-15	1	-7/+8
\| \| \| \| \|
\| * \| \| \|	Make synchrotron accept /events	Erik Johnston	2016-08-12	5	-18/+66
\| \| \| \| \|
\| * \| \| \|	Dont invoke get_handlers fromClientV1RestServlet	Erik Johnston	2016-08-12	9	-1/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hs.get_handlers() can not be invoked from split out processes. Moving the invocations down a level means that we can slowly split out individual servlets.
* \| \| \| \|	Merge pull request #1007 from sargon/develop	Erik Johnston	2016-08-14	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix some bugs in the auth/ldap handler
\| * \| \| \| \|	Log the value which is observed in the first place.	Daniel Ehlers	2016-08-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The name 'result' is of bool type and has no len property, resulting in a TypeError. Futhermore in the flow control conn.response is observed and hence should be reported. Signed-off-by: Daniel Ehlers <sargon@toppoint.de>
\| * \| \| \| \|	Fix AttributeError when bind_dn is not defined.	Daniel Ehlers	2016-08-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In case one does not define bind_dn in ldap configuration, filter attribute is not declared. Since auth code only uses ldap_filter attribute when according LDAP mode is selected, it is safe to only declare the attribute in that case. Signed-off-by: Daniel Ehlers <sargon@toppoint.de>
* \| \| \| \| \|	Merge pull request #1005 from matrix-org/erikj/linearize_joins	Erik Johnston	2016-08-12	1	-1/+1
\|\\| \| \| \| \| \| \|/ / / / \|/\| \| \| \|	Only process one local membership event per room at a time
\| * \| \| \|	Only process one local membership event per room at a time	Erik Johnston	2016-08-12	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #997 from Half-Shot/develop	Erik Johnston	2016-08-11	3	-5/+8
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	Don't change status_msg on /sync
\| * \| \|	Synced up synchrotron set_state with PresenceHandler set_state	Will Hunt	2016-08-11	1	-1/+1
\| \| \| \|
\| * \| \|	Don't change status_msg on /sync	Will Hunt	2016-08-10	2	-4/+7
\| \| \| \|
* \| \| \|	Merge pull request #1003 from matrix-org/erikj/redaction_prev_content	Erik Johnston	2016-08-11	1	-0/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Include prev_content in redacted state events
\| * \| \| \|	Include prev_content in redacted state events	Erik Johnston	2016-08-11	1	-0/+2
\|/ / / /
* \| \| \|	Merge pull request #1000 from matrix-org/erikj/contexts	Erik Johnston	2016-08-11	4	-221/+164
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Clean up TransactionQueue
\| * \| \| \|	PEP8	Erik Johnston	2016-08-10	1	-1/+3
\| \| \| \| \|
\| * \| \| \|	Clean up TransactionQueue	Erik Johnston	2016-08-10	4	-221/+162
\|/ / / /
* \| \| \|	Merge pull request #999 from matrix-org/erikj/measure_more	Erik Johnston	2016-08-10	2	-5/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Measure federation send transaction resources
\| * \| \| \|	Measure federation send transaction resources	Erik Johnston	2016-08-10	2	-5/+21
\| \|/ / /
* \| \| \|	Merge pull request #998 from matrix-org/erikj/pdu_fail_cache	Erik Johnston	2016-08-10	2	-21/+53
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Various federation /event/ improvements
\| * \| \|	Don't stop on 4xx series errors	Erik Johnston	2016-08-10	1	-11/+1
\| \| \| \|
\| * \| \|	Also check if server is in the room	Erik Johnston	2016-08-10	1	-2/+7
\| \| \| \|
\| * \| \|	Also pull out rejected events	Erik Johnston	2016-08-10	1	-1/+1
\| \| \| \|
\| * \| \|	Correctly auth /event/ requests	Erik Johnston	2016-08-10	1	-5/+6
\| \| \| \|
\| * \| \|	Only resign our own events	Erik Johnston	2016-08-10	1	-9/+10
\| \| \| \|
\| * \| \|	Store if we fail to fetch an event from a destination	Erik Johnston	2016-08-10	1	-1/+36
\|/ / /
* \| \|	Merge pull request #996 from matrix-org/erikj/tls_error	Erik Johnston	2016-08-10	2	-13/+19
\|\ \ \ \| \| \| \| \| \| \| \|	Don't print stack traces when failing to get remote keys
\| * \| \|	Don't print stack traces when failing to get remote keys	Erik Johnston	2016-08-10	2	-13/+19
\| \| \| \|
* \| \| \|	/login: Respond with a 403 when we get an invalid m.login.token	Richard van der Hoff	2016-08-09	1	-3/+3
\|/ / /
* \| \|	Merge pull request #995 from matrix-org/rav/clean_up_cas_login	David Baker	2016-08-09	1	-125/+33
\|\ \ \ \| \| \| \| \| \| \| \|	Clean up CAS login code
\| * \| \|	Clean up CAS login code	Richard van der Hoff	2016-08-08	1	-125/+33
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove some apparently unused code. Clean up parse_cas_response, mostly to catch the exception if the CAS response isn't valid XML.
* \| \|	Merge pull request #994 from matrix-org/rav/fix_cas_login	David Baker	2016-08-08	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Fix CAS login
\| * \| \|	Fix CAS login	Richard van der Hoff	2016-08-08	1	-0/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	Attempting to log in with CAS was giving a 500 error.
* \| \|	Merge pull request #993 from matrix-org/rav/fix_token_login	Richard van der Hoff	2016-08-08	4	-31/+87
\|\ \ \ \| \|/ / \|/\| \|	Fix token login
\| * \|	PEP8	Richard van der Hoff	2016-08-08	1	-0/+1
\| \| \|
\| * \|	Fix login with m.login.token	Richard van der Hoff	2016-08-08	4	-32/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	login with token (as used by CAS auth) was broken by 067596d, such that it always returned a 401.
* \| \|	Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse v0.17.0	Erik Johnston	2016-08-08	136	-1642/+5931
\|\ \ \
\| * \| \|	Capatailize HTML	Erik Johnston	2016-08-08	1	-1/+1
\| \| \| \|
\| * \| \|	Be bolder	Erik Johnston	2016-08-08	1	-1/+1
\| \| \| \|
\| * \| \|	Update changelog	Erik Johnston	2016-08-08	1	-3/+7
\| \| \| \|
\| * \| \|	Update changelog	Erik Johnston	2016-08-08	1	-1/+1
\| \| \| \|
\| * \| \|	Bump changelog and version	Erik Johnston	2016-08-08	2	-1/+16
\| \| \| \|
\| * \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0	Erik Johnston	2016-08-08	13	-68/+124
\| \|\\| \|
\| \| * \|	Merge pull request #992 from matrix-org/erikj/psutil_conditional	Erik Johnston	2016-08-08	3	-6/+16
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Make psutil optional
\| \| \| * \|	Make psutil optional	Erik Johnston	2016-08-08	3	-6/+16
\| \| \|/ /
\| \| * \|	Merge pull request #991 from matrix-org/erikj/retry_make	Erik Johnston	2016-08-05	1	-11/+24
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Retry joining via other servers if first one failed. Fix some other bugs.
\| \| \| * \|	Fix a couple of python bugs	Erik Johnston	2016-08-05	1	-6/+8
\| \| \| \| \|
\| \| \| * \|	Retry joining via other servers if first one failed	Erik Johnston	2016-08-05	1	-5/+16
\| \| \| \| \|
\| \| * \| \|	Merge pull request #990 from matrix-org/erikj/fed_vers	Erik Johnston	2016-08-05	6	-49/+80
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \|	Add federation /version API
\| \| \| * \|	Add federation /version API	Erik Johnston	2016-08-05	6	-9/+25
\| \| \| \| \|
\| \| \| * \|	Change the way we specify if we require auth or not	Erik Johnston	2016-08-05	1	-40/+55
\| \| \| \| \|
\| \| * \| \|	Print newline after result in federation_client script	Erik Johnston	2016-08-05	1	-0/+1
\| \| \| \| \|
\| \| * \| \|	Merge pull request #989 from matrix-org/erikj/raise_404	Erik Johnston	2016-08-05	1	-1/+1
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Raise 404 when couldn't find event
\| \| \| * \| \|	Raise 404 when couldn't find event	Erik Johnston	2016-08-05	1	-1/+1
\| \| \| \|/ /
\| \| * \| \|	Merge pull request #988 from matrix-org/erikj/ignore_comments_preview	Erik Johnston	2016-08-05	1	-1/+2
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \|	Don't include html comments in description
\| \| \| * \|	Don't include html comments in description	Erik Johnston	2016-08-05	1	-1/+2
\| \| \|/ /
\| * \| \|	Update changelog v0.17.0-rc4	Erik Johnston	2016-08-05	1	-2/+2
\| \| \| \|
\| * \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0	Erik Johnston	2016-08-05	1	-21/+50
\| \|\\| \|
\| \| * \|	Merge pull request #987 from matrix-org/erikj/fix_backfill_auth	Erik Johnston	2016-08-05	1	-21/+50
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Fix backfill auth events
\| \| \| * \|	Fix backfill auth events	Erik Johnston	2016-08-05	1	-21/+50
\| \| \|/ /
\| * \| \|	Bump version and changelog	Erik Johnston	2016-08-05	2	-1/+17
\| \| \| \|
\| * \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0	Erik Johnston	2016-08-05	25	-369/+1070
\| \|\\| \|
\| \| * \|	Merge pull request #986 from matrix-org/erikj/state	Erik Johnston	2016-08-05	1	-2/+16
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Check if we already have the events returned by /state/
\| \| \| * \|	Fix typo	Erik Johnston	2016-08-05	1	-1/+1
\| \| \| \| \|
\| \| \| * \|	Check if we already have the events returned by /state/	Erik Johnston	2016-08-05	1	-2/+16
\| \| \| \| \|
\| \| * \| \|	Merge pull request #985 from matrix-org/erikj/fix_integrity_retry	Erik Johnston	2016-08-05	2	-1/+9
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \|	Tweak integrity error recovery to work as intended
\| \| \| * \|	Delete more tables	Erik Johnston	2016-08-05	1	-0/+5
\| \| \| \| \|
\| \| \| * \|	Fallback to /state/ on both 400 and 404	Erik Johnston	2016-08-05	1	-1/+1
\| \| \| \| \|
\| \| \| * \|	Tweak integrity error recovery to work as intended	Benjamin Saunders	2016-08-04	2	-1/+4
\| \| \|/ /
\| \| * \|	Merge pull request #973 from matrix-org/erikj/xpath_fix	Erik Johnston	2016-08-04	2	-14/+211
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Change the way we summarize URLs
\| \| \| * \|	Typo	Erik Johnston	2016-08-04	1	-1/+1
\| \| \| \| \|
\| \| \| * \|	Test summarization	Erik Johnston	2016-08-04	2	-52/+193
\| \| \| \| \|
\| \| \| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/xpath_fix	Erik Johnston	2016-08-04	23	-349/+769
\| \| \| \|\ \
\| \| \| * \| \|	Don't infer paragrahs from newlines	Erik Johnston	2016-08-02	1	-2/+1
\| \| \| \| \| \|
\| \| \| * \| \|	Comment on why we clone	Erik Johnston	2016-08-02	1	-0/+1
\| \| \| \| \| \|
\| \| \| * \| \|	Spelling.	Erik Johnston	2016-08-02	1	-3/+3
\| \| \| \| \| \|
\| \| \| * \| \|	Make it actually compile	Erik Johnston	2016-08-02	1	-1/+1
\| \| \| \| \| \|
\| \| \| * \| \|	Change the way we summarize URLs	Erik Johnston	2016-08-02	1	-11/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using XPath is slow on some machines (for unknown reasons), so use a different approach to get a list of text nodes. Try to generate a summary that respect paragraph and then word boundaries, adding ellipses when appropriate.
\| \| * \| \| \|	Merge pull request #983 from matrix-org/erikj/retry_on_integrity_error	Erik Johnston	2016-08-04	1	-4/+66
\| \| \|\ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|	Retry event persistence on IntegrityError
\| \| \| * \| \|	Fix typo	Erik Johnston	2016-08-04	1	-3/+4
\| \| \| \| \| \|
\| \| \| * \| \|	Retry event persistence on IntegrityError	Erik Johnston	2016-08-04	1	-4/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to a bug in the porting script some backfilled events were not correctly persisted, causing irrecoverable IntegrityErrors on future attempts to persist those events. This commit adds a retry mechanism invoked upon IntegrityError, where when retried the tables are purged for all references to the events being persisted.
\| \| * \| \| \|	Merge pull request #979 from matrix-org/erikj/state_ids_api	Erik Johnston	2016-08-04	4	-1/+151
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|	Add /state_ids federation API
\| \| \| * \| \|	Fix typos.	Erik Johnston	2016-08-04	1	-3/+3
\| \| \| \| \| \|
\| \| \| * \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids_api	Erik Johnston	2016-08-04	18	-305/+572
\| \| \| \|\ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|