4586 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	d3d582bc1c	Remove unused import	2015-08-17 13:38:09 +01:00
Erik Johnston	4d8e1e1f9e	Remove added unused methods	2015-08-17 13:36:07 +01:00
Erik Johnston	afef6f5d16	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_take2	2015-08-17 13:23:44 +01:00
Erik Johnston	2d97e65558	Remember to invalidate caches	2015-08-17 10:46:55 +01:00
Erik Johnston	1a9510bb84	Implement a batched presence_handler.get_state and use it	2015-08-17 10:40:23 +01:00
Erik Johnston	47abebfd6d	Add batched version of store.get_presence_state	2015-08-17 09:50:50 +01:00
Erik Johnston	f9d4da7f45	Fix bug where we were leaking None into state event lists	2015-08-17 09:39:45 +01:00
Daniel Wagner-Hall	30883d8409	Merge pull request #221 from matrix-org/auth ... Simplify LoginHander and AuthHandler	2015-08-14 17:02:22 +01:00
Erik Johnston	891dfd90bd	Fix pending_calls metric to not lie	2015-08-14 15:43:11 +01:00
Erik Johnston	68b255c5a1	Batch _get_linearized_receipts_for_rooms	2015-08-14 15:06:22 +01:00
Mark Haines	95b0f5449d	Fix flake8 warning	2015-08-13 17:34:22 +01:00
Erik Johnston	129ee4e149	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_take2	2015-08-13 17:28:43 +01:00
Mark Haines	c5966b2a97	Merge remote-tracking branch 'origin/develop' into markjh/end-to-end-key-federation	2015-08-13 17:27:53 +01:00
Mark Haines	0cceb2ac92	Add a few strategic new lines to break up the on_query_client_keys and on_claim_client_keys methods in federation_server.py	2015-08-13 17:27:46 +01:00
Erik Johnston	d6bcc68ea7	Merge pull request #219 from matrix-org/erikj/dictionary_cache ... Dictionary and list caches	2015-08-13 17:27:08 +01:00
Mark Haines	b16cd18a86	Merge remote-tracking branch 'origin/develop' into erikj/generate_presice_thumbnails	2015-08-13 17:23:39 +01:00
Erik Johnston	9f7f228ec2	Remove pointless map	2015-08-13 17:20:59 +01:00
Erik Johnston	3d77e56c12	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache	2015-08-13 17:18:52 +01:00
Erik Johnston	d884047d34	Merge pull request #224 from matrix-org/erikj/reactor_metrics ... Add some metrics about the reactor	2015-08-13 17:17:07 +01:00
Erik Johnston	2bb2c02571	Remove some vertical space	2015-08-13 17:11:30 +01:00
Mark Haines	3d1cdda762	Merge branch 'develop' into erikj/reactor_metrics	2015-08-13 17:03:58 +01:00
Erik Johnston	57877b01d7	Replace list comprehension	2015-08-13 17:00:17 +01:00
Erik Johnston	5db5677969	Add metrics to the receipts cache	2015-08-13 16:58:23 +01:00
Erik Johnston	7e77a82c5f	Re-enable receipts	2015-08-13 16:58:10 +01:00
Mark Haines	7eb4d626ba	Add max-line-length to the flake8 section of setup.cfg	2015-08-13 13:12:33 +01:00
Erik Johnston	06750140f6	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache	2015-08-13 11:55:20 +01:00
Erik Johnston	adbd720fab	PEP8	2015-08-13 11:47:38 +01:00
Erik Johnston	8b7ce2945b	Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache	2015-08-13 11:42:22 +01:00
Erik Johnston	a6c27de1aa	Don't time getDelayedCalls	2015-08-13 11:41:57 +01:00
Erik Johnston	c044aca1fd	Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache	2015-08-13 11:39:38 +01:00
Erik Johnston	ba5d34a832	Add some metrics about the reactor	2015-08-13 11:38:59 +01:00
Mark Haines	6a191d62ed	Merge pull request #173 from matrix-org/markjh/twisted-15 ... Update to Twisted-15.2.1.	2015-08-12 17:28:47 +01:00
Mark Haines	21ac8be5f7	Depend on Twisted>=15.1 rather than pining to a particular version	2015-08-12 17:25:13 +01:00
Erik Johnston	3e4e367f09	Merge pull request #223 from matrix-org/markjh/enable_demo_registration ... enable registration in the demo servers	2015-08-12 17:24:16 +01:00
Erik Johnston	0fbed2a8fa	Comment	2015-08-12 17:22:54 +01:00
Mark Haines	998a72d4d9	Merge branch 'develop' into markjh/twisted-15 ... Conflicts: synapse/http/matrixfederationclient.py	2015-08-12 17:21:14 +01:00
Erik Johnston	c10ac7806e	Explain why we're prefilling dict with Nones	2015-08-12 17:16:30 +01:00
Erik Johnston	101ee3fd00	Better variable name	2015-08-12 17:08:05 +01:00
Erik Johnston	df361d08f7	Split _get_state_for_group_from_cache into two	2015-08-12 17:06:21 +01:00
Erik Johnston	7b0e797080	Fix _filter_events_for_client	2015-08-12 17:05:24 +01:00
Mark Haines	2eb91e6694	enable registration in the demo servers	2015-08-12 16:53:30 +01:00
Erik Johnston	cfa62007a3	Docstring	2015-08-12 16:42:46 +01:00
Daniel Wagner-Hall	5ce903e2f7	Merge password checking implementations	2015-08-12 16:09:19 +01:00
Erik Johnston	a7eeb34c64	Simplify staggered deferred lists	2015-08-12 16:02:05 +01:00
Erik Johnston	f7e2f981ea	Use list comprehension instead of filter	2015-08-12 16:01:10 +01:00
Daniel Wagner-Hall	bcc1d34d35	Merge branch 'develop' into auth	2015-08-12 15:58:52 +01:00
Daniel Wagner-Hall	f4122c64b5	Merge branch 'develop' of github.com:matrix-org/synapse into develop	2015-08-12 15:58:35 +01:00
Daniel Wagner-Hall	415c2f0549	Simplify LoginHander and AuthHandler ... * 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	2015-08-12 15:49:37 +01:00
David Baker	f43041aacd	Check absent before trying to access keys	2015-08-12 15:44:08 +01:00
David Baker	73605f8070	Just leaving off the $ is fine. r* == registerrrrrrrrr	2015-08-12 15:40:54 +01:00