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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \| \| \|\ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Merge pull request #982 from matrix-org/erikj/fix_port_script	Erik Johnston	2016-08-04	1	-43/+132
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Port script: Handle the fact that some tables have negative rowid rows
\| \| \| * \| \|	Allow upgrading from old port_from_sqlite3 format	Erik Johnston	2016-08-04	1	-0/+21
\| \| \| \| \| \|
\| \| \| * \| \|	Handle the fact that some tables have negative rowid rows	Erik Johnston	2016-08-04	1	-43/+111
\| \| \| \| \| \|
\| \| * \| \| \|	Merge pull request #981 from matrix-org/rav/omit_device_displayname_if_null	Richard van der Hoff	2016-08-04	1	-3/+4
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	keys/query: Omit device displayname if null
\| \| \| * \| \| \|	keys/query: Omit device displayname if null	Richard van der Hoff	2016-08-04	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... which makes it more consistent with user displaynames.
\| \| * \| \| \| \|	Factor out more common code from the jenkins scripts (#980)	Mark Haines	2016-08-04	4	-138/+44
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Factor out more common code from the jenkins scripts * Fix install_and_run path * Poke jenkins * Poke jenkins
\| \| * \| \| \|	Merge pull request #978 from matrix-org/rav/device_name_in_e2e_devices	Richard van der Hoff	2016-08-03	3	-20/+141
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include device name in /keys/query response
\| \| \| * \| \| \|	PEP8	Richard van der Hoff	2016-08-03	2	-12/+10
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Include device name in /keys/query response	Richard van der Hoff	2016-08-03	3	-20/+143
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an 'unsigned' section which includes the device display name.
\| \| * \| \| \| \|	Merge pull request #977 from matrix-org/rav/return_all_devices	Richard van der Hoff	2016-08-03	2	-3/+52
\| \| \|\\| \| \| \| \| \| \| \|/ / / \| \| \|/\| \| \|	keys/query: return all users which were asked for
\| \| \| * \| \|	keys/query: return all users which were asked for	Richard van der Hoff	2016-08-03	2	-3/+52
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the situation where all of a user's devices get deleted, we want to indicate this to a client, so we want to return an empty dictionary, rather than nothing at all.
\| \| * \| \|	Merge branch 'rav/null_default_device_displayname' into develop	Richard van der Hoff	2016-08-03	4	-5/+23
\| \| \|\ \ \
\| \| \| * \| \|	PEP8	Richard van der Hoff	2016-08-03	1	-1/+1
\| \| \| \| \| \|
\| \| \| * \| \|	Default device_display_name to null	Richard van der Hoff	2016-08-03	4	-5/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It turns out that it's more useful to return a null device display name (and let clients decide how to handle it: eg, falling back to device_id) than using a constant string like "unknown device".
\| \| * \| \| \|	Merge branch 'rav/refactor_device_query' into develop	Richard van der Hoff	2016-08-03	6	-82/+167
\| \| \|\ \ \ \
\| \| \| * \| \| \|	E2eKeysHandler: minor tweaks	Richard van der Hoff	2016-08-03	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PR feedback
\| \| \| * \| \| \|	Merge branch 'develop' into rav/refactor_device_query	Mark Haines	2016-08-03	22	-139/+507
\| \| \| \|\\| \| \|
\| \| \| * \| \| \|	E2E keys: Make federation query share code with client query	Richard van der Hoff	2016-08-02	3	-47/+92
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor the e2e query handler to separate out the local query, and then make the federation handler use it.
\| \| \| * \| \| \|	Move e2e query logic into a handler	Richard van der Hoff	2016-08-01	4	-60/+102
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge pull request #975 from matrix-org/erikj/multi_event_persist	Erik Johnston	2016-08-03	1	-20/+18
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure we only persist an event once at a time
\| \| \| * \| \| \| \|	Remove other bit of deduplication	Erik Johnston	2016-08-03	1	-19/+0
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Ensure we only persist an event once at a time	Erik Johnston	2016-08-03	1	-1/+18
\| \| \| \| \|_\|_\|/ \| \| \| \|/\| \| \|
\| \| \| \| \| \| *	Tidy up get_events	Erik Johnston	2016-08-04	1	-12/+10
\| \| \| \| \| \| \|
\| \| \| \| \| \| *	Rename fields to _ids	Erik Johnston	2016-08-03	2	-4/+4
\| \| \| \| \| \| \|
\| \| \| \| \| \| *	Fix copy + paste fails	Erik Johnston	2016-08-03	2	-6/+11
\| \| \| \| \| \| \|
\| \| \| \| \| \| *	Actually call get_room_state	Erik Johnston	2016-08-03	1	-0/+4
\| \| \| \| \| \| \|
\| \| \| \| \| \| *	Fix syntax error	Erik Johnston	2016-08-03	1	-1/+8
\| \| \| \| \| \| \|
\| \| \| \| \| \| *	Comment	Erik Johnston	2016-08-03	1	-0/+14
\| \| \| \| \| \| \|
\| \| \| \| \| \| *	Add /state_ids federation API	Erik Johnston	2016-08-03	4	-3/+125
\| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The new API only returns the event_ids for the state, as most requesters will already have the vast majority of the events already.
\| \| * \| \| \|	Print status code in federation_client.py	Erik Johnston	2016-08-03	1	-0/+1
\| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Factor out some of the code shared between the sytest scripts (#974)	Mark Haines	2016-08-02	6	-69/+71
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Factor out some of the code shared between the different sytest jenkins scripts * Exclude jenkins from the MANIFEST * Fix dendron build * Missing new line * Poke jenkins * Export the PORT_BASE and PORT_COUNT * Poke jenkins
\| * \| \|	Bump version and changelog v0.17.0-rc3	Erik Johnston	2016-08-02	2	-2/+8
\| \| \| \|
\| * \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0	Erik Johnston	2016-08-02	27	-122/+745
\| \|\\| \|
\| \| * \|	Merge pull request #971 from matrix-org/erikj/fed_state	Erik Johnston	2016-08-02	1	-3/+3
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Fix response cache
\| \| \| * \|	Don't double wrap 200	Erik Johnston	2016-08-02	1	-2/+2
\| \| \| \| \|
\| \| \| * \|	Fix response cache	Erik Johnston	2016-08-02	1	-1/+1
\| \| \|/ /
\| \| * \|	Merge pull request #940 from matrix-org/erikj/fed_state_cache	Erik Johnston	2016-08-02	5	-32/+60
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Cache federation state responses
\| \| \| * \|	Cache federation state responses	Erik Johnston	2016-07-21	5	-32/+60
\| \| \| \| \|
\| \| * \| \|	Print authorization header for federation_client.py	Erik Johnston	2016-08-02	1	-5/+6
\| \| \| \| \|
\| \| * \| \|	Merge pull request #967 from matrix-org/erikj/fed_reader	Erik Johnston	2016-08-02	10	-24/+350
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Split out the federation reading portions into a separate.
\| \| \| * \| \|	Change default jenkins port base and count	Erik Johnston	2016-08-02	3	-6/+7
\| \| \| \| \| \|
\| \| \| * \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader	Erik Johnston	2016-08-02	4	-4/+24
\| \| \| \|\ \ \
\| \| \| * \| \| \|	Make jenkins dendron test federation read apis	Erik Johnston	2016-07-29	1	-0/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader	Erik Johnston	2016-07-29	1	-4/+31
\| \| \| \|\ \ \ \
\| \| \| * \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader	Erik Johnston	2016-07-29	54	-345/+1250
\| \| \| \|\ \ \ \ \
\| \| \| * \| \| \| \| \|	Add destination retry to slave store	Erik Johnston	2016-07-28	2	-0/+32
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Add slace storage functions for public room list	Erik Johnston	2016-07-28	3	-0/+48
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Add get_auth_chain to slave store	Erik Johnston	2016-07-28	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Add more key storage funcs into slave store	Erik Johnston	2016-07-28	2	-24/+26
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Split out a FederationReader process	Erik Johnston	2016-07-21	4	-0/+238
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge pull request #968 from matrix-org/dbkr/fix_add_email_on_register	David Baker	2016-08-02	1	-9/+7
\| \| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \|	Fix adding emails on registration
\| \| \| * \| \| \| \| \|	Merge branch 'develop' into dbkr/fix_add_email_on_register	Mark Haines	2016-08-02	4	-4/+24
\| \| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge pull request #970 from matrix-org/erikj/clock	Erik Johnston	2016-08-02	2	-3/+16
\| \| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \|	Ignore AlreadyCalled errors on timer cancel
\| \| \| * \| \| \| \| \|	Ignore AlreadyCalled errors on timer cancel	Erik Johnston	2016-07-31	2	-3/+16
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	missing --upgrade	Matthew Hodgson	2016-08-01	1	-1/+1
\| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Merge pull request #958 from matrix-org/paul/SYN-738	Paul Evans	2016-07-29	1	-0/+7
\| \| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \|	Forbid non-ASes from registering users whose names begin with '_'
\| \| \| * \| \| \| \|	Forbid non-ASes from registering users whose names begin with '_' (SYN-738)	Paul "LeoNerd" Evans	2016-07-27	1	-0/+7
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Fix adding emails on registration	David Baker	2016-07-29	1	-9/+7
\| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Synapse was not adding email addresses to accounts registered with an email address, due to too many different variables called 'result'. Rename both of them. Also remove the defer.returnValue() with no params because that's not a thing.
\| \| * \| \| \| \|	Merge pull request #964 from matrix-org/erikj/fed_join_fix	Erik Johnston	2016-07-29	1	-4/+31
\| \| \|\ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|	Handle the case of missing auth events when joining a room
\| \| \| * \| \| \|	Mention that func will fetch auth events	Erik Johnston	2016-07-29	1	-0/+2
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Update docstring	Erik Johnston	2016-07-29	1	-0/+6
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Handle the case of missing auth events when joining a room	Erik Johnston	2016-07-28	1	-4/+23
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge pull request #966 from matrix-org/markjh/fix_push	Mark Haines	2016-07-29	5	-52/+205
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create separate methods for getting messages to push
\| \| \| * \| \| \| \|	Fix SQL to supply arguments in the same order	Mark Haines	2016-07-29	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Create separate methods for getting messages to push	Mark Haines	2016-07-28	5	-51/+204
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for the email and http pushers rather than trying to make a single method that will work with their conflicting requirements. The http pusher needs to get the messages in ascending stream order, and doesn't want to miss a message. The email pusher needs to get the messages in descending timestamp order, and doesn't mind if it misses messages.
\| \| * \| \| \| \|	Merge pull request #965 from matrix-org/kegan/comment-push-actions-fn	Kegsay	2016-07-28	1	-2/+26
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Comment get_unread_push_actions_for_user_in_range function
\| \| \| * \| \| \| \|	Comment get_unread_push_actions_for_user_in_range function	Kegan Dougal	2016-07-28	1	-2/+26
\| \| \|/ / / / /
\| \| * \| \| \| \|	Merge pull request #963 from matrix-org/erikj/admin_docs	Erik Johnston	2016-07-28	3	-0/+46
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add some basic admin API docs
\| \| \| * \| \| \| \|	Use correct path	Erik Johnston	2016-07-28	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Add some basic admin API docs	Erik Johnston	2016-07-28	3	-0/+46
\| \| \| \|/ / / /
\| \| * \| \| \| \|	Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2016-07-28	2	-1/+65
\| \| \|\\| \| \| \|
\| \| * \| \| \| \|	Merge pull request #962 from matrix-org/markjh/retry	Mark Haines	2016-07-28	1	-1/+1
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix retry utils to check if the exception is a subclass of CME
\| \| \| * \| \| \| \|	Fix retry utils to check if the exception is a subclass of CME	Mark Haines	2016-07-28	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge pull request #941 from matrix-org/erikj/key_client_fix	Erik Johnston	2016-07-28	1	-3/+9
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|	Send the correct host header when fetching keys
\| * \| \| \| \| \| \|	Typo v0.17.0-rc2	Erik Johnston	2016-08-02	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Change wording	Erik Johnston	2016-08-02	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Bump changeog and version	Erik Johnston	2016-08-02	2	-1/+18
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Add authors to changelog v0.17.0-rc1	Erik Johnston	2016-07-28	1	-4/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update changelog	Erik Johnston	2016-07-28	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'erikj/key_client_fix' of github.com:matrix-org/synapse into ↵	Erik Johnston	2016-07-28	1	-3/+9
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \|	release-v0.17.0
\| \| * \| \| \| \|	Cache getPeer	Erik Johnston	2016-07-21	1	-2/+5
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Set host not path	Erik Johnston	2016-07-21	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Send the correct host header when fetching keys	Erik Johnston	2016-07-21	1	-3/+6
\| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Bump version and changelog	Erik Johnston	2016-07-28	2	-3/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0	Erik Johnston	2016-07-28	7	-14/+85
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Merge pull request #961 from matrix-org/dbkr/fix_push_invite_name	Erik Johnston	2016-07-28	1	-1/+4
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't include name of room for invites in push
\| \| \| * \| \| \|	Don't include name of room for invites in push	David Baker	2016-07-28	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoids insane pushes like, "Bob invited you to invite from Bob"
\| \| * \| \| \| \|	Merge pull request #960 from matrix-org/rav/support_r0.2	Richard van der Hoff	2016-07-28	1	-1/+5
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|	Add r0.2.0 to the "supported versions" list
\| \| \| * \| \| \|	Add r0.1.0 to the "supported versions" list	Richard van der Hoff	2016-07-28	1	-0/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Add r0.2.0 to the "supported versions" list	Richard van der Hoff	2016-07-28	1	-1/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Typo	David Baker	2016-07-28	1	-1/+1
\| \| \|/ / / /
\| \| * \| \| \|	Merge pull request #956 from matrix-org/rav/check_device_id_on_key_upload	Richard van der Hoff	2016-07-27	4	-11/+75
\| \| \|\ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|	Make the device id on e2e key upload optional
\| \| \| * \| \|	key upload tweaks	Richard van der Hoff	2016-07-27	1	-7/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Add v2_alpha URL back in, since things seem to be using it. 2. Don't reject the request if the device_id in the upload request fails to match that in the access_token.
\| \| \| * \| \|	SQL syntax fix	Richard van der Hoff	2016-07-27	1	-1/+1
\| \| \| \| \| \|
\| \| \| * \| \|	Delete e2e keys on device delete	Richard van der Hoff	2016-07-27	3	-4/+28
\| \| \| \| \| \|
\| \| \| * \| \|	Make the device id on e2e key upload optional	Richard van der Hoff	2016-07-26	2	-12/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We should now be able to get our device_id from the access_token, so the device_id on the upload request is optional. Where it is supplied, we should check that it matches. For active access_tokens without an associated device_id, we ought to register the device in the devices table. Also update the table on upgrade so that all of the existing e2e keys are associated with real devices.
\| * \| \| \| \|	Bump CHANGES and version	Erik Johnston	2016-07-27	2	-1/+57
\| \|/ / / /
\| * \| \| \|	Merge pull request #957 from matrix-org/markjh/verify	Mark Haines	2016-07-27	1	-74/+80
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Clean up verify_json_objects_for_server
\| \| * \ \ \	Merge branch 'develop' into markjh/verify	Mark Haines	2016-07-27	2	-3/+11
\| \| \|\ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/crypto/keyring.py
\| * \| \| \| \|	Merge pull request #955 from matrix-org/markjh/only_from2	Mark Haines	2016-07-27	1	-2/+9
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a couple more checks to the keyring
\| \| * \| \| \| \|	Add a couple more checks to the keyring	Mark Haines	2016-07-26	1	-2/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #954 from matrix-org/markjh/even_more_fixes	Mark Haines	2016-07-27	2	-9/+11
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|	Fix a couple of bugs in the transaction and keyring code
\| \| * \| \| \| \|	Fix a couple of bugs in the transaction and keyring code	Mark Haines	2016-07-26	2	-9/+11
\| \| \| \|/ / / \| \| \|/\| \| \|
\| \| \| * \| \|	Clean up verify_json_objects_for_server	Mark Haines	2016-07-27	1	-68/+75
\| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge pull request #952 from matrix-org/markjh/more_fixes	Mark Haines	2016-07-26	1	-0/+4
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Check if the user is banned when handling 3pid invites
\| \| * \| \|	Check if the user is banned when handling 3pid invites	Mark Haines	2016-07-26	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Merge pull request #953 from matrix-org/rav/requester	Richard van der Hoff	2016-07-26	11	-75/+101
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Add `create_requester` function
\| \| * \| \|	Add `create_requester` function	Richard van der Hoff	2016-07-26	11	-75/+101
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wrap the `Requester` constructor with a function which provides sensible defaults, and use it throughout
\| * \| \|	Fix typo	Richard van der Hoff	2016-07-26	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'develop' into rav/delete_refreshtoken_on_delete_device	Richard van der Hoff	2016-07-26	3	-59/+115
\| \|\ \ \
\| \| * \ \	Merge pull request #951 from matrix-org/rav/flake8	Richard van der Hoff	2016-07-26	2	-9/+5
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix flake8 noise
\| \| \| * \| \|	Fix flake8 violation	Richard van der Hoff	2016-07-26	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apparently flake8 v3 puts the error on a different line to v2. Easiest way to make sure that happens is by putting the whole statement on one line :)
\| \| \| * \| \|	Fix flake8 configuration	Richard van der Hoff	2016-07-26	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apparently flake8 v3 doesn't like trailing comments on config settings. Also remove the pep8 config, which didn't work (because it was missing W503) and duplicated the flake8 config. We don't use pep8 on its own, so the config was duplicative.
\| \| * \| \| \|	Merge pull request #948 from matrix-org/markjh/auth_fixes	Mark Haines	2016-07-26	1	-50/+110
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|	Don't add rejections to the state_group, persist all rejections
\| \| \| * \| \|	Fix how push_actions are redacted.	Mark Haines	2016-07-26	1	-8/+10
\| \| \| \| \| \|
\| \| \| * \| \|	Don't add rejected events if we've seen them befrore. Add some comments to ↵	Mark Haines	2016-07-26	1	-5/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	explain what the code is doing mechanically
\| \| \| * \| \|	Only update the events and event_json tables for rejected events	Mark Haines	2016-07-25	2	-52/+63
\| \| \| \| \| \|
\| \| \| * \| \|	Don't add the events to forward extremities if the event is rejected	Mark Haines	2016-07-25	1	-3/+6
\| \| \| \| \| \|
\| \| \| * \| \|	Don't add rejections to the state_group, persist all rejections	Mark Haines	2016-07-25	2	-5/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Delete refresh tokens when deleting devices	Richard van der Hoff	2016-07-26	3	-15/+83
\| \|/ / / /
\| * \| \| \|	Merge pull request #949 from matrix-org/rav/update_devices	David Baker	2016-07-26	13	-28/+295
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Implement updates and deletes for devices
\| \| * \| \| \|	Implement updating devices	Richard van der Hoff	2016-07-26	5	-8/+119
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	You can update the displayname of devices now.
\| \| * \| \| \|	Implement deleting devices	Richard van der Hoff	2016-07-26	11	-21/+176
\| \| \| \| \| \|
\| \| * \| \| \|	Log when adding listeners	Richard van der Hoff	2016-07-25	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	federation doesn't work over ipv6 yet thanks to twisted	Matthew Hodgson	2016-07-26	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	typo	Matthew Hodgson	2016-07-26	1	-1/+1
\| \|/ / / /
\| * \| \| \|	Merge pull request #946 from matrix-org/dbkr/log_recaptcha_hostname	David Baker	2016-07-25	1	-2/+11
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Log the hostname the reCAPTCHA was completed on
\| \| * \| \|	Use get to avoid KeyErrors	David Baker	2016-07-22	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Log the hostname the reCAPTCHA was completed on	David Baker	2016-07-22	1	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This could be useful information to have in the logs. Also comment about how & why we don't verify the hostname.
\| * \| \| \|	fix: defer.returnValue takes one argument	Mark Haines	2016-07-25	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	background updates: fix assert again	Richard van der Hoff	2016-07-25	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	background updates: Fix assertion to do something	Richard van der Hoff	2016-07-25	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge pull request #945 from matrix-org/rav/background_reindex	Richard van der Hoff	2016-07-25	4	-23/+113
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Create index on user_ips in the background
\| \| * \| \| \|	PEP8	Richard van der Hoff	2016-07-25	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Fix background_update tests	Richard van der Hoff	2016-07-25	2	-13/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A bit of a cleanup for background_updates, and make sure that the real background updates have run before we start the unit tests, so that they don't interfere with the tests.
\| \| * \| \| \|	PEP8	Richard van der Hoff	2016-07-22	1	-1/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Create index on user_ips in the background	Richard van der Hoff	2016-07-22	3	-12/+80
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	user_ips is kinda big, so really we want to add the index in the background once we're running. Replace the schema delta with one which will do that. I've done this in a way that's reasonably easy to reuse as there a few other indexes I need, and I don't suppose they will be the last.
\| * \| \| \|	Merge pull request #947 from matrix-org/rav/unittest_logging	Richard van der Hoff	2016-07-25	1	-4/+7
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Slightly saner logging for unittests
\| \| * \| \|	Slightly saner logging for unittests	Richard van der Hoff	2016-07-25	1	-4/+7
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Give the handler used for logging in unit tests a formatter, so that the output is slightly more meaningful 2. Log some synapse.storage stuff, because it's useful.
\| * \| \|	Merge pull request #944 from matrix-org/rav/devices_returns_list	David Baker	2016-07-21	2	-9/+12
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|	make /devices return a list
\| \| * \|	make /devices return a list	Richard van der Hoff	2016-07-21	2	-9/+12
\| \|/ / \| \| \| \| \| \| \| \| \|	Turns out I specced this to return a list of devices rather than a dict of them
\| * \|	Merge pull request #943 from matrix-org/rav/get_device_api	David Baker	2016-07-21	3	-19/+90
\| \|\ \ \| \| \| \| \| \| \| \|	Implement GET /device/{deviceId}
\| \| * \|	Fix PEP8 errors	Richard van der Hoff	2016-07-21	2	-1/+2
\| \| \| \|
\| \| * \|	Implement GET /device/{deviceId}	Richard van der Hoff	2016-07-21	3	-19/+89
\| \| \| \|
\| * \| \|	Merge pull request #942 from matrix-org/rav/fix_register_deviceid	David Baker	2016-07-21	1	-11/+10
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Preserve device_id from first call to /register
\| \| * \|	Preserve device_id from first call to /register	Richard van der Hoff	2016-07-21	1	-11/+10
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	device_id may only be passed in the first call to /register, so make sure we fish it out of the register `params` rather than the body of the final call.
\| * \|	Merge branch 'rav/get_devices_api' into develop	Richard van der Hoff	2016-07-21	1	-3/+0
\| \|\ \
\| \| * \|	storage/client_ips: remove some dead code	Richard van der Hoff	2016-07-21	1	-3/+0
\| \| \| \|
\| * \| \|	Merge pull request #939 from matrix-org/rav/get_devices_api	David Baker	2016-07-21	10	-17/+395
\| \|\\| \| \| \| \|/ \| \|/\|	GET /devices endpoint
\| \| *	Fix PEP8 errors	Richard van der Hoff	2016-07-20	2	-3/+1
\| \| \|
\| \| *	Merge branch 'develop' into rav/get_devices_api	Richard van der Hoff	2016-07-20	6	-26/+86
\| \| \|\ \| \| \|/ \| \|/\| \| \| \|	(pick up PR #938 in the hope of fixing the UTs)
\| * \|	Merge pull request #938 from matrix-org/rav/add_device_id_to_client_ips	Richard van der Hoff	2016-07-20	3	-8/+34
\| \|\ \ \| \| \| \| \| \| \| \|	Record device_id in client_ips
\| \| * \|	Record device_id in client_ips	Richard van der Hoff	2016-07-20	3	-8/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Record the device_id when we add a client ip; it's somewhat redundant as we could get it via the access_token, but it will make querying rather easier.
\| * \| \|	Don't explode if we have no snapshots yet	Erik Johnston	2016-07-20	1	-0/+3
\| \| \| \|
\| * \| \|	Merge pull request #937 from matrix-org/rav/register_device_on_register	David Baker	2016-07-20	2	-18/+49
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Register a device_id in the /v2/register flow.
\| \| * \|	Register a device_id in the /v2/register flow.	Richard van der Hoff	2016-07-20	2	-18/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This doesn't cover all of the registration flows, but it does cover the most common ones: in particular: shared_secret registration, appservice registration, and normal user/pass registration. Pull device_id from the registration parameters. Register the device in the devices table. Associate the device with the returned access and refresh tokens. Profit.
\| \| \| *	GET /devices endpoint	Richard van der Hoff	2016-07-20	10	-17/+397
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	implement a GET /devices endpoint which lists all of the user's devices. It also returns the last IP where we saw that device, so there is some dancing to fish that out of the user_ips table.
\| * \|	More doc-comments	Richard van der Hoff	2016-07-20	2	-10/+14
\| \|/ \| \| \| \| \| \|	Fix some more comments on some things
\| *	Merge pull request #936 from matrix-org/erikj/log_rss	Erik Johnston	2016-07-20	5	-1/+54
\| \|\ \| \| \| \| \| \|	Add metrics for psutil derived memory usage
\| \| *	Make jenkins install deps on unit tests	Erik Johnston	2016-07-20	1	-0/+4
\| \| \|
\| \| *	Add metrics for psutil derived memory usage	Erik Johnston	2016-07-20	4	-1/+50
\| \| \|
\| * \|	Merge pull request #935 from matrix-org/erikj/backfill_notifs	Erik Johnston	2016-07-20	1	-5/+6
\| \|\ \ \| \| \| \| \| \| \| \|	Don't notify pusher pool for backfilled events
\| \| * \|	Don't notify pusher pool for backfilled events	Erik Johnston	2016-07-20	1	-5/+6
\| \| \|/
\| * \|	Merge pull request #933 from matrix-org/rav/type_annotations	Richard van der Hoff	2016-07-20	7	-0/+47
\| \|\ \ \| \| \| \| \| \| \| \|	Type annotations
\| \| * \|	MANIFEST.in: Add *.pyi	Richard van der Hoff	2016-07-19	1	-0/+1
\| \| \| \|
\| \| * \|	Type annotations	Richard van der Hoff	2016-07-19	6	-0/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add some type annotations to help PyCharm (in particular) to figure out the types of a bunch of things.
\| * \| \|	Merge pull request #932 from matrix-org/rav/register_refactor	David Baker	2016-07-20	5	-22/+57
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|	Further registration refactoring
\| \| * \|	Further registration refactoring	Richard van der Hoff	2016-07-19	5	-22/+57
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* `RegistrationHandler.appservice_register` no longer issues an access token: instead it is left for the caller to do it. (There are two of these, one in `synapse/rest/client/v1/register.py`, which now simply calls `AuthHandler.issue_access_token`, and the other in `synapse/rest/client/v2_alpha/register.py`, which is covered below). * In `synapse/rest/client/v2_alpha/register.py`, move the generation of access_tokens into `_create_registration_details`. This means that the normal flow no longer needs to call `AuthHandler.issue_access_token`; the shared-secret flow can tell `RegistrationHandler.register` not to generate a token; and the appservice flow continues to work despite the above change.
\| * \|	Merge pull request #922 from matrix-org/erikj/file_api2	Erik Johnston	2016-07-20	8	-15/+246
\| \|\ \ \| \| \|/ \| \|/\|	Feature: Add filter to /messages. Add 'contains_url' to filter.
\| \| *	Comment	Erik Johnston	2016-07-20	1	-0/+4
\| \| \|
\| \| *	Add filter param to /messages API	Erik Johnston	2016-07-14	4	-11/+29
\| \| \|
\| \| *	Add support for filters in paginate_room_events	Erik Johnston	2016-07-14	1	-1/+51
\| \| \|
\| \| *	Add 'contains_url' to filter	Erik Johnston	2016-07-14	1	-3/+20
\| \| \|
\| \| *	Add sender and contains_url field to events table	Erik Johnston	2016-07-14	2	-0/+142
\| \| \|
\| * \|	Merge pull request #931 from matrix-org/rav/refactor_register	David Baker	2016-07-19	2	-79/+104
\| \|\ \ \| \| \| \| \| \| \| \|	rest/client/v2_alpha/register.py: Refactor flow somewhat.
\| \| * \|	Don't bind email unless threepid contains expected fields	Richard van der Hoff	2016-07-19	1	-28/+25
\| \| \| \|
\| \| * \|	rest/client/v2_alpha/register.py: Refactor flow somewhat.	Richard van der Hoff	2016-07-19	2	-76/+104
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is meant to be an almost non-functional change, with the exception that it fixes what looks a lot like a bug in that it only calls `auth_handler.add_threepid` and `add_pusher` once instead of three times. The idea is to move the generation of the `access_token` out of `registration_handler.register`, because `access_token`s now require a device_id, and we only want to generate a device_id once registration has been successful.
\| * \| \|	Merge pull request #929 from matrix-org/rav/support_deviceid_in_login	Richard van der Hoff	2016-07-19	12	-31/+354
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Add device_id support to /login
\| \| * \|	schema fix	Richard van der Hoff	2016-07-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	device_id should be text, not bigint.
\| \| * \|	Add device_id support to /login	Richard van der Hoff	2016-07-18	12	-31/+354
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a 'devices' table to the storage, as well as a 'device_id' column to refresh_tokens. Allow the client to pass a device_id, and initial_device_display_name, to /login. If login is successful, then register the device in the devices table if it wasn't known already. If no device_id was supplied, make one up. Associate the device_id with the access token and refresh token, so that we can get at it again later. Ensure that the device_id is copied from the refresh token to the access_token when the token is refreshed.