3889 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mark Haines	d70c847b4f	Merge pull request #170 from matrix-org/markjh/SYT-8-recaptcha ... Allow endpoint for verifying recaptcha to be configured	2015-05-29 15:32:54 +01:00
Erik Johnston	d15f166093	Remove log line	2015-05-29 15:03:24 +01:00
Erik Johnston	ca580ef862	Don't copy twice	2015-05-29 15:02:55 +01:00
Erik Johnston	45bac68064	Merge pull request #169 from matrix-org/erikj/ultrajson ... Use ultrajson when possible. Add option to turn off freezing of events.	2015-05-29 14:58:56 +01:00
Mark Haines	784aaa53df	Merge branch 'develop' into markjh/SYT-8-recaptcha ... Conflicts: synapse/handlers/auth.py	2015-05-29 13:49:44 +01:00
Erik Johnston	8355b4d074	Bump syutil version	2015-05-29 13:08:43 +01:00
Erik Johnston	a7b65bdedf	Add config option to turn off freezing events. Use new encode_json api and ujson.loads	2015-05-29 12:17:33 +01:00
Mark Haines	d94590ed48	Add config for setting the recaptcha verify api endpoint, so we can test it in sytest	2015-05-29 12:11:40 +01:00
Erik Johnston	afbd3b2fc4	SYN-395: Fix CAPTCHA, don't double decode json	2015-05-28 18:05:00 +01:00
Erik Johnston	79e37a7ecb	Correctly pass connection pool parameter	2015-05-28 16:48:53 +01:00
Erik Johnston	0f118e55db	Merge pull request #168 from matrix-org/erikj/conn_pool ... Make HTTP clients use connection pools.	2015-05-28 16:03:56 +01:00
Erik Johnston	2f54522d44	Merge pull request #167 from matrix-org/erikj/deep_copy_removal ... Remove a deep copy	2015-05-28 16:00:07 +01:00
Erik Johnston	dd74436ffd	Unused import	2015-05-28 15:47:20 +01:00
Erik Johnston	11f51e6ded	Up maxPersistentPerHost count	2015-05-28 15:45:46 +01:00
Erik Johnston	086df80790	Add connection pooling to SimpleHttpClient	2015-05-28 15:43:21 +01:00
Erik Johnston	291e942332	Use connection pool for federation connections	2015-05-28 15:43:21 +01:00
Erik Johnston	31ade3b3e9	Remove a deep copy	2015-05-28 13:45:23 +01:00
Erik Johnston	36b3b75b21	Registration should be disabled by default	2015-05-28 11:01:34 +01:00
Erik Johnston	99eb1172b0	Merge branch 'release-v0.9.1' of github.com:matrix-org/synapse into develop	2015-05-26 16:02:59 +01:00
Erik Johnston	6cb3212fc2	changelog	2015-05-26 16:00:45 +01:00
Mark Haines	554c63ca60	Iterate over the user_streams not the user_ids	2015-05-26 15:03:49 +01:00
Mark Haines	fff7905409	Merge branch 'bugs/SYN-390' into release-v0.9.1	2015-05-26 14:58:49 +01:00
Mark Haines	00dd207f60	Take a dict of the rule, not the rule list	2015-05-26 14:57:48 +01:00
Erik Johnston	e417469af2	changelog	2015-05-26 11:08:46 +01:00
Erik Johnston	cb7dac3a5d	changelog	2015-05-26 11:08:09 +01:00
Erik Johnston	2651fd5e24	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.1	2015-05-26 11:05:50 +01:00
Erik Johnston	764856777c	changelog	2015-05-26 11:05:44 +01:00
Mark Haines	e7b25a649c	Merge pull request #166 from matrix-org/bugs/SYN-390 ... SYN-390: Don't modify the dictionary returned from the database here either	2015-05-26 10:40:50 +01:00
Mark Haines	804b732aab	SYN-390: Don't modify the dictionary returned from the database here either	2015-05-26 10:35:08 +01:00
Erik Johnston	45fffe8cbe	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.1	2015-05-26 10:22:41 +01:00
Erik Johnston	9ba3c1ede4	Merge pull request #165 from matrix-org/bugs/SYN-390 ... SYN-390: Don't modify the dictionary returned from the data store	2015-05-26 10:20:36 +01:00
Mark Haines	a0bebeda8b	SYN-390: Don't modify the dictionary returned from the data store	2015-05-26 10:14:15 +01:00
Erik Johnston	27e093cbc1	Bump version	2015-05-22 17:03:37 +01:00
Mark Haines	d9f60e8dc8	Merge pull request #163 from matrix-org/markjh/presence_list_cache ... Add a cache for the presence list	2015-05-22 17:02:23 +01:00
Mark Haines	0e42dfbe22	Merge pull request #164 from matrix-org/markjh/pusher_performance_2 ... Add a cache for get_push rules for user, fix cache invalidation	2015-05-22 17:01:56 +01:00
Mark Haines	5ebd33302f	Merge pull request #162 from matrix-org/erikj/backfill_fixes ... backfill fixes	2015-05-22 17:01:40 +01:00
Mark Haines	17167898c8	Fix the presence tests	2015-05-22 16:22:54 +01:00
Erik Johnston	6eadbfbea0	Remove redundant for loop	2015-05-22 16:12:20 +01:00
Mark Haines	1a9a9abcc7	Add a cache for getting the presence list for a user	2015-05-22 16:11:17 +01:00
Erik Johnston	74b7de83ec	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_fixes	2015-05-22 16:10:42 +01:00
Mark Haines	36317f3dad	Merge pull request #156 from matrix-org/erikj/join_perf ... Make joining #matrix:matrix.org over federation quicker	2015-05-22 16:09:54 +01:00
Mark Haines	052ac0c8d0	Merge pull request #159 from matrix-org/erikj/metrics_interface_config ... Enable changing the interface the metrics listener binds to	2015-05-22 16:09:33 +01:00
Mark Haines	49a2c10279	Merge pull request #157 from matrix-org/markjh/presence_performance ... Improve presence performance in loadtest	2015-05-22 16:04:40 +01:00
Mark Haines	5d53c14342	Merge pull request #160 from matrix-org/markjh/appservice_performance ... Make the appservice use 'users_in_room' rather than get_room_members …	2015-05-22 16:04:22 +01:00
Mark Haines	4752a990c8	Merge pull request #161 from matrix-org/erikj/txn_logging_fix ... Erikj/txn logging fix	2015-05-22 16:03:52 +01:00
Mark Haines	106a3051b8	Remove spurious TODO comment	2015-05-22 15:53:03 +01:00
Erik Johnston	284f55a7fb	Add doc strings	2015-05-22 15:18:04 +01:00
Erik Johnston	1ce1509989	s/metric_interface/metric_bind_host/	2015-05-22 14:51:22 +01:00
Erik Johnston	8bb85c8c5a	Update log line	2015-05-22 14:48:06 +01:00
Mark Haines	c8135f808b	Remove unused import	2015-05-22 14:45:46 +01:00