Erik Johnston
							
						 
						
							 
							
							
							
								
							
								22716774d5 
								
							
								 
							
						 
						
							
							
								
								Don't about JSON when warning about content tampering  
							
							 
							
							
							
						 
						
							2015-06-02 16:30:52 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5044e6c544 
								
							
								 
							
						 
						
							
							
								
								Thumbnail images on a seperate thread  
							
							 
							
							
							
						 
						
							2015-06-02 15:39:08 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								09e23334de 
								
							
								 
							
						 
						
							
							
								
								Add a timeout  
							
							 
							
							
							
						 
						
							2015-06-02 11:00:37 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								02410e9239 
								
							
								 
							
						 
						
							
							
								
								Handle the fact we might be missing auth events  
							
							 
							
							
							
						 
						
							2015-06-02 10:58:35 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e552b78d50 
								
							
								 
							
						 
						
							
							
								
								Add some logging  
							
							 
							
							
							
						 
						
							2015-06-02 10:28:14 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fde0da6f19 
								
							
								 
							
						 
						
							
							
								
								Correctly look up auth_events  
							
							 
							
							
							
						 
						
							2015-06-02 10:19:38 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3f04a08a0c 
								
							
								 
							
						 
						
							
							
								
								Don't process events we've already processed. Remember to process state events  
							
							 
							
							
							
						 
						
							2015-06-02 10:11:32 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4bbfbf898e 
								
							
								 
							
						 
						
							
							
								
								Correctly pass in auth_events  
							
							 
							
							
							
						 
						
							2015-06-01 17:02:23 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6e17463228 
								
							
								 
							
						 
						
							
							
								
								Don't explode if we don't have the event  
							
							 
							
							
							
						 
						
							2015-06-01 16:39:43 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								522f285f9b 
								
							
								 
							
						 
						
							
							
								
								Add config option to disable compression of http responses  
							
							 
							
							
							
						 
						
							2015-06-01 13:36:30 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b579a8ea18 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #172  from intelfx/contrib-systemd  
							
							 
							
							... 
							
							
							
							contrib/systemd: log_config.yaml: do not disable existing loggers 
							
						 
						
							2015-05-31 20:53:45 +01:00  
						
					 
				
					
						
							
							
								 
								Ivan Shapovalov
							
						 
						
							 
							
							
							
								
							
								53ef3a0bfe 
								
							
								 
							
						 
						
							
							
								
								contrib/systemd: log_config.yaml: do not disable existing loggers  
							
							 
							
							... 
							
							
							
							It turned out that merely configuring the root logger is not enough for
"catch-all" semantics. The logging subsystem also needs to be told not
to disable existing loggers (so that their messages will get propagated
to handlers up the logging hierarchy, not just silently discarded).
Signed-off-by: Ivan Shapovalov <intelfx100@gmail.com> 
							
						 
						
							2015-05-31 19:25:21 +03:00  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
							
								
							
								6d1dea337b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'release-v0.9.1' of github.com:matrix-org/synapse  
							
							 
							
							
							
						 
						
							2015-05-26 16:03:32 +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