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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #255 from matrix-org/mergeeriksmadness	Daniel Wagner-Hall	2015-08-26	4	-12/+50
\|\
\| *	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	Daniel Wagner-Hall	2015-08-26	1	-1/+1
\|/
*	Merge pull request #251 from matrix-org/removeadmin	Daniel Wagner-Hall	2015-08-25	9	-24/+5
\|\
\| *	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
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	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
* \|	Merge pull request #247 from matrix-org/markjh/tox	Mark Haines	2015-08-25	4	-8/+38
\|\ \
\| * \|	Add .tox to .gitignore	Mark Haines	2015-08-25	1	-0/+1
\| * \|	Set PYTHONDONTWRITEBYTECODE in the tox environment so that we don't spew .pyc...	Mark Haines	2015-08-25	1	-0/+2
\| * \|	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
\|\ \ \| \|/ \|/\|
\| *	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	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 fed...	Erik Johnston	2015-08-21	2	-1/+6
\| *	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
\|\ \ \
\| * \| \|	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
\| \|\ \ \
\| * \ \ \	Merge branch 'develop' into refresh	Daniel Wagner-Hall	2015-08-20	19	-80/+498
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	/tokenrefresh POST endpoint	Daniel Wagner-Hall	2015-08-20	9	-8/+232
\| * \| \| \|	s/by_token/by_access_token/g	Daniel Wagner-Hall	2015-08-20	10	-40/+40
\| * \| \| \|	Move token generation to auth handler	Daniel Wagner-Hall	2015-08-20	3	-31/+38
\| * \| \| \|	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
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	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
\| * \| \| \| \| \| \|	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
* \| \| \| \| \| \| \| \|	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	Daniel Wagner-Hall	2015-08-20	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	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
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	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
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	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
\| \| \|/ / / / / /
\| * / / / / / /	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. Change default required power leve...	Erik Johnston	2015-08-20	2	-2/+4
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #238 from matrix-org/fix_set_password	Erik Johnston	2015-08-20	2	-2/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	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
\|\ \ \ \ \ \
\| * \| \| \| \| \|	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
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix flake8 warning	Mark Haines	2015-08-13	1	-0/+1
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into erikj/generate_presice_thu...	Mark Haines	2015-08-13	34	-368/+613
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	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
* \| \| \| \| \| \| \|	Merge pull request #233 from matrix-org/erikj/canonical_alias	Erik Johnston	2015-08-20	3	-1/+19
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	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	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
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	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	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
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	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 erikj/receipts_t...	Erik Johnston	2015-08-17	10	-147/+105
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Batch _get_linearized_receipts_for_rooms	Erik Johnston	2015-08-14	1	-15/+64
\| * \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_t...	Erik Johnston	2015-08-13	3	-51/+18
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into markjh/end-to-end-key-fede...	Mark Haines	2015-08-13	35	-369/+615
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add a few strategic new lines to break up the on_query_client_keys and on_cla...	Mark Haines	2015-08-13	1	-0/+6
\| * \| \| \| \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	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 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
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove pointless map	Erik Johnston	2015-08-13	1	-7/+3
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary...	Erik Johnston	2015-08-13	1	-0/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #224 from matrix-org/erikj/reactor_metrics	Erik Johnston	2015-08-13	1	-0/+29
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	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 erikj/dictionary...	Erik Johnston	2015-08-13	1	-1/+0
\| \| \|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	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
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	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
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ...	Mark Haines	2015-06-01	2	-51/+26
* \| \| \| \| \| \| \| \| \| \| \|	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	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 erikj/dictionary...	Erik Johnston	2015-08-12	3	-61/+57
\| \| \| \|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #220 from matrix-org/markjh/generate_keys	Erik Johnston	2015-08-12	1	-45/+36
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Fix the --generate-keys option. Make it do the same thing as --generate-confi...	Mark Haines	2015-08-12	1	-45/+36
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #216 from matrix-org/auth	Daniel Wagner-Hall	2015-08-12	2	-16/+21
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	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
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary...	Erik Johnston	2015-08-12	4	-13/+18
\| \| \| \| \| \|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #182 from matrix-org/manu/fix_no_rate_limit_in_federation_...	Mark Haines	2015-08-12	2	-10/+13
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	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	Daniel Wagner-Hall	2015-08-11	1	-2/+2
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Use TypeError instead of ValueError and give a nicer error mesasge	Mark Haines	2015-08-10	1	-1/+3
\| \| \| \| * \| \| \| \| \|	Wire up the dictionarycache to the metrics	Erik Johnston	2015-08-12	3	-45/+41
\| \| \| \| * \| \| \| \| \|	Move all the caches into their own package, synapse.util.caches	Erik Johnston	2015-08-11	23	-352/+408
\| \| \| \| * \| \| \| \| \|	Comments	Erik Johnston	2015-08-11	2	-3/+13
\| \| \| \| * \| \| \| \| \|	Comment	Erik Johnston	2015-08-11	1	-0/+2
\| \| \| \| * \| \| \| \| \|	Docs	Erik Johnston	2015-08-11	1	-0/+9
\| \| \| \| * \| \| \| \| \|	Remove debug loggers	Erik Johnston	2015-08-11	2	-6/+0
\| \| \| \| * \| \| \| \| \|	Fix application of ACLs	Erik Johnston	2015-08-11	4	-17/+33
\| \| \| \| * \| \| \| \| \|	Fix state cache	Erik Johnston	2015-08-11	1	-36/+49
\| \| \| \| * \| \| \| \| \|	Clean up StateStore	Erik Johnston	2015-08-10	1	-62/+11
\| \| \| \| * \| \| \| \| \|	Remove unused function	Erik Johnston	2015-08-10	1	-7/+0
\| \| \| \| * \| \| \| \| \|	Comments	Erik Johnston	2015-08-10	1	-0/+6
\| \| \| \| * \| \| \| \| \|	Comments	Erik Johnston	2015-08-10	1	-0/+3
\| \| \| \| * \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary...	Erik Johnston	2015-08-10	0	-0/+0
\| \| \| \| \|\ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #215 from matrix-org/erikj/cache_varargs_interface	Erik Johnston	2015-08-10	12	-72/+73
\|\ \ \ \ \ \ \ \ \ \
\| \| \| \| \| * \ \ \ \ \	Merge branch 'erikj/cache_varargs_interface' of github.com:matrix-org/synapse...	Erik Johnston	2015-08-10	1	-5/+5
\| \| \| \| \| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Rename keyargs to args in CacheDescriptor	Erik Johnston	2015-08-10	1	-5/+5
\| \| \| \| \| * \| \| \| \| \|	Merge branch 'erikj/cache_varargs_interface' of github.com:matrix-org/synapse...	Erik Johnston	2015-08-10	1	-9/+9
\| \| \| \| \| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Rename keyargs to args in Cache	Erik Johnston	2015-08-10	1	-9/+9
\| \| \| \| \| * \| \| \| \| \|	Do bounds check	Erik Johnston	2015-08-10	1	-1/+4
\| \| \| \| \| * \| \| \| \| \|	Line length	Erik Johnston	2015-08-10	1	-1/+2
\| \| \| \| \| * \| \| \| \| \|	Merge branch 'erikj/cache_varargs_interface' of github.com:matrix-org/synapse...	Erik Johnston	2015-08-07	1	-1/+0
\| \| \| \| \| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into er...	Erik Johnston	2015-08-07	1	-3/+3
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into er...	Erik Johnston	2015-08-07	1	-3/+4
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary cache	Erik Johnston	2015-08-07	1	-2/+1
\| * \| \| \| \| \| \| \| \| \| \| \|	Change Cache to not use *args in its interface	Erik Johnston	2015-08-07	11	-67/+69
\| \| \| \| \| \| \| * \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary...	Erik Johnston	2015-08-07	5	-4/+27
\| \| \| \| \| \| \| \|\ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #212 from matrix-org/erikj/cache_deferreds	Erik Johnston	2015-08-07	3	-19/+47
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	s/observed/observer/	Erik Johnston	2015-08-07	1	-3/+3
\| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Propogate stale cache errors to calling functions	Erik Johnston	2015-08-07	1	-3/+4
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #213 from matrix-org/paul/SYN-420	Paul Evans	2015-08-07	4	-1/+23
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Don't complain about extra .pyc files we find while hunting for database schemas	Paul "LeoNerd" Evans	2015-08-07	1	-0/+5
\| * \| \| \| \| \| \| \| \| \| \|	Add a --generate-keys option	Paul "LeoNerd" Evans	2015-08-07	1	-0/+9
\| * \| \| \| \| \| \| \| \| \| \|	Only print the pidfile path on startup if requested by a commandline flag	Paul "LeoNerd" Evans	2015-08-07	2	-1/+9
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #209 from matrix-org/erikj/cached_keyword_args	Erik Johnston	2015-08-06	6	-23/+45
\|\ \ \ \ \ \ \ \ \ \ \
\| \| \| \| \| \| * \| \| \| \| \|	Batch up various DB requests for event -> state	Erik Johnston	2015-08-07	1	-77/+142
\| \| \| \| \| \| * \| \| \| \| \|	Implement a CacheListDescriptor	Erik Johnston	2015-08-07	1	-0/+106
\| \| \| \| \| \| * \| \| \| \| \|	Don't be too enthusiatic with defer.gatherResults	Erik Johnston	2015-08-07	1	-4/+8
\| \| \| \| \| \| * \| \| \| \| \|	Cache get_recent_events_for_room	Erik Johnston	2015-08-07	1	-2/+2
\| \| \| \| \| \| * \| \| \| \| \|	Remove unncessary cache	Erik Johnston	2015-08-07	1	-1/+0
\| \| \| \| \| \| * \| \| \| \| \|	Change Cache to not use *args in its interface	Erik Johnston	2015-08-07	11	-87/+73
\| \| \| \| \| \| * \| \| \| \| \|	Store absence of state in cache	Erik Johnston	2015-08-07	1	-6/+16
\| \| \| \| \| \| * \| \| \| \| \|	Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cache	Erik Johnston	2015-08-06	1	-3/+27
\| \| \| \| \| \| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Docs	Erik Johnston	2015-08-06	1	-0/+3
\| \| * \| \| \| \| \| \| \| \| \|	Remove failed deferreds from cache	Erik Johnston	2015-08-06	1	-1/+7
\| \| * \| \| \| \| \| \| \| \| \|	Re-implement DEBUG_CACHES flag	Erik Johnston	2015-08-06	1	-2/+17
\| \| \| \| \| \| * \| \| \| \| \|	Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cache	Erik Johnston	2015-08-06	3	-19/+22
\| \| \| \| \| \| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferreds	Erik Johnston	2015-08-06	8	-140/+305
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cached_key...	Erik Johnston	2015-08-06	8	-140/+305
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Make @cached cache deferreds rather than the deferreds' values	Erik Johnston	2015-08-06	3	-19/+22
\| \|/ / / / / / / / / /
\| \| \| \| \| * \| \| \| \| \|	Merge branch 'erikj/cached_keyword_args' of github.com:matrix-org/synapse int...	Erik Johnston	2015-08-05	6	-23/+45
\| \| \| \| \| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add support for using keyword arguments with cached functions	Erik Johnston	2015-07-27	6	-23/+45
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary...	Erik Johnston	2015-08-05	2	-5/+5
\| \| \| \| \| \|\ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Up the cache size for 'get_joined_hosts_for_room' and 'get_users_in_room'	Erik Johnston	2015-08-05	1	-2/+2
* \| \| \| \| \| \| \| \| \|	Use LRU cache by default	Erik Johnston	2015-08-05	1	-3/+3
\| \| \| \| \| * \| \| \| \|	Use dictionary cache to do group -> state fetching	Erik Johnston	2015-08-05	7	-110/+195
\| \| \| \| \| * \| \| \| \|	Move DictionaryCache	Erik Johnston	2015-08-04	2	-1/+1
\| \| \| \| \| * \| \| \| \|	Add basic dictionary cache	Erik Johnston	2015-08-04	2	-0/+195
\| \| \| \| \| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/acl_perf	Erik Johnston	2015-08-04	2	-2/+3
\| \| \| \| \| \|\ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \|	Add comment	Erik Johnston	2015-08-04	1	-0/+15
\| \| \| \| \| * \| \| \| \|	Speed up event filtering (for ACL) logic	Erik Johnston	2015-08-04	5	-43/+102
\| \| \| \| \| \| \| \| * \|	Allow sign in using email address	David Baker	2015-08-04	1	-5/+12
\| \| \| \| \| \| \| \|/ /