Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							04df714259 
							
						 
					 
					
						
						
							
							fix imports  
						
						
						
						
					 
					
						2018-08-09 17:41:52 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							09cf130898 
							
						 
					 
					
						
						
							
							only block on sync where user is not part of the mau cohort  
						
						
						
						
					 
					
						2018-08-09 17:39:12 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							3e19beb941 
							
						 
					 
					
						
						
							
							Fix tests  
						
						
						
						
					 
					
						2018-08-09 14:58:49 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							69ce057ea6 
							
						 
					 
					
						
						
							
							block sync if auth checks fail  
						
						
						
						
					 
					
						2018-08-09 12:26:27 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							3dce9050cf 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_block  
						
						
						
						
					 
					
						2018-08-09 11:42:02 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0ad98e38d0 
							
						 
					 
					
						
						
							
							Merge pull request  #3655  from matrix-org/neilj/disable_hs  
						
						... 
						
						
						
						Flag to disable HS without disabling federation 
						
						
					 
					
						2018-08-09 10:41:43 +00:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							a5ef110749 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_block  
						
						
						
						
					 
					
						2018-08-09 11:40:37 +01:00 
						 
				 
			
				
					
						
							
							
								Amber Brown 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2511f3f8a0 
							
						 
					 
					
						
						
							
							Test fixes for Python 3 ( #3647 )  
						
						
						
						
					 
					
						2018-08-09 12:22:01 +10:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							e92fb00f32 
							
						 
					 
					
						
						
							
							sync auth blocking  
						
						
						
						
					 
					
						2018-08-08 17:54:49 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5298d79fb5 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into neilj/disable_hs  
						
						
						
						
					 
					
						2018-08-08 16:13:03 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8521ae13e3 
							
						 
					 
					
						
						
							
							Merge pull request  #3654  from matrix-org/rav/room_versions  
						
						... 
						
						
						
						Support for room versioning 
						
						
					 
					
						2018-08-08 17:10:53 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d2f3ef98ac 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into neilj/disable_hs  
						
						
						
						
					 
					
						2018-08-08 15:55:47 +00:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							7f3d897e7a 
							
						 
					 
					
						
						
							
							mock config.max_mau_value  
						
						
						
						
					 
					
						2018-08-08 11:46:23 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							e8eba2b4e3 
							
						 
					 
					
						
						
							
							implement reserved users for mau limits  
						
						
						
						
					 
					
						2018-08-07 17:49:43 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							fbe255f9a4 
							
						 
					 
					
						
						
							
							add default mau_limits_reserved_threepids  
						
						
						
						
					 
					
						2018-08-06 23:24:54 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							42c6823827 
							
						 
					 
					
						
						
							
							disable HS from config  
						
						
						
						
					 
					
						2018-08-04 22:07:04 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							d08296f9f2 
							
						 
					 
					
						
						
							
							remove unused import  
						
						
						
						
					 
					
						2018-08-03 23:00:16 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							886be75ad1 
							
						 
					 
					
						
						
							
							bug fixes  
						
						
						
						
					 
					
						2018-08-03 22:29:03 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							e10830e976 
							
						 
					 
					
						
						
							
							wip commit - tests failing  
						
						
						
						
					 
					
						2018-08-03 17:55:50 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							0ca459ea33 
							
						 
					 
					
						
						
							
							Basic support for room versioning  
						
						... 
						
						
						
						This is the first tranche of support for room versioning. It includes:
 * setting the default room version in the config file
 * new room_version param on the createRoom API
 * storing the version of newly-created rooms in the m.room.create event
 * fishing the version of existing rooms out of the m.room.create event 
						
						
					 
					
						2018-08-03 16:08:32 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							5593ff6773 
							
						 
					 
					
						
						
							
							fix (lots of) py3 test failures  
						
						
						
						
					 
					
						2018-08-03 14:59:17 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							b2aab04d2c 
							
						 
					 
					
						
						
							
							fix py3 test failure  
						
						
						
						
					 
					
						2018-08-03 14:12:56 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							950807d93a 
							
						 
					 
					
						
						
							
							fix caching and tests  
						
						
						
						
					 
					
						2018-08-03 13:49:53 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							74b1d46ad9 
							
						 
					 
					
						
						
							
							do mau checks based on monthly_active_users table  
						
						
						
						
					 
					
						2018-08-02 16:57:35 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							9180061b49 
							
						 
					 
					
						
						
							
							remove unused count_monthly_users  
						
						
						
						
					 
					
						2018-08-02 15:55:29 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							c4ffbecb68 
							
						 
					 
					
						
						
							
							fix test, update constructor call  
						
						
						
						
					 
					
						2018-08-02 13:51:05 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							00f99f74b1 
							
						 
					 
					
						
						
							
							insertion into monthly_active_users  
						
						
						
						
					 
					
						2018-08-02 13:47:19 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							165e067033 
							
						 
					 
					
						
						
							
							Revert "change monthly_active_users table to be a single column"  
						
						... 
						
						
						
						This reverts commit ec716a35b219d147dee51733b55573952799a549. 
						
						
					 
					
						2018-08-02 10:59:58 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							ec716a35b2 
							
						 
					 
					
						
						
							
							change monthly_active_users table to be a single column  
						
						
						
						
					 
					
						2018-08-01 17:54:37 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							d766f26de9 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker  
						
						
						
						
					 
					
						2018-08-01 17:49:41 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							085435e13a 
							
						 
					 
					
						
						
							
							Merge pull request  #3630  from matrix-org/neilj/mau_sign_in_log_in_limits  
						
						... 
						
						
						
						Initial impl of capping MAU 
						
						
					 
					
						2018-08-01 15:58:45 +00:00 
						 
				 
			
				
					
						
							
							
								Amber Brown 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							da7785147d 
							
						 
					 
					
						
						
							
							Python 3: Convert some unicode/bytes uses ( #3569 )  
						
						
						
						
					 
					
						2018-08-02 00:54:06 +10:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							c480c4c962 
							
						 
					 
					
						
						
							
							fix isort  
						
						
						
						
					 
					
						2018-08-01 14:25:58 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							6eed16d8a2 
							
						 
					 
					
						
						
							
							fix test for py3  
						
						
						
						
					 
					
						2018-08-01 14:02:10 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							303f1c851f 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_in_log_in_limits  
						
						
						
						
					 
					
						2018-08-01 13:42:50 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							4e6e00152c 
							
						 
					 
					
						
						
							
							fix known broken test  
						
						
						
						
					 
					
						2018-08-01 11:48:37 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cab782c17e 
							
						 
					 
					
						
						
							
							Merge pull request  #3384  from matrix-org/rav/rewrite_cachedlist_decorator  
						
						... 
						
						
						
						Rewrite cache list decorator 
						
						
					 
					
						2018-08-01 10:28:56 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							7931393495 
							
						 
					 
					
						
						
							
							make count_monthly_users async synapse/handlers/auth.py  
						
						
						
						
					 
					
						2018-08-01 10:21:56 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							6ef983ce5c 
							
						 
					 
					
						
						
							
							api into monthly_active_users table  
						
						
						
						
					 
					
						2018-07-31 16:36:24 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							df2235e7fa 
							
						 
					 
					
						
						
							
							coding style  
						
						
						
						
					 
					
						2018-07-31 13:16:20 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							7d05406a07 
							
						 
					 
					
						
						
							
							fix user_ips counting  
						
						
						
						
					 
					
						2018-07-31 12:03:23 +01:00 
						 
				 
			
				
					
						
							
							
								Travis Ralston 
							
						 
					 
					
						
						
						
						
							
						
						
							e908b86832 
							
						 
					 
					
						
						
							
							Remove pdu_failures from transactions  
						
						... 
						
						
						
						The field is never read from, and all the opportunities given to populate it are not utilized. It should be very safe to remove this. 
						
						
					 
					
						2018-07-30 16:28:47 -06:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							cefac79c10 
							
						 
					 
					
						
						
							
							monthly_active_tests  
						
						
						
						
					 
					
						2018-07-30 22:08:09 +01:00 
						 
				 
			
				
					
						
							
							
								Neil Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							251e6c1210 
							
						 
					 
					
						
						
							
							limit register and sign in on number of monthly users  
						
						
						
						
					 
					
						2018-07-30 15:55:57 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							a8cbce0ced 
							
						 
					 
					
						
						
							
							fix invalidation  
						
						
						
						
					 
					
						2018-07-27 16:17:17 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							f102c05856 
							
						 
					 
					
						
						
							
							Rewrite cache list decorator  
						
						... 
						
						
						
						Because it was complicated and annoyed me. I suspect this will be more
efficient too. 
						
						
					 
					
						2018-07-27 13:47:04 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7041cd872b 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into send_sni_for_federation_requests  
						
						
						
						
					 
					
						2018-07-27 09:17:11 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							2565804030 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into matthew/filter_members  
						
						
						
						
					 
					
						2018-07-25 17:27:49 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							0620d27f4d 
							
						 
					 
					
						
						
							
							flake8  
						
						
						
						
					 
					
						2018-07-25 17:21:17 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							0a7ee0ab8b 
							
						 
					 
					
						
						
							
							add tests for _get_some_state_from_cache  
						
						
						
						
					 
					
						2018-07-25 16:33:52 +01:00