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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix tests	Erik Johnston	2015-09-01	2	-9/+30
\|
*	Check room exists when authenticating an event, by asserting they reference ↵	Erik Johnston	2015-09-01	1	-0/+8
\| \| \| \|	a creation event
*	Merge pull request #264 from matrix-org/markjh/syweb_on_pypi	Mark Haines	2015-09-01	2	-7/+0
\|\ \| \| \| \|	Use the version of "matrix-angular-sdk" hosted on pypi
\| *	Use the version of "matrix-angular-sdk" hosted on pypi	Mark Haines	2015-09-01	2	-7/+0
\|/
*	Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-09-01	7	-376/+7
\|\
\| *	Merge pull request #261 from matrix-org/erikj/scripts_clean	Erik Johnston	2015-09-01	6	-380/+6
\| \|\ \| \| \| \| \| \|	Clean up scripts/
\| \| *	Remove spurious .py from docs	Erik Johnston	2015-09-01	1	-1/+1
\| \| \|
\| \| *	Actually add config path	Erik Johnston	2015-08-28	1	-0/+2
\| \| \|
\| \| *	Clean up scripts/	Erik Johnston	2015-08-27	5	-380/+4
\| \| \|
\| * \|	Lower size of 'stateGroupCache' now that we have data from matrix.org to ↵	Erik Johnston	2015-09-01	1	-1/+1
\| \|/ \| \| \| \| \| \|	support doing so
* \|	don't log the whole DB config (including postgres password...)	Matthew Hodgson	2015-08-29	1	-2/+2
\| \|
* \|	Merge pull request #258 from matrix-org/slowtestsmakemesad	Daniel Wagner-Hall	2015-08-28	3	-4/+39
\|\ \ \| \| \| \| \| \|	Swap out bcrypt for md5 in tests
\| * \|	Remove unused import	Daniel Wagner-Hall	2015-08-26	1	-1/+0
\| \| \|
\| * \|	Swap out bcrypt for md5 in tests	Daniel Wagner-Hall	2015-08-26	3	-3/+39
\| \| \| \| \| \| \| \| \| \| \| \|	This reduces our ~8 second sequential test time down to ~7 seconds
* \| \|	Merge branch 'release-v0.10.0' into develop	Mark Haines	2015-08-28	17	-73/+262
\|\ \ \ \| \|/ / \|/\| / \| \|/ \| \| \| \| \| \|	Conflicts: synapse/handlers/auth.py synapse/python_dependencies.py synapse/rest/client/v1/login.py
\| *	Bump version and changelog v0.10.0-rc5	Erik Johnston	2015-08-27	2	-1/+6
\| \|
\| *	Merge pull request #260 from matrix-org/erikj/filename_order	Erik Johnston	2015-08-27	1	-8/+14
\| \|\ \| \| \| \| \| \|	Check for an internationalised filename first
\| \| *	Consistency	Erik Johnston	2015-08-27	1	-3/+3
\| \| \|
\| \| *	Check for an internationalised filename first	Erik Johnston	2015-08-27	1	-8/+14
\| \|/
\| *	None check the correct variable	Erik Johnston	2015-08-27	1	-2/+3
\| \|
\| *	Check for None	Erik Johnston	2015-08-27	1	-1/+1
\| \|
\| *	Bump changelog and version v0.10.0-rc4	Erik Johnston	2015-08-27	2	-4/+11
\| \|
\| *	Merge pull request #259 from matrix-org/markjh/unicode_content_disposition	Erik Johnston	2015-08-27	3	-12/+43
\| \|\ \| \| \| \| \| \|	Support unicode attachment filenames
\| \| *	Give a sensible error message if the filename is invalid UTF-8	Mark Haines	2015-08-26	2	-2/+8
\| \| \|
\| \| *	Handle unicode filenames given when downloading or received over federation	Mark Haines	2015-08-26	1	-5/+21
\| \| \|
\| \| *	Allow non-ascii filenames for attachments	Mark Haines	2015-08-26	3	-8/+17
\| \|/
\| *	Merge pull request #252 from matrix-org/erikj/typing_loop	Erik Johnston	2015-08-26	1	-9/+5
\| \|\ \| \| \| \| \| \|	Don't loop over all rooms ever in typing.get_new_events_for_user
\| \| *	Remove needless existence checks	Erik Johnston	2015-08-26	1	-7/+3
\| \| \|
\| \| *	Don't loop over all rooms ever in typing.get_new_events_for_user	Erik Johnston	2015-08-26	1	-2/+2
\| \|/
\| *	Bump changelog and version v0.10.0-rc3	Erik Johnston	2015-08-25	2	-1/+18
\| \|
\| *	Merge pull request #250 from matrix-org/erikj/generated_directory	Erik Johnston	2015-08-25	1	-2/+15
\| \|\ \| \| \| \| \| \|	Add config option to specify where generated files should be dumped
\| \| *	Update config doc	Erik Johnston	2015-08-25	1	-1/+2
\| \| \|
\| \| *	s/--generated-directory/--keys-directory/	Erik Johnston	2015-08-25	1	-7/+7
\| \| \|
\| \| *	Add config option to specify where generated files should be dumped	Erik Johnston	2015-08-25	1	-2/+14
\| \| \|
\| * \|	Merge pull request #249 from matrix-org/erikj/allow_config_path_dirs	Erik Johnston	2015-08-25	1	-6/+34
\| \|\ \ \| \| \| \| \| \| \| \|	Allow specifying directories as config paths
\| \| * \|	Warn if we encounter unexpected files in config directories	Erik Johnston	2015-08-25	1	-7/+17
\| \| \|/
\| \| *	Allow specifying directories as config files	Erik Johnston	2015-08-25	1	-6/+24
\| \|/
\| *	Merge pull request #245 from matrix-org/erikj/configurable_client_location	Erik Johnston	2015-08-25	3	-14/+30
\| \|\ \| \| \| \| \| \|	Allow specifying a directory to host a web client from
\| \| *	Print the correct pip install line when failing due to lack of ↵	Erik Johnston	2015-08-25	2	-8/+9
\| \| \| \| \| \| \| \| \| \| \| \|	matrix-angular-sdk
\| \| *	Update the log message	Erik Johnston	2015-08-25	1	-5/+10
\| \| \|
\| \| *	Revert previous commit. Instead, always download matrix-angular-sdk as a ↵	Erik Johnston	2015-08-25	1	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \|	requirement, but don't complain (when we do check_requirements) if we don't have it when we start synapse.
\| \| *	Remove dependency on matrix-angular-sdk	Erik Johnston	2015-08-25	2	-6/+9
\| \| \|
\| \| *	Allow specifying a directory to host a web client from	Erik Johnston	2015-08-25	2	-3/+6
\| \| \|
\| * \|	Merge pull request #246 from matrix-org/erikj/config_helper_function	Erik Johnston	2015-08-25	1	-0/+30
\| \|\ \ \| \| \|/ \| \|/\|	Add utility to parse config and print out a key
\| \| *	Fix typo when using sys.stderr.write	Erik Johnston	2015-08-25	1	-1/+1
\| \| \|
\| \| *	Add utility to parse config and print out a key	Erik Johnston	2015-08-25	1	-0/+30
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Usage: ``` $ python -m synapse.config read server_name -c homeserver.yaml localhost ```
\| *	Bump version and changelog v0.10.0-rc2	Erik Johnston	2015-08-24	2	-1/+11
\| \|
\| *	Do auth checks before persisting the event	Erik Johnston	2015-08-24	1	-16/+16
\| \|
\| *	Merge pull request #242 from matrix-org/erikj/pushers_ephemeral_events	Erik Johnston	2015-08-24	3	-6/+19
\| \|\ \| \| \| \| \| \|	Don't make pushers handle presence/typing events
\| \| *	Don't make pushers handle presence/typing events	Erik Johnston	2015-08-24	3	-6/+19
\| \|/
\| *	Don't insert events into 'event_*_extremeties' tables if they're outliers	Erik Johnston	2015-08-23	1	-2/+8
\| \|
\| *	Actually check if event_id isn't returned by _get_state_groups	Erik Johnston	2015-08-21	1	-2/+9
\| \|
\| *	Upate changelog v0.10.0-rc1	Erik Johnston	2015-08-21	1	-1/+1
\| \|
\| *	Upate changelog	Erik Johnston	2015-08-21	1	-0/+3
\| \|
\| *	Merge branch 'erikj/user_dedup' into release-v0.10.0	Erik Johnston	2015-08-21	4	-12/+48
\| \|\
\| \| *	Doc string	Erik Johnston	2015-08-21	1	-0/+6
\| \| \|
\| \| *	When logging in fetch user by user_id case insensitively, unless there are ↵	Erik Johnston	2015-08-21	3	-12/+31
\| \| \| \| \| \| \| \| \| \| \| \|	multiple case insensitive matches, in which case require the exact user_id
\| \| *	Don't allow people to register user ids which only differ by case to an ↵	Erik Johnston	2015-08-21	2	-2/+13
\| \|/ \| \| \| \| \| \|	existing one
* \|	Merge pull request #254 from matrix-org/markjh/tox_setuptools	Mark Haines	2015-08-26	3	-5/+37
\|\ \ \| \| \| \| \| \|	Make 'setup.py test' run tox
\| * \|	Pass an empty list of arguments to tox if no arguments are given	Mark Haines	2015-08-26	1	-0/+2
\| \| \|
\| * \|	Install tox locally if it wasn't already installed when running setup.py test	Mark Haines	2015-08-26	1	-2/+10
\| \| \|
\| * \|	Make 'setup.py test' run tox	Mark Haines	2015-08-26	3	-5/+27
\| \| \|
* \| \|	Merge pull request #255 from matrix-org/mergeeriksmadness	Daniel Wagner-Hall	2015-08-26	4	-12/+50
\|\ \ \ \| \|/ / \|/\| \|	Merge erikj/user_dedup to develop
\| * \|	Merge erikj/user_dedup to develop	Daniel Wagner-Hall	2015-08-26	4	-12/+50
\| \| \|
* \| \|	Merge pull request #253 from matrix-org/tox	Daniel Wagner-Hall	2015-08-26	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|	Allow tests to be filter when using tox
\| * \|	Allow tests to be filter when using tox	Daniel Wagner-Hall	2015-08-26	1	-1/+1
\|/ / \| \| \| \| \| \| \| \|	`tox` will run all tests `tox tests.api.test_auth.AuthTestCase` will run just the tests in AuthTestCase
* \|	Merge pull request #251 from matrix-org/removeadmin	Daniel Wagner-Hall	2015-08-25	9	-24/+5
\|\ \ \| \| \| \| \| \|	Stop looking up "admin", which we never read
\| * \	Merge branch 'deviceid' into removeadmin	Daniel Wagner-Hall	2015-08-25	2	-4/+2
\| \|\ \
\| * \| \|	Stop looking up "admin", which we never read	Daniel Wagner-Hall	2015-08-25	9	-24/+5
\| \| \| \|
* \| \| \|	Merge pull request #248 from matrix-org/deviceid	Daniel Wagner-Hall	2015-08-25	30	-95/+64
\|\ \ \ \ \| \| \|/ / \| \|/\| \|	Remove completely unused concepts from codebase
\| * \| \|	Fix up one more reference	Daniel Wagner-Hall	2015-08-25	2	-4/+2
\| \|/ /
\| * \|	Re-wrap line	Daniel Wagner-Hall	2015-08-25	1	-3/+1
\| \| \|
\| * \|	Remove completely unused concepts from codebase	Daniel Wagner-Hall	2015-08-25	29	-90/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly.
* \| \|	Merge pull request #247 from matrix-org/markjh/tox	Mark Haines	2015-08-25	4	-8/+38
\|\ \ \ \| \| \| \| \| \| \| \|	Add a tox.ini config for synapse.
\| * \| \|	Add .tox to .gitignore	Mark Haines	2015-08-25	1	-0/+1
\| \| \| \|
\| * \| \|	Set PYTHONDONTWRITEBYTECODE in the tox environment so that we don't spew ↵	Mark Haines	2015-08-25	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	.pyc files everywhere
\| * \| \|	Prod jenkins	Mark Haines	2015-08-25	0	-0/+0
\| \| \| \|
\| * \| \|	Prod jenkins	Mark Haines	2015-08-25	0	-0/+0
\| \| \| \|
\| * \| \|	Prod jenkins	Mark Haines	2015-08-25	0	-0/+0
\| \| \| \|
\| * \| \|	Only include demo/demo.tls.dh. Don't include any other dh file	Mark Haines	2015-08-25	1	-3/+5
\| \| \| \|
\| * \| \|	Add tox.ini file for synapse	Mark Haines	2015-08-25	3	-5/+30
\|/ / /
* \| \|	Merge pull request #243 from matrix-org/markjh/remove_syutil	Mark Haines	2015-08-25	22	-93/+84
\|\ \ \ \| \|/ / \|/\| \|	Replace syutil dependency with smaller, single-purpose libraries
\| * \|	Fix typo in module imports and package dependencies	Mark Haines	2015-08-25	2	-2/+2
\| \| \|
\| * \|	Fix indent	Mark Haines	2015-08-24	1	-1/+1
\| \| \|
\| * \|	Replace syutil references in scripts	Mark Haines	2015-08-24	5	-22/+15
\| \| \|
\| * \|	Remove syutil dependency in favour of smaller single-purpose libraries	Mark Haines	2015-08-24	17	-71/+69
\| \| \|
* \| \|	Merge pull request #244 from matrix-org/markjh/refresh_tokens	Mark Haines	2015-08-25	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|	Remove autoincrement since we incrementing the ID in the storage layer
\| * \|	Remove autoincrement since we incrementing the ID in the storage layer	Mark Haines	2015-08-24	1	-1/+1
\|/ /
* \|	Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-08-21	3	-2/+7
\|\\|
\| *	Fix bug where we didn't correctly serialize the redacted_because key over ↵	Erik Johnston	2015-08-21	2	-1/+6
\| \| \| \| \| \| \| \|	federation
\| *	Add missing param in store.get_state_groups invocation	Erik Johnston	2015-08-21	1	-1/+1
\| \|
\| *	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.10.0	Erik Johnston	2015-08-20	4	-4/+6
\| \|\
* \| \|	Return fully qualified user_id as per spec	David Baker	2015-08-20	1	-1/+1
\| \| \|
* \| \|	Merge pull request #240 from matrix-org/refresh	Daniel Wagner-Hall	2015-08-20	19	-76/+303
\|\ \ \ \| \| \| \| \| \| \| \|	/tokenrefresh POST endpoint
\| * \| \|	Fix bad merge	Daniel Wagner-Hall	2015-08-20	1	-8/+1
\| \| \| \|
\| * \| \|	Fix indentation	Daniel Wagner-Hall	2015-08-20	1	-1/+2
\| \| \| \|
\| * \| \|	Fix flake8 warnings	Daniel Wagner-Hall	2015-08-20	1	-4/+6
\| \| \| \|
\| * \| \|	Merge branch 'auth' into refresh	Daniel Wagner-Hall	2015-08-20	2	-4/+4
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/handlers/register.py
\| * \ \ \	Merge branch 'develop' into refresh	Daniel Wagner-Hall	2015-08-20	19	-80/+498
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/rest/client/v1/login.py
\| * \| \| \|	/tokenrefresh POST endpoint	Daniel Wagner-Hall	2015-08-20	9	-8/+232
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows refresh tokens to be exchanged for (access_token, refresh_token). It also starts issuing them on login, though no clients currently interpret them.
\| * \| \| \|	s/by_token/by_access_token/g	Daniel Wagner-Hall	2015-08-20	10	-40/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We're about to have two kinds of token, access and refresh
\| * \| \| \|	Move token generation to auth handler	Daniel Wagner-Hall	2015-08-20	3	-31/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I prefer the auth handler to worry about all auth, and register to call into it as needed, than to smatter auth logic between the two.
\| * \| \| \|	Merge branch 'auth' into refresh	Daniel Wagner-Hall	2015-08-20	7	-24/+115
\| \|\ \ \ \
* \| \ \ \ \	Merge pull request #229 from matrix-org/auth	Daniel Wagner-Hall	2015-08-20	5	-6/+90
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|	Issue macaroons as opaque auth tokens
\| * \| \| \| \|	Remove incorrect whitespace	Daniel Wagner-Hall	2015-08-20	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' into auth	Daniel Wagner-Hall	2015-08-20	1	-1/+1
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'develop' into auth	Daniel Wagner-Hall	2015-08-20	21	-93/+531
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| / / \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'develop' into auth	Daniel Wagner-Hall	2015-08-19	9	-25/+128
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into auth	Daniel Wagner-Hall	2015-08-19	2	-18/+25
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Re-add whitespace around caveat operators	Daniel Wagner-Hall	2015-08-19	2	-8/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Switch to pymacaroons-pynacl	Daniel Wagner-Hall	2015-08-19	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove padding space around caveat operators	Daniel Wagner-Hall	2015-08-18	2	-8/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix units in test	Daniel Wagner-Hall	2015-08-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I made the non-test seconds instead of ms, but not the test
\| * \| \| \| \| \| \|	Fix some formatting to use tuples	Daniel Wagner-Hall	2015-08-18	2	-5/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'develop' into auth	Daniel Wagner-Hall	2015-08-18	38	-455/+1346
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Remove accidentally added file	Daniel Wagner-Hall	2015-08-18	1	-0/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Issue macaroons as opaque auth tokens	Daniel Wagner-Hall	2015-08-18	6	-6/+90
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This just replaces random bytes with macaroons. The macaroons are not inspected by the client or server. In particular, they claim to have an expiry time, but nothing verifies that they have not expired. Follow-up commits will actually enforce the expiration, and allow for token refresh. See https://bit.ly/matrix-auth for more information
* \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into develop	Mark Haines	2015-08-20	2	-18/+25
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| / / / \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	hacky support for video for FS CC DD	Matthew Hodgson	2015-08-06	1	-3/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	hacky support for video for FS CC DD	Matthew Hodgson	2015-08-06	1	-15/+25
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #239 from matrix-org/pynacl	Daniel Wagner-Hall	2015-08-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \|	Correct pynacl version to 0.3.0
\| * \| \| \| \| \| \|	Correct pynacl version to 0.3.0	Daniel Wagner-Hall	2015-08-20	1	-1/+1
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	0.0.3 was a typo
* \| \| \| \| \| \|	Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-08-20	4	-45/+151
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #237 from matrix-org/markjh/readme-rst-formatting	Mark Haines	2015-08-20	1	-37/+39
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up some of restructured text formatting in the README.rst
\| \| * \| \| \| \| \|	Further formatting clean ups	Mark Haines	2015-08-20	1	-7/+7
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Clean up some of restructured text formatting in the README.rst	Mark Haines	2015-08-20	1	-30/+32
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #236 from matrix-org/markjh/upgrade-instructions	Mark Haines	2015-08-20	2	-7/+37
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add generic update instructions to UPGRADE.rst
\| \| * \| \| \| \| \| \|	Tweak the wording a bit	Mark Haines	2015-08-20	1	-4/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add generic update instructions to UPGRADE.rst and add link to them from the ↵	Mark Haines	2015-08-20	2	-7/+37
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	README.rst
\| * / / / / / /	Update changelog	Erik Johnston	2015-08-20	1	-0/+1
\| \|/ / / / / /
\| * \| \| \| \| \|	Bump version and changelog	Erik Johnston	2015-08-20	2	-1/+74
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #235 from matrix-org/erikj/room_avatars	Erik Johnston	2015-08-20	2	-2/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add m.room.avatar to default power levels.
\| * \| \| \| \| \| \|	Add m.room.avatar to default power levels. Change default required power ↵	Erik Johnston	2015-08-20	2	-2/+4
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	levels of such events to 50
* \| \| \| \| \| \|	Merge pull request #238 from matrix-org/fix_set_password	Erik Johnston	2015-08-20	2	-2/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Fix set password
\| * \| \| \| \| \|	Remove spurious extra arg to set_password	David Baker	2015-08-20	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Another use of check_password that got missed in the yield fix	David Baker	2015-08-20	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #231 from matrix-org/erikj/pushers_store_last_token	Erik Johnston	2015-08-20	1	-5/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Push: store the 'last_token' in the db, even if we processed no events
\| * \| \| \| \| \|	Store the 'last_token' in the db, even if we processed no events	Erik Johnston	2015-08-19	1	-0/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Block on storing the current last_tokens	Erik Johnston	2015-08-19	1	-5/+5
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #206 from matrix-org/erikj/generate_presice_thumbnails	Mark Haines	2015-08-20	3	-21/+226
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always return a thumbnail of the requested size.
\| * \| \| \| \| \|	Fix flake8 warning	Mark Haines	2015-08-13	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into ↵	Mark Haines	2015-08-13	34	-368/+613
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/generate_presice_thumbnails
\| * \| \| \| \| \| \|	Doc-string for config ultility function	Mark Haines	2015-08-12	1	-0/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add config option for setting the list of thumbnail sizes to precalculate	Mark Haines	2015-08-12	2	-16/+41
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make a config option for whether to generate new thumbnail sizes dynamically	Mark Haines	2015-08-12	3	-7/+27
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Factor out thumbnail()	Erik Johnston	2015-07-23	1	-56/+40
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix remote thumbnailing	Erik Johnston	2015-07-23	2	-7/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Always return a thumbnail of the requested size.	Erik Johnston	2015-07-23	2	-2/+162
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before, we returned a thumbnail that was at least as big (if possible) as the requested size. Now, if we don't have a thumbnail of the given size we generate (and persist) one of that size.
* \| \| \| \| \| \| \|	Merge pull request #233 from matrix-org/erikj/canonical_alias	Erik Johnston	2015-08-20	3	-1/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add server side support for canonical aliases
\| * \| \| \| \| \| \| \|	Check that the canonical room alias actually points to the room	Erik Johnston	2015-08-20	1	-1/+17
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add canonical alias to the default power levels	Erik Johnston	2015-08-19	2	-0/+2
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #234 from matrix-org/email_login	David Baker	2015-08-20	1	-5/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support logging in with email addresses (or other threepids)
\| * \| \| \| \| \| \| \|	Comma comma comma comma comma chameleon	David Baker	2015-08-20	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'develop' into email_login	David Baker	2015-08-20	60	-707/+1752
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #211 from matrix-org/email_in_use	Mark Haines	2015-08-20	5	-1/+75
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|	Changes for unique emails
\| * \| \| \| \| \| \| \|	Check absent before trying to access keys	David Baker	2015-08-12	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Just leaving off the $ is fine. r* == registerrrrrrrrr	David Baker	2015-08-12	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #232 from matrix-org/erikj/appservice_joined_rooms	Erik Johnston	2015-08-19	3	-12/+32
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|	Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users
\| * \| \| \| \| \| \| \|	Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users	Erik Johnston	2015-08-19	3	-12/+32
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Remove an access token log line	Erik Johnston	2015-08-19	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix regression where we incorrectly responded with a 200 to /login	Erik Johnston	2015-08-19	1	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #228 from matrix-org/erikj/_get_state_for_groups	Erik Johnston	2015-08-18	1	-2/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure we never return a None event from _get_state_for_groups
\| * \| \| \| \| \| \| \|	Remove newline because vertical whitespace makes mjark sad	Erik Johnston	2015-08-18	1	-2/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Rejig the code to make it nicer	Erik Johnston	2015-08-18	1	-3/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Ensure we never return a None event from _get_state_for_groups	Erik Johnston	2015-08-18	1	-3/+8
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #230 from matrix-org/erikj/appservice_auth_entity	Erik Johnston	2015-08-18	1	-0/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set request.authenticated_entity for application services
\| * \| \| \| \| \| \| \|	Set request.authenticated_entity for application services	Erik Johnston	2015-08-18	1	-0/+3
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #227 from matrix-org/erikj/receipts_take2	Erik Johnston	2015-08-18	4	-17/+91
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-enable receipts API.
\| * \| \| \| \| \| \| \|	Rename unhelpful variable name	Erik Johnston	2015-08-18	1	-7/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Comments	Erik Johnston	2015-08-18	1	-4/+14
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add index receipts_linearized_room_stream	Erik Johnston	2015-08-17	2	-1/+19
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove unused import	Erik Johnston	2015-08-17	1	-2/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove added unused methods	Erik Johnston	2015-08-17	1	-7/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-17	10	-147/+105
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/receipts_take2
\| * \| \| \| \| \| \| \| \|	Batch _get_linearized_receipts_for_rooms	Erik Johnston	2015-08-14	1	-15/+64
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-13	3	-51/+18
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/receipts_take2
\| * \| \| \| \| \| \| \| \| \|	Add metrics to the receipts cache	Erik Johnston	2015-08-13	2	-0/+13
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Re-enable receipts	Erik Johnston	2015-08-13	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #225 from matrix-org/erikj/reactor_metrics	Erik Johnston	2015-08-18	1	-3/+25
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pending_calls metric to not lie
\| * \| \| \| \| \| \| \| \| \| \|	Also check for presence of 'threadCallQueue' in reactor	Erik Johnston	2015-08-18	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Use more helpful variable names	Erik Johnston	2015-08-18	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix pending_calls metric to not lie	Erik Johnston	2015-08-14	1	-3/+18
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Bump size of get_presence_state cache	Erik Johnston	2015-08-18	1	-1/+1
\| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Typo	Erik Johnston	2015-08-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	None check	Erik Johnston	2015-08-18	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Don't assume @cachedList function returns keys for everything	Erik Johnston	2015-08-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Reduce cache size from obscenely large to quite large	Erik Johnston	2015-08-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #226 from matrix-org/erikj/room_presence	Erik Johnston	2015-08-18	3	-15/+122
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add and use cached batched storage.get_state function.
\| * \| \| \| \| \| \| \| \| \| \|	More helpful variable names	Erik Johnston	2015-08-18	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Doc strings	Erik Johnston	2015-08-18	1	-0/+28
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove debug try/catch	Erik Johnston	2015-08-18	1	-47/+43
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remember to invalidate caches	Erik Johnston	2015-08-17	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Implement a batched presence_handler.get_state and use it	Erik Johnston	2015-08-17	3	-14/+73
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add batched version of store.get_presence_state	Erik Johnston	2015-08-17	1	-1/+19
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #208 from matrix-org/markjh/end-to-end-key-federation	Mark Haines	2015-08-18	5	-30/+233
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Federation for end-to-end key requests.
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into ↵	Mark Haines	2015-08-13	35	-369/+615
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	markjh/end-to-end-key-federation
\| * \| \| \| \| \| \| \| \| \|	Add a few strategic new lines to break up the on_query_client_keys and ↵	Mark Haines	2015-08-13	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	on_claim_client_keys methods in federation_server.py
\| * \| \| \| \| \| \| \| \| \|	Get the end-to-end key federation working	Mark Haines	2015-07-24	4	-21/+17
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add federation support for end-to-end key requests	Mark Haines	2015-07-23	5	-30/+231
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Fix bug where we were leaking None into state event lists	Erik Johnston	2015-08-17	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #221 from matrix-org/auth	Daniel Wagner-Hall	2015-08-14	9	-145/+102
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|	Simplify LoginHander and AuthHandler
\| * \| \| \| \| \| \| \| \|	Merge password checking implementations	Daniel Wagner-Hall	2015-08-12	1	-20/+15
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'develop' into auth	Daniel Wagner-Hall	2015-08-12	3	-55/+49
\| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into develop	Daniel Wagner-Hall	2015-08-12	5	-71/+70
\| \| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Simplify LoginHander and AuthHandler	Daniel Wagner-Hall	2015-08-12	9	-131/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Merge LoginHandler -> AuthHandler * Add a bunch of documentation * Improve some naming * Remove unused branches I will start merging the actual logic of the two handlers shortly
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into auth	Daniel Wagner-Hall	2015-08-11	1	-2/+2
\| \|\\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Remove call to recently removed function in mock	Daniel Wagner-Hall	2015-08-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #219 from matrix-org/erikj/dictionary_cache	Erik Johnston	2015-08-13	27	-356/+928
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Dictionary and list caches
\| * \| \| \| \| \| \| \| \| \| \|	Remove pointless map	Erik Johnston	2015-08-13	1	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-13	1	-0/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/dictionary_cache
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #224 from matrix-org/erikj/reactor_metrics	Erik Johnston	2015-08-13	1	-0/+29
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|	Add some metrics about the reactor
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into erikj/reactor_metrics	Mark Haines	2015-08-13	2	-1/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Add max-line-length to the flake8 section of setup.cfg	Mark Haines	2015-08-13	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Remove some vertical space	Erik Johnston	2015-08-13	1	-36/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Replace list comprehension	Erik Johnston	2015-08-13	1	-8/+3
\| \| \| \|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-13	1	-1/+0
\| \| \|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/dictionary_cache
* \| \| \| \| \| \| \| \| \| \|	PEP8	Erik Johnston	2015-08-13	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache	Erik Johnston	2015-08-13	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Don't time getDelayedCalls	Erik Johnston	2015-08-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache	Erik Johnston	2015-08-13	5	-56/+60
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add some metrics about the reactor	Erik Johnston	2015-08-13	1	-0/+29
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #173 from matrix-org/markjh/twisted-15	Mark Haines	2015-08-12	3	-55/+29
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update to Twisted-15.2.1.
\| * \| \| \| \| \| \| \| \| \|	Depend on Twisted>=15.1 rather than pining to a particular version	Mark Haines	2015-08-12	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into markjh/twisted-15	Mark Haines	2015-08-12	96	-1673/+4524
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/http/matrixfederationclient.py
\| * \| \| \| \| \| \| \| \| \|	Bump the version of twisted needed for setup_requires to 15.2.1	Mark Haines	2015-06-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into markjh/twisted-15	Mark Haines	2015-06-01	11	-21/+53
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/python_dependencies.py
\| * \| \| \| \| \| \| \| \| \| \|	Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ↵	Mark Haines	2015-06-01	2	-51/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	own Agent
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #223 from matrix-org/markjh/enable_demo_registration	Erik Johnston	2015-08-12	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	enable registration in the demo servers
\| * \| \| \| \| \| \| \| \| \| \|	enable registration in the demo servers	Mark Haines	2015-08-12	1	-1/+2
\|/ / / / / / / / / / /
\| \| \| * \| \| \| \| \| \| \|	Comment	Erik Johnston	2015-08-12	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Explain why we're prefilling dict with Nones	Erik Johnston	2015-08-12	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Better variable name	Erik Johnston	2015-08-12	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Split _get_state_for_group_from_cache into two	Erik Johnston	2015-08-12	1	-32/+53
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Fix _filter_events_for_client	Erik Johnston	2015-08-12	2	-6/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Docstring	Erik Johnston	2015-08-12	1	-0/+27
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Simplify staggered deferred lists	Erik Johnston	2015-08-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Use list comprehension instead of filter	Erik Johnston	2015-08-12	2	-20/+6
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-12	3	-61/+57
\| \| \| \|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/dictionary_cache
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #220 from matrix-org/markjh/generate_keys	Erik Johnston	2015-08-12	1	-45/+36
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the --generate-keys option.
\| * \| \| \| \| \| \| \| \| \| \|	Fix the --generate-keys option. Make it do the same thing as ↵	Mark Haines	2015-08-12	1	-45/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	--generate-config does when the config file exists, but without printing a warning
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #216 from matrix-org/auth	Daniel Wagner-Hall	2015-08-12	2	-16/+21
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|	Clean up some docs and redundant fluff
\| * \| \| \| \| \| \| \| \| \| \|	Add missing space because linter	Daniel Wagner-Hall	2015-08-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Minor docs cleanup	Daniel Wagner-Hall	2015-08-11	2	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove redundant if-guard	Daniel Wagner-Hall	2015-08-11	1	-13/+12
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The startswith("@") does the job
\| \| \| \| \| * \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-12	4	-13/+18
\| \| \| \| \| \|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/dictionary_cache
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #182 from ↵	Mark Haines	2015-08-12	2	-10/+13
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/manu/fix_no_rate_limit_in_federation_demo Federation demo start.sh: Fixed --no-rate-limit param in the script
\| * \| \| \| \| \| \| \| \| \|	Fix the cleanup script to use the right $DIR	Mark Haines	2015-08-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Federation demo start.sh: Fixed --no-rate-limit param in the script	manuroe	2015-06-04	2	-10/+13
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #218 from matrix-org/mockfix	Erik Johnston	2015-08-11	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Remove call to "recently" removed function in mock
\| * \| \| \| \| \| \| \| \| \|	Remove call to recently removed function in mock	Daniel Wagner-Hall	2015-08-11	1	-2/+2
\|/ / / / / / / / / /