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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix check for bind_address	Johannes Löthberg	2016-12-20	8	-16/+16
\| \| \| \| \| \| \|	The empty string is a valid setting for the bind_address option, so explicitly check for None here instead. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
*	Merge pull request #1711 from matrix-org/matthew/utf8-password-change	Matthew Hodgson	2016-12-20	1	-2/+2
\|\ \| \| \| \|	fix ability to change password to a non-ascii one
\| *	fix ability to change password to a non-ascii one	Matthew Hodgson	2016-12-18	1	-2/+2
\| \| \| \| \| \| \| \|	https://github.com/vector-im/riot-web/issues/2658
* \|	Merge pull request #1709 from kyrias/bind_addresses	Matthew Hodgson	2016-12-19	10	-176/+304
\|\ \ \| \| \| \| \| \|	Add support for specifying multiple bind addresses
\| * \|	Add IPv6 comment to default config	Johannes Löthberg	2016-12-18	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
\| * \|	Update README to use `bind_addresses`	Johannes Löthberg	2016-12-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
\| * \|	Make default homeserver config use bind_addresses	Johannes Löthberg	2016-12-18	1	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
\| * \|	Add support for specifying multiple bind addresses	Johannes Löthberg	2016-12-18	8	-171/+294
\| \|/ \| \| \| \| \| \|	Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
* \|	Merge pull request #1696 from kyrias/ipv6	Matthew Hodgson	2016-12-19	3	-24/+23
\|\ \ \| \|/ \|/\|	IPv6 support
\| *	Bump twisted dependency	Johannes Löthberg	2016-12-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	At least 16.0.0 is needed for wrapClientTLS support. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
\| *	Remove spurious newline	Johannes Löthberg	2016-12-12	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Apparently I just removed the spaces instead... Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
\| *	Fixup for #1689 and #1690	Johannes Löthberg	2016-12-12	2	-8/+13
\| \| \| \| \| \| \| \|	Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
\| *	IPv6 support for endpoint.py	Glyph	2016-12-11	1	-4/+4
\| \| \| \| \| \|	Similar to https://github.com/matrix-org/synapse/pull/1689, but for endpoint.py
\| *	IPv6 support for client.py	Glyph	2016-12-11	1	-16/+11
\| \| \| \| \| \|	This is an (untested) general sketch of how to use wrapClientTLS to implement TLS over IPv6, as well as faster connections over IPv4.
* \|	Cache network room list queries.	Erik Johnston	2016-12-16	1	-3/+4
\| \|
* \|	Merge branch 'release-v0.18.5' of github.com:matrix-org/synapse v0.18.5	Erik Johnston	2016-12-16	105	-1213/+2917
\|\ \
\| * \|	Bump version and changelog	Erik Johnston	2016-12-16	2	-1/+10
\| \| \|
\| * \|	Merge pull request #1704 from matrix-org/rav/log_todevice_syncs	Richard van der Hoff	2016-12-15	2	-5/+10
\| \|\ \ \| \| \| \| \| \| \| \|	Add some logging for syncing to_device events
\| \| * \|	Add some logging for syncing to_device events	Richard van der Hoff	2016-12-15	2	-5/+10
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Attempt to track down the loss of to_device events (https://github.com/vector-im/riot-web/issues/2711 etc).
\| * \|	Merge pull request #1698 from matrix-org/erikj/room_list	Erik Johnston	2016-12-15	1	-2/+4
\| \|\ \ \| \| \| \| \| \| \| \|	Fix caching on public room list
\| \| * \	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/room_list	Erik Johnston	2016-12-13	2	-1/+35
\| \| \|\ \
\| \| * \| \|	Fix caching on public room list	Erik Johnston	2016-12-13	1	-2/+4
\| \| \| \| \|
\| * \| \| \|	Merge pull request #1702 from manuroe/mac_install_update	Erik Johnston	2016-12-15	1	-0/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update prerequisites instructions on Mac OS
\| \| * \| \| \|	Update prerequisites instructions on Mac OS	manuroe	2016-12-15	1	-0/+1
\| \|/ / / /
\| * \| \| \|	Merge pull request #1700 from matrix-org/erikj/backfill_filter	Erik Johnston	2016-12-15	1	-2/+5
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix /backfill returning events it shouldn't
\| \| * \| \| \|	Comment	Erik Johnston	2016-12-14	1	-0/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Fix /backfill returning events it shouldn't	Erik Johnston	2016-12-14	1	-2/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #1701 from mbachry/fix-preview-crash	Erik Johnston	2016-12-15	2	-1/+54
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|	Fix crash in url preview
\| \| * \| \| \|	Fix crash in url preview when html tag has no text	Marcin Bachry	2016-12-14	2	-1/+54
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Marcin Bachry <hegel666@gmail.com>
\| * \| / /	Fixup membership query	Erik Johnston	2016-12-14	1	-2/+2
\| \| \|/ / \| \|/\| \|
\| * \| \|	Update changelog v0.18.5-rc3 github/release-v0.18.5 release-v0.18.5	Erik Johnston	2016-12-13	1	-1/+1
\| \| \| \|
\| * \| \|	Bump changelog and version	Erik Johnston	2016-12-13	2	-1/+35
\| \|/ /
\| * \|	Merge pull request #1697 from matrix-org/erikj/fix_bg_member	Erik Johnston	2016-12-12	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \|	Fix background update that prematurely stopped
\| \| * \|	Fix background update that prematurely stopped	Erik Johnston	2016-12-12	1	-1/+1
\| \| \| \|
\| * \| \|	Merge pull request #1676 from matrix-org/erikj/room_list	Erik Johnston	2016-12-12	15	-42/+399
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Add new API appservice specific public room list
\| \| * \|	Rename network_id to instance_id on client side	Erik Johnston	2016-12-12	1	-1/+1
\| \| \| \|
\| \| * \|	Add cache to get_public_room_ids_at_stream_id	Erik Johnston	2016-12-12	2	-1/+4
\| \| \| \|
\| \| * \|	Notify replication. Use correct network_id	Erik Johnston	2016-12-12	1	-1/+3
\| \| \| \|
\| \| * \|	Docstring	Erik Johnston	2016-12-12	1	-0/+12
\| \| \| \|
\| \| * \|	Comments	Erik Johnston	2016-12-07	3	-2/+12
\| \| \| \|
\| \| * \|	Don't include appservice id	Erik Johnston	2016-12-06	1	-1/+0
\| \| \| \|
\| \| * \|	Add new API appservice specific public room list	Erik Johnston	2016-12-06	14	-40/+371
\| \| \| \|
\| * \| \|	Merge pull request #1694 from matrix-org/rav/no_get_e2e_keys	Richard van der Hoff	2016-12-12	1	-39/+4
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Remove unspecced GET endpoints for e2e keys
\| \| * \| \|	Remove unspecced GET endpoints for e2e keys	Richard van der Hoff	2016-12-12	1	-39/+4
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GET /keys/claim is a terrible idea, since it isn't idempotent; also it throws 500 errors if you call it without all the right params. GET /keys/query is arguable, but it's unspecced, so let's get rid of it too to stop people relying on unspecced APIs.
\| * \| \|	Merge remote-tracking branch 'origin/master' into develop	Richard van der Hoff	2016-12-12	1	-4/+13
\| \|\ \ \ \| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #1685 from matrix-org/rav/update_readme_for_tests	Richard van der Hoff	2016-12-12	1	-5/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Update the readme to use trial
\| * \| \| \|	fix pythonpath	Richard van der Hoff	2016-12-09	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Update the readme to use trial	Richard van der Hoff	2016-12-09	1	-5/+14
\|/ / / /
\| * \| \|	Merge pull request #1620 from matrix-org/erikj/concurrent_room_access	Erik Johnston	2016-12-12	3	-27/+161
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Limit the number of events that can be created on a given room concurrently
\| \| * \| \|	Comments	Erik Johnston	2016-11-11	2	-0/+15
\| \| \| \| \|
\| \| * \| \|	Limit the number of events that can be created on a given room concurretnly	Erik Johnston	2016-11-10	1	-27/+31
\| \| \| \| \|
\| \| * \| \|	Add Limiter: limit concurrent access to resource	Erik Johnston	2016-11-10	2	-0/+115
\| \| \| \| \|
\| * \| \| \|	Merge pull request #1686 from matrix-org/rav/fix_federation_key_fails	Richard van der Hoff	2016-12-12	1	-0/+10
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|	E2E key query: handle federation fails
\| \| * \| \|	Remove unused import	Richard van der Hoff	2016-12-12	1	-1/+0
\| \| \| \| \|
\| \| * \| \|	E2E key query: handle federation fails	Richard van der Hoff	2016-12-09	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't fail the whole request if we can't connect to a particular server.
\| * \| \| \|	Merge pull request #1684 from matrix-org/rav/no_run_tox_from_setup	Richard van der Hoff	2016-12-09	1	-33/+40
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Don't try to run tox from setup.py
\| \| * \| \| \|	Implement a null 'test' command	Richard van der Hoff	2016-12-09	1	-2/+15
\| \| \| \| \| \|
\| \| * \| \| \|	Don't try to run tox from setup.py	Richard van der Hoff	2016-12-09	1	-34/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using tox to run the tests is a bad idea, as per the comments.
\| * \| \| \| \|	Merge pull request #1683 from matrix-org/erikj/notifier_sadness	Erik Johnston	2016-12-09	4	-18/+34
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|	Fix rare notifier bug where listeners dont timeout
\| \| * \| \| \|	Fix unit tests	Erik Johnston	2016-12-09	1	-0/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Correctly handle timeout errors	Erik Johnston	2016-12-09	2	-7/+20
\| \| \| \| \| \|
\| \| * \| \| \|	Fix rare notifier bug where listeners dont timeout	Erik Johnston	2016-12-09	2	-11/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There was a race condition that caused the notifier to 'miss' the timeout notification, since there were no other checks for the timeout this caused listeners to get stuck in a loop until something happened.
\| * \| \| \| \|	Fix broken README merge	Richard van der Hoff	2016-12-09	1	-1/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When 546ec1a was merged into develop, I accidentally overwrote the change introduced in debbea5 (pr #1657). Reintroduce it.
\| * \| \| \|	Merge pull request #1680 from matrix-org/erikj/joined_rooms	Erik Johnston	2016-12-09	6	-9/+165
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add new room membership APIs
\| \| * \| \| \|	Add /room/<room_id>/joined_members API	Erik Johnston	2016-12-08	3	-9/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This returns the currently joined members in the room with their display names and avatar urls. This is more efficient than /members for large rooms where you don't need the full events.
\| \| * \| \| \|	Add profile data to the room_membership table for joins	Erik Johnston	2016-12-08	4	-0/+110
\| \| \| \| \| \|
\| \| * \| \| \|	Add joined_rooms servlet	Erik Johnston	2016-12-08	1	-0/+17
\| \| \|/ / /
\| * \| \| \|	Merge pull request #1678 from matrix-org/rav/fix_receipt_notifications	Richard van der Hoff	2016-12-08	2	-2/+6
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Read-receipt fixes
\| \| * \| \|	Fix ignored read-receipts	Richard van der Hoff	2016-12-08	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't ignore read-receipts which arrive in the same EDU as a read-receipt for an old event.
\| \| * \| \|	Fix result of insert_receipt	Richard van der Hoff	2016-12-08	1	-1/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	This should fix the absence of notifications when new receipts arrive.
\| * \| \|	Merge pull request #1672 from williamleuschner/develop	Erik Johnston	2016-12-06	1	-0/+30
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Add README instructions for OpenBSD installation
\| \| * \| \|	Fix incorrect numbering on OpenBSD instructions caused by my own incompetence	William Leuschner	2016-12-06	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: William Leuschner <wel2138@rit.edu>
\| \| * \| \|	Update incorrect information in README about ksh and source	William Leuschner	2016-12-06	1	-6/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: William Leuschner <wel2138@rit.edu>
\| \| * \| \|	Add README instructions for OpenBSD installation	William Leuschner	2016-12-05	1	-0/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: William Leuschner <wel2138@rit.edu>
\| * \| \| \|	Prevent user tokens being used as guest tokens (#1675)	Richard van der Hoff	2016-12-06	3	-31/+115
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure that a user cannot pretend to be a guest by adding 'guest = True' caveats.
\| * \| \|	Travis config (#1674)	Richard van der Hoff	2016-12-06	1	-0/+17
\| \| \| \|
\| * \| \|	Merge pull request #1673 from matrix-org/rav/fix_tox_tests	Richard van der Hoff	2016-12-06	1	-0/+7
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Fix unittests under tox
\| \| * \|	Fix unittests under tox	Richard van der Hoff	2016-12-06	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We now need to set PYTHONPATH when running the unit tests; update tox config to do so.
\| * \| \|	Merge pull request #653 from matrix-org/erikj/preset_guest_join	Erik Johnston	2016-12-05	1	-0/+10
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Enable guest access for private rooms by default
\| \| * \| \|	Enable guest access for private rooms by default	Erik Johnston	2016-03-17	1	-0/+10
\| \| \| \| \|
\| * \| \| \|	Merge pull request #1649 from matrix-org/dbkr/log_ui_auth_args	Erik Johnston	2016-12-05	1	-1/+9
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Log the args that we have on UI auth completion
\| \| * \| \| \|	Clarify that creds doesn not contain passwords.	David Baker	2016-11-24	1	-1/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Log the args that we have on UI auth completion	David Baker	2016-11-24	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will be super helpful for debugging if we have more registration woes.
\| * \| \| \| \|	Merge pull request #1668 from pik/bug-console-filter	Erik Johnston	2016-12-05	1	-0/+1
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|	Logging: Fix console filter breaking when level is DEBUG
\| \| * \| \| \|	Bugfix: Console logging handler missing default filter	pik	2016-12-03	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #1671 from kyrias/fix-preview-test	Richard van der Hoff	2016-12-05	1	-68/+68
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix preview test
\| \| * \| \| \| \|	test_preview: Fix incorrect wrapping	Johannes Löthberg	2016-12-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The old test expected an incorrect wrapping due to the preview function not using unicode properly, so it got the wrong length. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
\| \| * \| \| \| \|	Make test_preview use unicode strings	Johannes Löthberg	2016-12-05	1	-68/+68
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
\| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into develop	Richard van der Hoff	2016-12-05	1	-1/+1
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| / / / / \| \|/ / / /
* \| \| \| \|	README: fix link	Richard van der Hoff	2016-12-03	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into develop	Richard van der Hoff	2016-12-03	2	-187/+355
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #1667 from matrix-org/rav/update_readme	Richard van der Hoff	2016-12-03	2	-192/+359
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Updates to the README
\| * \| \| \| \|	README: review comments	Richard van der Hoff	2016-12-02	1	-32/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor updates post-review
\| * \| \| \| \|	README: rewrite federation section	Richard van der Hoff	2016-12-02	1	-50/+55
\| \| \| \| \| \|
\| * \| \| \| \|	README: add reverse-proxying section	Richard van der Hoff	2016-12-02	1	-0/+99
\| \| \| \| \| \|
\| * \| \| \| \|	README: Rewrite "Identity servers" section	Richard van der Hoff	2016-12-02	1	-15/+22
\| \| \| \| \| \|
\| * \| \| \| \|	README: rewrite installation instructions	Richard van der Hoff	2016-12-02	1	-10/+57
\| \| \| \| \| \|
\| * \| \| \| \|	README: remove refs to demo client	Richard van der Hoff	2016-12-02	1	-36/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The demo client isn't really fit for purpose, so stop encouraging people to use it.
\| * \| \| \| \|	README: code quotes	Richard van der Hoff	2016-12-02	1	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add some syntax highlighting
\| * \| \| \| \|	README: "About matrix" updates	Richard van der Hoff	2016-12-02	1	-8/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- remove redundant "where's the spec" section: this would belong in "About matrix", but it's already there. - E2E is in beta rather than dev
\| * \| \| \| \|	README: Fix links	Richard van der Hoff	2016-12-02	1	-10/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a couple of broken links
\| * \| \| \| \|	Rearrange the README	Richard van der Hoff	2016-12-02	1	-85/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move some bits of the README around. No words were changed in the making of this commit.
\| * \| \| \| \|	rename CAPTCHA_SETUP	Richard van der Hoff	2016-12-01	2	-8/+7
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this is rst so name it accordingly
\| * \| \| \|	Merge pull request #1664 from kyrias/preview-url-resource-encoding	Matthew Hodgson	2016-12-03	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	preview_url_resource: Ellipsis must be in unicode string
\| \| * \| \| \|	preview_url_resource: Ellipsis must be in unicode string	Johannes Löthberg	2016-12-01	1	-1/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
\| * \| \| \|	Merge pull request #1654 from matrix-org/rav/no_more_refresh_tokens	Richard van der Hoff	2016-12-01	9	-210/+26
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Stop generating refresh_tokens
\| \| * \| \| \|	Fix doc-string	Richard van der Hoff	2016-12-01	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove refresh_token reference
\| \| * \| \| \|	fix imports	Richard van der Hoff	2016-11-30	1	-3/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Rip out more refresh_token code	Richard van der Hoff	2016-11-30	7	-160/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We might as well treat all refresh_tokens as invalid. Just return a 403 from /tokenrefresh, so that we don't have a load of dead, untestable code hanging around. Still TODO: removing the table from the schema.
\| \| * \| \| \|	Merge branch 'develop' into rav/no_more_refresh_tokens	Richard van der Hoff	2016-11-30	14	-78/+94
\| \| \|\ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #1660 from matrix-org/rav/better_content_type_validation	Richard van der Hoff	2016-11-30	1	-18/+30
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More intelligent Content-Type parsing
\| \| * \| \| \| \|	More intelligent Content-Type parsing	Richard van der Hoff	2016-11-30	1	-18/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Content-Type is allowed to contain options (`; charset=utf-8`, for instance). We should allow that.
\| * \| \| \| \| \|	Merge pull request #1656 from matrix-org/rav/remove_time_caveat	Richard van der Hoff	2016-11-30	7	-36/+26
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop putting a time caveat on access tokens
\| \| * \| \| \| \| \|	Comments	Richard van der Hoff	2016-11-30	1	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update comments in verify_macaroon
\| \| * \| \| \| \| \|	Stop putting a time caveat on access tokens	Richard van der Hoff	2016-11-29	7	-33/+17
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The 'time' caveat on the access tokens was something of a lie, since we weren't enforcing it; more pertinently its presence stops us ever adding useful time caveats. Let's move in the right direction by not lying in our caveats.
\| * \| \| \| \| \|	Merge pull request #1653 from matrix-org/rav/guest_e2e	Richard van der Hoff	2016-11-29	5	-14/+29
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement E2E for guests
\| \| * \| \| \| \| \|	Allow guest access to endpoints for E2E	Richard van der Hoff	2016-11-25	3	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose /devices, /keys, and /sendToDevice to guest users, so that they can use E2E.
\| \| * \| \| \| \| \|	Give guest users a device_id	Richard van der Hoff	2016-11-25	2	-5/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to create devices for guests so that they can use e2e, but we don't have anywhere to store it, so just use a fixed one.
\| * \| \| \| \| \| \|	Merge pull request #1657 from matrix-org/rav/hurry_up_pip	Richard van der Hoff	2016-11-29	2	-10/+9
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|	Let pip install multiple packages at once
\| \| * \| \| \| \| \|	Let pip install multiple packages at once	Richard van der Hoff	2016-11-29	2	-10/+9
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pip can install multiple dependencies at the same time, so there is no need to use xargs -n1. It's significantly slower with -n1, so let's not do it with no reason.
\| \| \| * / / /	Stop generating refresh tokens	Richard van der Hoff	2016-11-28	4	-45/+20
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we're not doing refresh tokens any more, we should start killing off the dead code paths. /tokenrefresh itself is a bit of a thornier subject, since there might be apps out there using it, but we can at least not generate refresh tokens on new logins.
\| * \| \| \| \|	Merge pull request #1655 from matrix-org/rav/remove_redundant_macaroon_checks	Richard van der Hoff	2016-11-25	1	-26/+8
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant list of known caveat prefixes
\| \| * \| \| \| \|	Remove redundant list of known caveat prefixes	Richard van der Hoff	2016-11-24	1	-26/+8
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also add some comments.
\| * \| \| \| \|	Merge pull request #1650 from matrix-org/erikj/respect_ratelimited	Erik Johnston	2016-11-24	2	-1/+8
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly handle 500's and 429 on federation
\| \| * \| \| \| \|	Use correct var	Erik Johnston	2016-11-24	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Correctly handle 500's and 429 on federation	Erik Johnston	2016-11-24	2	-1/+8
\| \|/ / / / /
\| * \| \| \| \|	Bump version and changelog v0.18.5-rc2	Erik Johnston	2016-11-24	2	-1/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Don't send old events as federation	Erik Johnston	2016-11-24	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Bump changelog and version v0.18.5-rc1	Erik Johnston	2016-11-24	2	-1/+16
\| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge pull request #1644 from matrix-org/erikj/efficient_notif_counts	Erik Johnston	2016-11-23	2	-8/+50
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	More efficient notif count queries
\| \| * \| \| \|	Comment	Erik Johnston	2016-11-23	1	-1/+3
\| \| \| \| \| \|
\| \| * \| \| \|	More efficient notif count queries	Erik Johnston	2016-11-23	2	-8/+48
\| \|/ / / /
\| * \| \| \|	Merge pull request #1635 from matrix-org/erikj/split_out_fed_txn	Erik Johnston	2016-11-23	38	-219/+1131
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Split out federation transaction sending to a worker
\| \| * \| \| \|	Shuffle receipt handler around so that worker apps don't need to load it	Erik Johnston	2016-11-23	7	-9/+11
\| \| \| \| \| \|
\| \| * \| \| \|	Fix tests	Erik Johnston	2016-11-23	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Ensure only main or federation_sender process can send federation traffic	Erik Johnston	2016-11-23	3	-5/+21
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2016-11-23	10	-25/+396
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/split_out_fed_txn
\| \| * \| \| \| \|	Comment	Erik Johnston	2016-11-23	1	-0/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Explicit federation ack	Erik Johnston	2016-11-23	3	-8/+25
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix tests and flake8	Erik Johnston	2016-11-22	2	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Invalidate retry cache in both directions	Erik Johnston	2016-11-22	6	-27/+132
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Comments	Erik Johnston	2016-11-21	1	-0/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add federation-sender to sytest	Erik Johnston	2016-11-21	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add some metrics	Erik Johnston	2016-11-21	1	-48/+68
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Comments	Erik Johnston	2016-11-21	3	-0/+41
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Remove explicit calls to send_pdu	Erik Johnston	2016-11-21	3	-61/+9
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix tests	Erik Johnston	2016-11-21	4	-7/+24
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Store federation stream positions in the database	Erik Johnston	2016-11-21	6	-24/+94
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Handle sending events and device messages over federation	Erik Johnston	2016-11-17	14	-55/+185
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Hook up the send queue and create a federation sender worker	Erik Johnston	2016-11-16	8	-22/+419
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add initial cut of federation send queue	Erik Johnston	2016-11-16	1	-0/+174
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Use new federation_sender DI	Erik Johnston	2016-11-16	7	-63/+26
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add transaction queue and transport layer to DI	Erik Johnston	2016-11-16	5	-10/+16
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Move logic into transaction_queue	Erik Johnston	2016-11-16	3	-19/+18
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Rename transaction queue functions to send_*	Erik Johnston	2016-11-16	2	-12/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #1641 from matrix-org/erikj/as_pushers	Erik Johnston	2016-11-23	2	-2/+18
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|	Ignore AS users when fetching push rules
\| \| * \| \| \| \|	Ignore AS users when fetching push rules	Erik Johnston	2016-11-23	2	-2/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By ignoring AS users early on when fetching push rules for a room we can avoid needlessly hitting the DB and filling up the caches.
\| * \| \| \| \| \|	Merge pull request #1640 from matrix-org/kegan/sync-perf	Kegsay	2016-11-22	2	-9/+51
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|	Return early on /sync code paths if a '*' filter is used
\| \| * \| \| \| \|	Return early on /sync code paths if a '*' filter is used	Kegan Dougal	2016-11-22	2	-9/+51
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is currently very conservative in that it only does this if there is no `since` token. This limits the risk to clients likely to be doing one-off syncs (like bridges), but does mean that normal human clients won't benefit from the time savings here. If the savings are large enough, I would consider generalising this to just check the filter.
\| * \| \| \| \|	Merge pull request #1638 from matrix-org/kegan/sync-event-fields	Kegsay	2016-11-22	4	-15/+296
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|	Implement "event_fields" in filters
\| \| * \| \| \|	Review comments	Kegan Dougal	2016-11-22	2	-21/+11
\| \| \| \| \| \|
\| \| * \| \| \|	Also check for dict since sometimes they aren't frozen	Kegan Dougal	2016-11-22	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Glue only_event_fields into the sync rest servlet	Kegan Dougal	2016-11-22	3	-11/+15
\| \| \| \| \| \|
\| \| * \| \| \|	More tests	Kegan Dougal	2016-11-22	2	-4/+60
\| \| \| \| \| \|
\| \| * \| \| \|	Add remaining tests	Kegan Dougal	2016-11-21	1	-4/+70
\| \| \| \| \| \|
\| \| * \| \| \|	Start adding some tests	Kegan Dougal	2016-11-21	2	-4/+40
\| \| \| \| \| \|
\| \| * \| \| \|	Move event_fields filtering to serialize_event	Kegan Dougal	2016-11-21	3	-59/+119
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also make it an inclusive not exclusive filter, as the spec demands.
\| \| * \| \| \|	Add filter_event_fields and filter_field to FilterCollection	Kegan Dougal	2016-11-21	1	-0/+69
\| \| \|/ / /
\| * \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2016-11-22	3	-1/+40
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge branch 'release-v0.18.4' of github.com:matrix-org/synapse v0.18.4	Erik Johnston	2016-11-22	32	-430/+383
\|\ \ \ \ \
\| * \| \| \| \|	Bump changelog	Erik Johnston	2016-11-22	1	-0/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'dbkr/work_around_devicename_bug' of ↵	Erik Johnston	2016-11-22	1	-0/+11
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:matrix-org/synapse into release-v0.18.4
\| \| * \| \| \| \|	Fix flake8	Mark Haines	2016-11-18	1	-1/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Work around client replacing reg params	David Baker	2016-11-18	1	-0/+12
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Works around https://github.com/vector-im/vector-android/issues/715 and equivalent for iOS
\| * \| \| \| \|	Bump changelog and version v0.18.4-rc1	Erik Johnston	2016-11-14	2	-1/+21
\| \| \| \| \| \|
\| \| * \| \| \|	Merge pull request #1636 from matrix-org/kegan/filter-error-msg	Kegsay	2016-11-21	2	-0/+9
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|	Fail with a coherent error message if `/sync?filter=` is invalid
\| \| \| * \| \|	Fail with a coherent error message if `/sync?filter=` is invalid	Kegan Dougal	2016-11-21	2	-0/+9
\| \| \|/ / /
\| \| * \| \|	Merge pull request #1628 from matrix-org/erikj/ldap_split_out	Erik Johnston	2016-11-15	4	-378/+17
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use external ldap auth pacakge
\| \| \| * \| \|	Use external ldap auth pacakge	Erik Johnston	2016-11-15	4	-378/+17
\| \| \| \| \| \|
\| \| * \| \| \|	Merge pull request #1617 from matrix-org/erikj/intern_state_dict	Erik Johnston	2016-11-15	1	-1/+4
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|	Correctly intern keys in state cache
\| \| \| * \| \|	Correctly intern keys in state cache	Erik Johnston	2016-11-08	1	-1/+4
\| \| \| \| \| \|
\| \| * \| \| \|	New Flake8 fixes	Erik Johnston	2016-11-15	2	-0/+3
\| \|/ / / /
\| * \| \| \|	Merge pull request #1624 from matrix-org/kegan/idempotent-requests	Kegsay	2016-11-14	7	-184/+202
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Store Promise<Response> instead of Response for HTTP API transactions
\| \| * \| \| \|	Clean transactions based on time. Add HttpTransactionCache tests.	Kegan Dougal	2016-11-14	5	-8/+99
\| \| \| \| \| \|
\| \| * \| \| \|	Move .observe() up to the cache to make things neater	Kegan Dougal	2016-11-14	3	-33/+11
\| \| \| \| \| \|
\| \| * \| \| \|	Review comments	Kegan Dougal	2016-11-11	5	-158/+119
\| \| \| \| \| \|
\| \| * \| \| \|	More flake8	Kegan Dougal	2016-11-11	1	-1/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Flake8 and fix whoopsie	Kegan Dougal	2016-11-11	1	-4/+8
\| \| \| \| \| \|
\| \| * \| \| \|	Use ObservableDeferreds instead of Deferreds as they behave as intended	Kegan Dougal	2016-11-11	2	-30/+31
\| \| \| \| \| \|
\| \| * \| \| \|	Use observable deferreds because they are sane	Kegan Dougal	2016-11-11	1	-3/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Flake8	Kegan Dougal	2016-11-10	2	-4/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Store Promise<Response> instead of Response for HTTP API transactions	Kegan Dougal	2016-11-10	4	-88/+68
\| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes a race whereby: - User hits an endpoint. - No cached transaction so executes main code. - User hits same endpoint. - No cache transaction so executes main code. - Main code finishes executing and caches response and returns. - Main code finishes executing and caches response and returns. This race is common in the wild when Synapse is struggling under load. This commit fixes the race by: - User hits an endpoint. - Caches the promise to execute the main code and executes main code. - User hits same endpoint. - Yields on the same promise as the first request. - Main code finishes executing and returns, unblocking both requests.
\| * \| \| \|	Merge pull request #1625 from DanielDent/patch-1	Erik Johnston	2016-11-12	1	-2/+3
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Add support for durations in minutes
\| \| * \| \|	Add support for durations in minutes	Daniel Dent	2016-11-12	1	-2/+3
\| \|/ / / \|/\| \| \|
\| * \| \|	Merge pull request #1619 from matrix-org/erikj/pwd_provider_error	Erik Johnston	2016-11-09	1	-2/+7
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Don't assume providers raise ConfigError's
\| \| * \| \|	Don't assume providers raise ConfigError's	Erik Johnston	2016-11-08	1	-2/+7
\| \|/ / /
\| * \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2016-11-08	3	-2/+16
\| \|\ \ \ \| \|/ / / \|/\| \| \|
* \| \| \|	Merge branch 'erikj/ldap3_auth' v0.18.3	Erik Johnston	2016-11-08	3	-2/+16
\|\ \ \ \
\| * \| \| \|	Bump version and changelog	Erik Johnston	2016-11-08	2	-1/+14
\| \| \| \| \|
\| * \| \| \|	Explicitly set authentication mode in ldap3	Erik Johnston	2016-11-08	1	-1/+2
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This only makes a difference for versions of ldap3 before 1.0, but a) its best to be explicit and b) there are distributions that package ancient versions for ldap3 (e.g. debian).
\| * \| \|	Merge pull request #1615 from matrix-org/erikj/limit_prev_events	Erik Johnston	2016-11-08	1	-0/+15
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Limit the number of prev_events of new events
\| \| * \| \|	Sample correctly	Erik Johnston	2016-11-08	1	-1/+3
\| \| \| \| \|
\| \| * \| \|	Limit the number of prev_events of new events	Erik Johnston	2016-11-08	1	-0/+13
\| \| \|/ /
\| * \| \|	Merge pull request #1616 from matrix-org/erikj/worker_frozen_dict	Erik Johnston	2016-11-08	6	-0/+22
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Respect use_frozen_dicts option in workers
\| \| * \|	Respect use_frozen_dicts option in workers	Erik Johnston	2016-11-08	6	-0/+22
\| \|/ /
\| * \|	Merge pull request #1198 from euank/more-ip-blacklist	Erik Johnston	2016-11-07	1	-0/+2
\| \|\ \ \| \| \| \| \| \| \| \|	default config: blacklist more internal ips
\| \| * \|	default config: blacklist more internal ips	Euan Kemp	2016-11-06	1	-0/+2
\| \|/ / \|/\| \|
\| * \|	Merge pull request #1195 from matrix-org/erikj/incorrect_func	Erik Johnston	2016-11-04	1	-11/+2
\| \|\ \ \| \| \| \| \| \| \| \|	Remove unused but buggy function
\| \| * \|	Comment	Erik Johnston	2016-11-04	1	-0/+1
\| \| \| \|
\| \| * \|	Remove unused but buggy function	Erik Johnston	2016-11-04	1	-11/+1
\| \|/ /
\| * \|	Merge pull request #1193 from matrix-org/paul/metrics	Paul Evans	2016-11-03	3	-71/+18
\| \|\ \ \| \| \| \| \| \| \| \|	More updates to Promethese metrics exposition
\| \| * \|	Fix copypasto error in metric rename table in docs	Paul "LeoNerd" Evans	2016-11-03	1	-4/+4
\| \| \| \|
\| \| * \|	Rename the python-specific metrics now the docs claim that we have done	Paul "LeoNerd" Evans	2016-11-03	1	-7/+9
\| \| \| \|
\| \| * \|	Since we don't export per-filetype fd counts any more, delete all the code ↵	Paul "LeoNerd" Evans	2016-11-03	1	-36/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	related to that too
\| \| * \|	Remove now-unused 'resource' import	Paul "LeoNerd" Evans	2016-11-03	1	-8/+0
\| \| \| \|
\| \| * \|	Now we have new-style metrics don't bother exporting legacy-named process ones	Paul "LeoNerd" Evans	2016-11-03	1	-16/+1
\| \|/ /
\| * \|	Merge pull request #1192 from matrix-org/erikj/postgres_gist	Erik Johnston	2016-11-03	3	-1/+45
\| \|\ \ \| \| \| \| \| \| \| \|	Replace postgres GIN with GIST
\| \| * \|	Remove spurious comment	Erik Johnston	2016-11-03	1	-2/+2
\| \| \| \|
\| \| * \|	Replace postgres GIN with GIST	Erik Johnston	2016-11-03	3	-1/+45
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	This is because GIN can be slow to write too, especially when the table gets large.
\| * \|	Merge pull request #1191 from matrix-org/dbkr/non_ascii_passwords	David Baker	2016-11-03	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \|	Don't error on non-ascii passwords
\| \| * \|	Don't error on non-ascii passwords	David Baker	2016-11-03	1	-1/+1
\| \|/ /
\| * \|	Merge pull request #1190 from matrix-org/markjh/media_cors	Mark Haines	2016-11-02	3	-7/+22
\| \|\ \ \| \| \| \| \| \| \| \|	Set CORs headers on responses from the media repo
\| \| * \|	Set CORs headers on responses from the media repo	Mark Haines	2016-11-02	3	-7/+22
\| \|/ /
\| * \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2016-11-01	0	-0/+0
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse v0.18.2	Erik Johnston	2016-11-01	57	-807/+1566
\|\ \ \
\| \| * \	Merge pull request #1188 from matrix-org/erikj/sent_transactions	Erik Johnston	2016-11-01	1	-150/+4
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Remove sent_transactions table.
\| \| \| * \|	Continue to clean up received_transactions	Erik Johnston	2016-11-01	1	-0/+14
\| \| \| \| \|
\| \| \| * \|	Removed unused stuff	Erik Johnston	2016-10-31	1	-163/+3
\| \| \| \| \|
\| \| \| * \|	Increase batching of sent transaction inserts	Erik Johnston	2016-10-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should further reduce the number of individual inserts, transactions and updates that are required for keeping sent_transactions up to date.
\| \| * \| \|	Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into develop	Erik Johnston	2016-11-01	3	-34/+66
\| \| \|\ \ \ \| \| \|/ / / \| \|/\| / / \| \| \|/ /
\| * \| \|	Bump version and changelog	Erik Johnston	2016-11-01	2	-1/+7
\| \| \| \|
\| * \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2	Erik Johnston	2016-11-01	1	-33/+42
\| \|\ \ \
\| \| * \ \	Merge pull request #1187 from matrix-org/paul/metrics-howto	Paul Evans	2016-10-31	1	-33/+42
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \|	Update documentation about exported prometheus metrics
\| \| \| * \|	Add details of renamed metrics	Paul "LeoNerd" Evans	2016-10-31	1	-0/+34
\| \| \| \| \|
\| \| \| * \|	Remove long-deprecated instructions about promethesus console; also fix for ↵	Paul "LeoNerd" Evans	2016-10-28	1	-33/+8
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	modern config file format
\| * \| \|	Changelog formattting v0.18.2-rc5	Erik Johnston	2016-10-28	1	-0/+1
\| \| \| \|
\| * \| \|	Bump changelog and version	Mark Haines	2016-10-28	2	-1/+8
\| \| \| \|
\| * \| \|	Merge branch 'develop' into release-v0.18.2	Mark Haines	2016-10-28	3	-9/+9
\| \|\\| \|
\| \| * \|	Merge pull request #1184 from matrix-org/paul/metrics	Paul Evans	2016-10-27	3	-9/+9
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Bugfix for process-wide metric export on split processes
\| \| \| * \|	Set up the process collector during metrics __init__; that way all ↵	Paul "LeoNerd" Evans	2016-10-27	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	split-process workers have it
\| \| \| * \|	Pass the Metrics group into the process collector instead of having it find ↵	Paul "LeoNerd" Evans	2016-10-27	2	-8/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	its own one; this avoids it needing to import from synapse.metrics
\| \| \| * \|	Allow creation of a 'subspace' within a Metrics object, returning another one	Paul "LeoNerd" Evans	2016-10-27	1	-0/+3
\| \| \|/ /
\| * / /	Bump changelog and version v0.18.2-rc4	Erik Johnston	2016-10-27	2	-1/+10
\| \|/ /
\| * \|	Merge pull request #1183 from matrix-org/erikj/fix_email_update	Erik Johnston	2016-10-27	1	-1/+30
\| \|\ \ \| \| \| \| \| \| \| \|	Fix user_threepids schema delta
\| \| * \|	Use most recently added binding, not most recently seen user.	Erik Johnston	2016-10-27	1	-19/+11
\| \| \| \|
\| \| * \|	Fix user_threepids schema delta	Erik Johnston	2016-10-27	1	-1/+38
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The delta `37/user_threepids.sql` aimed to update all the email addresses to be lower case, however duplicate emails may exist in the table already. This commit adds a step where the delta moves the duplicate emails to a new `medium` `email_old`. Only the most recently used account keeps the binding intact. We move rather than delete so that we retain some record of which emails were associated with which account.
\| * \|	Update changelog v0.18.2-rc3	Erik Johnston	2016-10-27	1	-0/+1
\| \| \|
\| * \|	Bump changelog and version	Erik Johnston	2016-10-27	2	-2/+8
\| \| \|
\| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2	Erik Johnston	2016-10-27	27	-170/+509
\| \|\ \
\| \| * \	Merge pull request #1098 from matrix-org/markjh/bearer_token	Mark Haines	2016-10-25	6	-23/+66
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Allow clients to supply access_tokens as headers