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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Oops, forgot the desc.	David Baker	2016-04-12	1	-1/+1
\|
*	Make the /set part mandatory	David Baker	2016-04-12	1	-1/+1
\|
*	Tidy up get_pusher functions	David Baker	2016-04-12	1	-32/+30
\| \| \| \|	Decodes pushers rows on the main thread rather than the db thread and uses _simple_select_list. Also do the same to the function I copied and factor out the duplication into a helper function.
*	Mis-named function	David Baker	2016-04-12	2	-2/+2
\|
*	Split into separate servlet classes	David Baker	2016-04-12	1	-11/+16
\|
*	Add get endpoint for pushers	David Baker	2016-04-11	2	-1/+53
\| \| \| \|	As per https://github.com/matrix-org/matrix-doc/pull/308
*	Fix the rule_id for .m.rule.invite_for_me (#715)	Mark Haines	2016-04-11	1	-1/+1
\|
*	Move the versionstring code out of app.homeserver into util	Mark Haines	2016-04-11	3	-83/+125
\|
*	Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actions	David Baker	2016-04-11	19	-628/+680
\|\ \| \| \| \|	Change pushers to use the event_actions table
\| *	Run unsafe proces in a loop until we've caught up	David Baker	2016-04-11	1	-4/+11
\| \| \| \| \| \| \| \|	and wrap unsafe process in a try block
\| *	Actually check if we;re processing	David Baker	2016-04-08	1	-0/+2
\| \|
\| *	Fix invite pushes	David Baker	2016-04-08	4	-39/+58
\| \| \| \| \| \| \| \| \| \| \| \|	* If the event is an invite event, add the invitee to list of user we run push rules for (if they have a pusher etc) * Move invite_for_me to be higher prio than member events otherwise member events matches them * Spell override right
\| *	Make sure max stream ordering only increases	David Baker	2016-04-08	1	-1/+1
\| \|
\| *	Unsafe process should call itself if the max has changed	David Baker	2016-04-08	1	-0/+3
\| \|
\| *	Comment why unsafe process is unsafe	David Baker	2016-04-08	1	-0/+5
\| \|
\| *	Literally a dictionary	David Baker	2016-04-07	1	-17/+17
\| \|
\| *	generate id in the main thread	David Baker	2016-04-07	1	-3/+3
\| \|
\| *	Only pass in what we need	David Baker	2016-04-07	2	-11/+13
\| \|
\| *	Oops, inequality fail	David Baker	2016-04-07	1	-1/+1
\| \|
\| *	Wrap process in a flag so we don't process whist already processing.	David Baker	2016-04-07	1	-0/+9
\| \|
\| *	indenting	David Baker	2016-04-07	1	-1/+1
\| \|
\| *	defer.gatherResults rather than doing all the pokes in series	David Baker	2016-04-07	1	-2/+16
\| \|
\| *	Add measure blocks	David Baker	2016-04-07	1	-5/+10
\| \|
\| *	Add comments on min_stream_id	David Baker	2016-04-07	2	-0/+3
\| \| \| \| \| \| \| \|	saying that the min stream id won't be completely accurate all the time
\| *	pep8	David Baker	2016-04-07	1	-0/+1
\| \|
\| *	Fix port script for changes merged from develop	David Baker	2016-04-07	1	-1/+4
\| \|
\| *	Merge remote-tracking branch 'origin/develop' into ↵	David Baker	2016-04-07	32	-202/+776
\| \|\ \| \| \| \| \| \| \| \| \|	dbkr/pushers_use_event_actions
\| * \|	Remove code that's now been obsoleted or moved elsewhere	David Baker	2016-04-07	3	-454/+9
\| \| \|
\| * \|	Send badge count pushes.	David Baker	2016-04-07	4	-24/+71
\| \| \| \| \| \| \| \| \| \| \| \|	Also fix bugs with retrying.
\| * \|	pep8	David Baker	2016-04-06	4	-4/+8
\| \| \|
\| * \|	Make pushers use the event_push_actions table instead of listening on an ↵	David Baker	2016-04-06	13	-130/+503
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	event stream & running the rules again. Sytest passes, but remaining to do: * Make badges work again * Remove old, unused code
* \| \|	PEP8	Erik Johnston	2016-04-11	1	-1/+0
\| \| \|
* \| \|	Merge pull request #688 from matrix-org/matthew/preview_urls	Matthew Hodgson	2016-04-11	13	-10/+952
\|\ \ \ \| \| \| \| \| \| \| \|	URL previewing support
\| * \| \|	fix typos and needless try/except from PR review	Matthew Hodgson	2016-04-11	1	-143/+140
\| \| \| \|
\| * \| \|	actually throw meaningful errors	Matthew Hodgson	2016-04-08	2	-14/+40
\| \| \| \|
\| * \| \|	Fix pep8 warning	Mark Haines	2016-04-08	1	-3/+4
\| \| \| \|
\| * \| \|	move local_media_repository_url_cache.sql to schema v31	Matthew Hodgson	2016-04-08	1	-0/+0
\| \| \| \|
\| * \| \|	fix typo	Matthew Hodgson	2016-04-08	1	-1/+1
\| \| \| \|
\| * \| \|	fix error checking for new SQL	Matthew Hodgson	2016-04-08	1	-2/+2
\| \| \| \|
\| * \| \|	more PR feedback	Matthew Hodgson	2016-04-08	1	-4/+8
\| \| \| \|
\| * \| \|	fix SQL based on PR feedback	Matthew Hodgson	2016-04-08	1	-2/+4
\| \| \| \|
\| * \| \|	Add more doc	Matthew Hodgson	2016-04-08	2	-1/+4
\| \| \| \|
\| * \| \|	Add doc	Matthew Hodgson	2016-04-08	2	-1/+23
\| \| \| \|
\| * \| \|	Add url_preview_enabled config option to turn on/off preview_url endpoint. ↵	Matthew Hodgson	2016-04-08	6	-31/+214
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	defaults to off. Add url_preview_ip_range_blacklist to let admins specify internal IP ranges that must not be spidered. Add url_preview_url_blacklist to let admins specify URL patterns that must not be spidered. Implement a custom SpiderEndpoint and associated support classes to implement url_preview_ip_range_blacklist Add commentary and generally address PR feedback
\| * \| \|	Merge branch 'develop' into matthew/preview_urls	Matthew Hodgson	2016-04-07	42	-402/+1396
\| \|\ \ \
\| * \ \ \	Merge branch 'develop' into matthew/preview_urls	Matthew Hodgson	2016-04-04	41	-997/+1563
\| \|\ \ \ \
\| * \| \| \| \|	report image size (bytewise) in OG meta	Matthew Hodgson	2016-04-03	1	-0/+2
\| \| \| \| \| \|
\| * \| \| \| \|	char encoding	Matthew Hodgson	2016-04-03	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	pep8	Matthew Hodgson	2016-04-03	4	-60/+85
\| \| \| \| \| \|
\| * \| \| \| \|	fix etag typing error. fix timestamp typing error	Matthew Hodgson	2016-04-03	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	rebase all image URLs	Matthew Hodgson	2016-04-03	1	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	remove stale todo	Matthew Hodgson	2016-04-03	1	-3/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Ensure only one download for a given URL is active at a time	Matthew Hodgson	2016-04-03	1	-1/+18
\| \| \| \| \| \|
\| * \| \| \| \|	add a persistent cache of URL lookups, and fix up the in-memory one to work	Matthew Hodgson	2016-04-03	4	-14/+137
\| \| \| \| \| \|
\| * \| \| \| \|	support gzip compression, and don't pass through error msgs	Matthew Hodgson	2016-04-02	2	-5/+11
\| \| \| \| \| \|
\| * \| \| \| \|	how was _respond_default_thumbnail ever meant to work?	Matthew Hodgson	2016-04-02	1	-0/+2
\| \| \| \| \| \|
\| * \| \| \| \|	pass back SVGs as their own thumbnails	Matthew Hodgson	2016-04-02	1	-0/+20
\| \| \| \| \| \|
\| * \| \| \| \|	handle missing dimensions without crashing	Matthew Hodgson	2016-04-02	1	-4/+13
\| \| \| \| \| \|
\| * \| \| \| \|	make meta comparisons case insensitive	Matthew Hodgson	2016-04-02	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	refactor calc_og; spider image URLs; fix xpath; add a (broken) ↵	Matthew Hodgson	2016-04-02	1	-81/+121
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	expiringcache; loads of other fixes
\| * \| \| \| \|	fix assorted redirect, unicode and screenscraping bugs	Matthew Hodgson	2016-04-01	1	-78/+96
\| \| \| \| \| \|
\| * \| \| \| \|	handle spidered relative images correctly	Matthew Hodgson	2016-03-31	2	-3/+13
\| \| \| \| \| \|
\| * \| \| \| \|	prevent choking on invalid utf-8, and handle image thumbnailing smarter	Matthew Hodgson	2016-03-31	1	-5/+18
\| \| \| \| \| \|
\| * \| \| \| \|	synthesise basig OG metadata from pages lacking it	Matthew Hodgson	2016-03-31	1	-0/+47
\| \| \| \| \| \|
\| * \| \| \| \|	sync in changes from matrixfederationclient	Matthew Hodgson	2016-03-31	1	-2/+6
\| \| \| \| \| \|
\| * \| \| \| \|	handle requests with missing content-length headers (e.g. YouTube)	Matthew Hodgson	2016-03-31	2	-9/+28
\| \| \| \| \| \|
\| * \| \| \| \|	spell out more packages	Matthew Hodgson	2016-03-30	1	-8/+21
\| \| \| \| \| \|
\| * \| \| \| \|	fix bugs	Matthew Hodgson	2016-03-29	1	-5/+6
\| \| \| \| \| \|
\| * \| \| \| \|	implement redirects	Matthew Hodgson	2016-03-29	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	debug	Matthew Hodgson	2016-03-29	1	-3/+2
\| \| \| \| \| \|
\| * \| \| \| \|	make it work	Matthew Hodgson	2016-03-29	4	-57/+80
\| \| \| \| \| \|
\| * \| \| \| \|	make it build	Matthew Hodgson	2016-03-29	3	-9/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' into matthew/preview_urls	Matthew Hodgson	2016-03-29	29	-319/+616
\| \|\ \ \ \ \
\| \| * \| \| \| \|	typo	Matthew Hodgson	2016-03-29	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'develop' into matthew/preview_urls	Matthew Hodgson	2016-03-27	217	-7055/+8696
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	typo	Matthew Hodgson	2016-03-25	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	initial WIP of a tentative preview_url endpoint - incomplete, untested, ↵	Matthew Hodgson	2016-01-24	5	-1/+327
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	experimental, etc. just putting it here for safekeeping for now
* \| \| \| \| \| \| \|	Merge pull request #677 from matrix-org/erikj/dns_cache	Erik Johnston	2016-04-08	2	-19/+56
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Read from DNS cache if within TTL
\| * \ \ \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dns_cache	Erik Johnston	2016-04-07	60	-1250/+2294
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Tests	Erik Johnston	2016-04-06	1	-2/+29
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Allow clock to be passed in to func	Erik Johnston	2016-03-31	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Read from DNS cache if within TTL	Erik Johnston	2016-03-31	2	-17/+27
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #707 from matrix-org/markjh/remove_changed_presencelike_data	Erik Johnston	2016-04-08	1	-15/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	changed_presencelike_data isn't observed anywhere so can be removed
\| * \| \| \| \| \| \| \| \|	changed_presencelike_data isn't observed anywhere in synapse so can be removed	Mark Haines	2016-04-08	1	-15/+0
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Remove some unused functions (#711)	Mark Haines	2016-04-08	15	-485/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Remove some unused functions * get_room_events_stream is only used in tests * is_exclusive_room might actually be something we want
* \| \| \| \| \| \| \| \| \|	Merge pull request #710 from matrix-org/markjh/move_fire	Mark Haines	2016-04-08	5	-39/+24
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Move all the wrapper functions for distributor.fire
\| * \| \| \| \| \| \| \| \|	Move all the wrapper functions for distributor.fire	Mark Haines	2016-04-08	5	-39/+24
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move the functions inside the distributor and import them where needed. This reduces duplication and makes it possible for flake8 to detect when the functions aren't used in a given file.
* \| \| \| \| \| \| \| \|	Merge pull request #708 from matrix-org/markjh/remove_collect_presencelike_data	Mark Haines	2016-04-08	2	-37/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Call profile handler get_displayname directly
\| * \| \| \| \| \| \| \| \|	Call profile handler get_displayname directly rather than using ↵	Mark Haines	2016-04-07	2	-37/+1
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	collect_presencelike_data
* \| \| \| \| \| \| \| \|	Merge pull request #701 from DoubleMalt/ldap-auth	Erik Johnston	2016-04-07	4	-10/+134
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add LDAP authentication
\| * \| \| \| \| \| \| \| \|	Add myself to AUTHORS.rst	Christoph Witzany	2016-04-07	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Christoph Witzany <christoph@web.crofting.com>
\| * \| \| \| \| \| \| \| \|	fix check for failed authentication	Christoph Witzany	2016-04-06	1	-2/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	remove line	Christoph Witzany	2016-04-06	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	make tests for ldap more specific to not be fooled by Mocks	Christoph Witzany	2016-04-06	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	output ldap version for info and to pacify pep8	Christoph Witzany	2016-04-06	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	conditionally import ldap	Christoph Witzany	2016-04-06	2	-3/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix pep8	Christoph Witzany	2016-04-06	1	-2/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix exception handling	Christoph Witzany	2016-04-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	code style	Christoph Witzany	2016-04-06	1	-6/+13
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	cleanup	Christoph Witzany	2016-04-06	1	-5/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	add tls property and twist my head around twisted	Christoph Witzany	2016-04-06	1	-15/+29
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	add tls property	Christoph Witzany	2016-04-06	1	-6/+10
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	move LDAP authentication to AuthenticationHandler	Christoph Witzany	2016-04-06	2	-61/+48
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Introduce LDAP authentication	Christoph Witzany	2016-04-06	4	-1/+111
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #706 from matrix-org/markjh/slaveIV	Mark Haines	2016-04-07	4	-5/+54
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Add tests for redactions
\| * \| \| \| \| \| \| \| \|	Add tests for redactions	Mark Haines	2016-04-07	4	-5/+54
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #704 from matrix-org/markh/slaveIII	Mark Haines	2016-04-07	2	-1/+95
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tests for get_latest_event_ids_in_room and get_current_state
\| * \| \| \| \| \| \| \| \|	Add sensible __eq__ operators inside the tests.	Mark Haines	2016-04-07	2	-10/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rather than adding them globally. This limits the changes to only affect the tests.
\| * \| \| \| \| \| \| \| \|	Add tests for get_latest_event_ids_in_room and get_current_state	Mark Haines	2016-04-07	3	-0/+76
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #700 from matrix-org/erikj/deduplicate_joins	Erik Johnston	2016-04-07	4	-2/+125
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Deduplicate membership changes
\| * \| \| \| \| \| \| \|	Rename things	Erik Johnston	2016-04-07	1	-5/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Log contexts and squash things together	Erik Johnston	2016-04-07	1	-17/+15
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add comment	Erik Johnston	2016-04-07	1	-0/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Deduplicate joins	Erik Johnston	2016-04-07	4	-1/+118
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #703 from matrix-org/erikj/member	Erik Johnston	2016-04-07	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Set profile information when joining rooms remotely
\| * \| \| \| \| \| \| \|	Set profile information when joining rooms remotely	Erik Johnston	2016-04-07	1	-0/+5
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #699 from matrix-org/rav/show_own_leave_event	Richard van der Hoff	2016-04-06	1	-11/+40
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Let users see their own leave events
\| * \| \| \| \| \| \|	Let users see their own leave events	Richard van der Hoff	2016-04-06	1	-11/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... otherwise clients get confused. Fixes https://matrix.org/jira/browse/SYN-662, https://github.com/vector-im/vector-web/issues/368
* \| \| \| \| \| \| \|	Merge pull request #702 from matrix-org/markjh/slaveII	Mark Haines	2016-04-06	2	-11/+67
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test that room membership is replicated
\| * \| \| \| \| \| \| \|	Test that room membership is replicated	Mark Haines	2016-04-06	2	-11/+67
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #697 from matrix-org/markjh/slaveI	Mark Haines	2016-04-06	10	-2/+485
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Add a slaved events store class
\| * \| \| \| \| \| \|	Add a slaved events store class	Mark Haines	2016-04-06	10	-2/+485
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a test to check that get_room_names_and_aliases does the same thing on both the master and on the slave data store.
* \| \| \| \| \| \| \|	Merge pull request #698 from matrix-org/erikj/port_script_fix	Erik Johnston	2016-04-06	13	-86/+69
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Don't require config to create database
\| * \| \| \| \| \| \|	Don't require config to create database	Erik Johnston	2016-04-06	13	-86/+69
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #694 from matrix-org/markjh/caches	Mark Haines	2016-04-06	2	-33/+34
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move _get_cache_dict into the SQLBaseStore
\| * \| \| \| \| \| \| \|	Move _get_cache_dict into the SQLBaseStore	Mark Haines	2016-04-06	2	-33/+34
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #695 from matrix-org/markjh/cachesII	Mark Haines	2016-04-06	4	-26/+29
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Make the cache objects be per instance rather than being global
\| * \| \| \| \| \| \|	Make the cache objects be per instance rather than being global	Mark Haines	2016-04-06	4	-26/+29
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #692 from matrix-org/markjh/replicate_reshuffle	Mark Haines	2016-04-05	1	-44/+55
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Separate generating the replication response...
\| * \| \| \| \| \| \|	Separate generating the replication response...	Mark Haines	2016-04-05	1	-44/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from doing the http request parsing to make it easier to write unit tests for replication.
* \| \| \| \| \| \| \|	Merge pull request #693 from matrix-org/erikj/backfill_self	Erik Johnston	2016-04-05	1	-1/+4
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|	Don't backfill from self
\| * \| \| \| \| \| \|	Don't backfill from self	Erik Johnston	2016-04-05	1	-1/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #691 from matrix-org/erikj/member	Erik Johnston	2016-04-05	4	-16/+58
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix stuck invites
\| * \| \| \| \| \| \| \|	Fix stuck invites	Erik Johnston	2016-04-05	4	-16/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If rejecting a remote invite fails with an error response don't fail the entire request; instead mark the invite as locally rejected. This fixes the bug where users can get stuck invites which they can neither accept nor reject.
* \| \| \| \| \| \| \| \|	Merge pull request #690 from matrix-org/erikj/member	Erik Johnston	2016-04-05	5	-32/+155
\|\\| \| \| \| \| \| \| \| \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Store invites in a separate table.
\| * \| \| \| \| \| \|	Docs and indents	Erik Johnston	2016-04-04	3	-14/+31
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add upgrade path, rename table	Erik Johnston	2016-04-04	2	-6/+20
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Store invites in a separate table.	Erik Johnston	2016-04-04	5	-32/+124
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #689 from matrix-org/erikj/member	Erik Johnston	2016-04-04	6	-154/+192
\|\\| \| \| \| \| \| \| \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|	Do checks for memberships before creating events
\| * \| \| \| \| \|	Use computed prev event ids	Erik Johnston	2016-04-01	4	-13/+41
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove state hack from _create_new_client_event	Erik Johnston	2016-04-01	1	-43/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Do checks for memberships before creating events	Erik Johnston	2016-04-01	3	-98/+151
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #686 from matrix-org/markjh/doc_strings	Mark Haines	2016-04-01	14	-169/+242
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Use google style doc strings.
\| * \| \| \| \| \|	Use google style doc strings.	Mark Haines	2016-04-01	14	-169/+242
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pycharm supports them so there is no need to use the other format. Might as well convert the existing strings to reduce the risk of people accidentally cargo culting the wrong doc string format.
* \| \| \| \| \| \|	Merge pull request #684 from matrix-org/markjh/backfill_id_gen	Mark Haines	2016-04-01	11	-61/+71
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use a stream id generator for backfilled ids
\| * \| \| \| \| \| \|	Assert that the step != 0	Mark Haines	2016-04-01	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	use google style doc strings	Mark Haines	2016-04-01	1	-11/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rename direction to step, apply checks consistently	Mark Haines	2016-04-01	2	-16/+16
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use a stream id generator for backfilled ids	Mark Haines	2016-04-01	11	-61/+69
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #685 from matrix-org/erikj/sync_leave	Erik Johnston	2016-04-01	4	-72/+85
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add concurrently_execute function
\| * \| \| \| \| \| \|	Comment	Erik Johnston	2016-04-01	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add concurrently_execute function	Erik Johnston	2016-04-01	4	-75/+82
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Filter rooms list before chunking	Erik Johnston	2016-04-01	1	-6/+12
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #682 from matrix-org/markjh/fix_invalidate	Mark Haines	2016-04-01	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the invalidation of the names and aliases cache
\| * \| \| \| \| \| \|	Fix the invalidation of the names and aliases cache	Mark Haines	2016-04-01	1	-1/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #681 from matrix-org/markjh/remove_outlier	Mark Haines	2016-03-31	3	-11/+7
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Remove outlier parameter from compute_event_context
\| * \| \| \| \| \|	Remove outlier parameter from compute_event_context	Mark Haines	2016-03-31	3	-11/+7
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use event.internal_metadata.is_outlier instead.
* \| \| \| \| \|	Merge pull request #680 from matrix-org/markjh/remove_is_new_state	Mark Haines	2016-03-31	3	-56/+57
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the is_new_state argument to persist event.
\| * \| \| \| \| \|	Move the check for backfilled outside the for loop	Mark Haines	2016-03-31	1	-5/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove the is_new_state argument to persist event.	Mark Haines	2016-03-31	3	-56/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move the checks for whether an event is new state inside persist event itself. This was harder than expected because there wasn't enough information passed to persist event to correctly handle invites from remote servers for new rooms.
* \| \| \| \| \| \|	Merge pull request #679 from matrix-org/erikj/member	Erik Johnston	2016-03-31	3	-603/+651
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Split out RoomMemberHandler
\| * \| \| \| \| \|	Split out RoomMemberHandler	Erik Johnston	2016-03-31	3	-603/+651
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #676 from matrix-org/markjh/replicate_stateIII	Mark Haines	2016-03-31	3	-5/+128
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Add replication streams for ex outliers and current state resets
\| * \| \| \| \|	Use a namedtuple rather than tuple unpacking	Mark Haines	2016-03-31	2	-12/+15
\| \| \| \| \| \|
\| * \| \| \| \|	Add replication streams for ex outliers and current state resets	Mark Haines	2016-03-30	3	-2/+113
\| \| \| \| \| \|
\| * \| \| \| \|	Add a entry to current_state_resets table when the current state is reset	Mark Haines	2016-03-30	1	-0/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Line length	Erik Johnston	2016-03-31	1	-1/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #678 from matrix-org/dbkr/push_obey_enable	David Baker	2016-03-31	1	-2/+3
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Don't ignore the obey overlay if the rule has an enabled attribute of False
\| * \| \| \| \|	Don't ignore the obey overlay if the rule has an enabled attribute of False	David Baker	2016-03-31	1	-2/+3
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://github.com/vector-im/vector-web/issues/1244
* \| \| \| \|	spell out more packages	Matthew Hodgson	2016-03-30	1	-8/+21
\| \| \| \| \|
* \| \| \| \|	typo	Matthew Hodgson	2016-03-30	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #675 from matrix-org/markjh/replicate_stateII	Mark Haines	2016-03-30	4	-12/+93
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add a replication stream for state groups
\| * \| \| \| \|	return the state_group for backfill	Mark Haines	2016-03-30	1	-1/+2
\| \|/ / / /
\| * / / /	Add a replication stream for state groups	Mark Haines	2016-03-30	4	-11/+91
\|/ / / /
* \| \| \|	Merge pull request #674 from matrix-org/markjh/replicate_state	Mark Haines	2016-03-30	4	-50/+60
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Use a stream id generator to assign state group ids
\| * \| \| \|	Use a stream id generator to assign state group ids	Mark Haines	2016-03-30	4	-50/+60
\| \| \| \| \|
* \| \| \| \|	Merge pull request #673 from matrix-org/erikj/forget	Erik Johnston	2016-03-30	2	-6/+54
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Require user to have left room to forget room
\| * \| \| \| \|	Only forget room if you were in the room	Erik Johnston	2016-03-30	1	-1/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Remove spurious comment	Erik Johnston	2016-03-30	1	-1/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Require user to have left room to forget room	Erik Johnston	2016-03-30	2	-6/+54
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This dramatically simplifies the forget API code - in particular it no longer generates a leave event.
* \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2016-03-30	3	-3/+71
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Merge branch 'release-v0.14.0' of github.com:matrix-org/synapse v0.14.0	Erik Johnston	2016-03-30	180	-5320/+6403
\| \|\ \ \ \
\| \| * \| \| \|	Bump version and changelog	Erik Johnston	2016-03-30	2	-1/+6
\| \| \| \| \| \|
\| \| * \| \| \|	Bump version and changelog v0.14.0-rc2 github/release-v0.14.0 release-v0.14.0	Erik Johnston	2016-03-23	2	-1/+22
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.14.0	Erik Johnston	2016-03-23	45	-474/+923
\| \| \|\ \ \ \
\| \| * \| \| \| \|	English v0.14.0-rc1	Erik Johnston	2016-03-15	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Bump version and changelog	Erik Johnston	2016-03-15	2	-1/+40
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #672 from nikriek/new-author	Erik Johnston	2016-03-29	1	-2/+5
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new author
\| \| * \| \| \| \| \|	Add new author	Niklas Riekenbrauck	2016-03-29	1	-2/+5
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #671 from nikriek/jwt-support	Erik Johnston	2016-03-29	4	-1/+93
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|	Support login using Javascript Web Tokens (JWT)
\| * \| \| \| \| \|	Add JWT support	Niklas Riekenbrauck	2016-03-29	4	-1/+93
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #668 from matrix-org/markjh/deduplicate	Mark Haines	2016-03-24	4	-2/+75
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deduplicate identical /sync requests
\| * \| \| \| \| \|	Fix typo	Mark Haines	2016-03-24	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add a response cache for getting the public room list	Mark Haines	2016-03-24	1	-1/+11
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Deduplicate identical /sync requests	Mark Haines	2016-03-24	3	-1/+64
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #667 from matrix-org/dbkr/never_notify_member_events	David Baker	2016-03-24	1	-20/+21
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|	Never notify for member events.
\| * \| \| \| \|	Never notify for member events. This fixes ↵	David Baker	2016-03-24	1	-20/+21
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/vector-im/vector-web/issues/828
* \| \| \| \|	Merge pull request #666 from matrix-org/erikj/intern	Erik Johnston	2016-03-23	8	-31/+100
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Intern lots of strings
\| * \| \| \| \|	Simplify intern_dict	Erik Johnston	2016-03-23	1	-17/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Don't bother interning keys that are already interned	Erik Johnston	2016-03-23	1	-3/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Intern all the things	Erik Johnston	2016-03-23	8	-45/+97
\| \| \| \| \| \|
\| * \| \| \| \|	Intern sender, event_id and room_id in events	Erik Johnston	2016-03-23	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Intern type and state_key on events	Erik Johnston	2016-03-23	1	-0/+7
\| \| \| \| \| \|
\| * \| \| \| \|	String intern	Erik Johnston	2016-03-23	2	-3/+17
\|/ / / / /
* \| \| \| \|	Merge pull request #664 from matrix-org/erikj/public_room_list	Erik Johnston	2016-03-23	2	-18/+51
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Don't require alias in public room list.
\| * \| \| \| \|	Comment about weird SQL	Erik Johnston	2016-03-23	1	-1/+3
\| \| \| \| \| \|
\| * \| \| \| \|	SQLite and postgres doesn't share a true literal	Erik Johnston	2016-03-23	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Ensure all old public rooms have aliases	Erik Johnston	2016-03-23	2	-4/+26
\| \| \| \| \| \|
\| * \| \| \| \|	Ensure published rooms have public join rules	Erik Johnston	2016-03-23	1	-0/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Comment	Erik Johnston	2016-03-23	1	-0/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Don't require alias in public room list.	Erik Johnston	2016-03-23	1	-14/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rooms now no longer require an alias to be published. Also, changes the way we pull out state of each room to not require fetching all state events.
* \| \| \| \| \|	Merge pull request #663 from matrix-org/erikj/invite_for_user	Erik Johnston	2016-03-23	2	-7/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make get_invites return RoomsForUser
\| * \| \| \| \| \|	Make get_invites return RoomsForUser	Erik Johnston	2016-03-23	2	-7/+5
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #665 from matrix-org/erikj/dont_cache_events	Erik Johnston	2016-03-23	3	-23/+30
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only cache events in the event cache
\| * \| \| \| \| \|	Don't cache events in get_recent_events_for_room	Erik Johnston	2016-03-23	1	-14/+19
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Don't cache events in get_current_state_for_key	Erik Johnston	2016-03-23	2	-9/+11
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #662 from matrix-org/erikj/state_cache	Erik Johnston	2016-03-23	3	-69/+94
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Make StateHandler._state_cache only store event_ids.
\| * \| \| \| \|	Reduce cache size	Erik Johnston	2016-03-23	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Key StateHandler._state_cache off of state groups	Erik Johnston	2016-03-22	1	-40/+21
\| \| \| \| \| \|
\| * \| \| \| \|	Make LruCache use a dedicated _Node class	Erik Johnston	2016-03-22	1	-32/+41
\| \| \| \| \| \|
\| * \| \| \| \|	Make StateHandler._state_cache only store event_ids.	Erik Johnston	2016-03-22	2	-7/+42
\|/ / / / /
* \| \| \| \|	Measure StateHandler._resolve_events	Erik Johnston	2016-03-22	1	-38/+40
\| \| \| \| \|
* \| \| \| \|	Bump get_unread_event_push_actions_by_room_for_user cache	Erik Johnston	2016-03-22	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Bump get_aliases_for_room cache	Erik Johnston	2016-03-22	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #661 from matrix-org/markjh/member_count	Mark Haines	2016-03-22	1	-1/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix membership count for BulkPushRuleEvaluator
\| * \| \| \| \|	Use get_users_in_room to count the number of room members rather than using ↵	Mark Haines	2016-03-22	1	-1/+3
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	read_receipts
* \| \| \| \|	Merge pull request #660 from matrix-org/erikj/state_cache	Erik Johnston	2016-03-22	1	-60/+48
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Don't cache events in _state_group_cache
\| * \| \| \| \|	Don't cache events in _state_group_cache	Erik Johnston	2016-03-22	1	-60/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead, simply cache the event ids, relying on the event cache to cache the actual events. The problem was that while the state groups cache was limited in the number of groups it could hold, each individual group could consist of thousands of events.
* \| \| \| \| \|	Merge pull request #659 from matrix-org/erikj/state_cache_factor	Erik Johnston	2016-03-22	1	-1/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make stateGroupCache honour CACHE_SIZE_FACTOR
\| * \| \| \| \| \|	Make stateGroupCache honour CACHE_SIZE_FACTOR	Erik Johnston	2016-03-22	1	-1/+7
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #657 from matrix-org/erikj/roomlist	Erik Johnston	2016-03-22	4	-4/+122
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Add published room list edit API
\| * \| \| \| \|	Doc string	Erik Johnston	2016-03-22	1	-0/+6
\| \| \| \| \| \|
\| * \| \| \| \|	an invalide is something else...	Matthew Hodgson	2016-03-22	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add published room list edit API	Erik Johnston	2016-03-21	4	-4/+116
\| \|/ / / /
* \| \| \| \|	Merge pull request #658 from matrix-org/markjh/cleanup	Mark Haines	2016-03-22	3	-44/+19
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Remove some unused parameters from persist_event
\| * \| \| \|	Remove unused backfilled parameter from persist_event	Mark Haines	2016-03-21	3	-42/+19
\| \| \| \| \|
\| * \| \| \|	remove unused current_state variable from on_receive_pdu	Mark Haines	2016-03-21	1	-2/+0
\|/ / / /
* \| \| \|	Merge pull request #655 from matrix-org/erikj/edu_yield	Erik Johnston	2016-03-18	1	-3/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Yield on EDU handling
\| * \| \| \|	Catch exceptions from EDU handling	Erik Johnston	2016-03-18	1	-1/+6
\| \| \| \| \|
\| * \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/edu_yield	Erik Johnston	2016-03-18	4	-22/+64
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #656 from matrix-org/erikj/get_event	Erik Johnston	2016-03-18	2	-15/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Dedupe requested event list in _get_events
\| * \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/get_event	Erik Johnston	2016-03-18	2	-7/+49
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #652 from matrix-org/erikj/delete_alias	Erik Johnston	2016-03-18	2	-7/+49
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update aliases event after deletion
\| * \| \| \| \| \|	Check canonical alias event exists	Erik Johnston	2016-03-17	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update aliases event after deletion	Erik Johnston	2016-03-17	2	-7/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Attempt to update the appropriate `m.room.aliases` event after deleting an alias. This may fail due to the deleter not being in the room. Will also check if the canonical alias of the event is set to the deleted alias, and if so will attempt to delete it.
\| \| * \| \| \| \|	Don't assume existence of event_id in __str__	Erik Johnston	2016-03-18	1	-1/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Dedupe requested event list in _get_events	Erik Johnston	2016-03-18	1	-14/+12
\| \|/ / / / / \|/\| \| \| \| \|
\| \| * \| \| \|	Yield on EDU handling	Erik Johnston	2016-03-18	1	-3/+4
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #650 from matrix-org/dbkr/register_idempotent_with_username	David Baker	2016-03-17	3	-6/+38
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make registration idempotent, part 2
\| * \| \| \| \|	remove debug logging	David Baker	2016-03-16	1	-3/+0
\| \| \| \| \| \|