7232917f12 
								
									
								
							
								 
							
						 
						
							
							
								
								Disable frozen dicts by default ( #3987 )  
							
							
							
						 
						
							2018-10-02 22:53:47 +10:00  
				
					
						
							
							
								 
						
							
							
								6e05fd032c 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix userconsent on Python 3 ( #3938 )  
							
							
							
						 
						
							2018-10-02 00:11:58 +10:00  
				
					
						
							
							
								 
						
							
							
								1f3f5fcf52 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix client IPs being broken on Python 3 ( #3908 )  
							
							
							
						 
						
							2018-09-20 20:14:34 +10:00  
				
					
						
							
							
								 
						
							
							
								52ec6e9dfa 
								
									
								
							
								 
							
						 
						
							
							
								
								Port tests/ to Python 3 ( #3808 )  
							
							
							
						 
						
							2018-09-07 02:58:18 +10:00  
				
					
						
							
							
								 
						
							
							
								c5440b2ca0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3800  from matrix-org/neilj/remove-guests-from-mau-count  
							
							... 
							
							
							
							guest users should not be part of mau total 
							
						 
						
							2018-09-06 17:45:55 +01:00  
				
					
						
							
							
								 
						
							
							
								84a750e0c3 
								
							
								 
							
						 
						
							
							
								
								ensure guests never enter mau list  
							
							
							
						 
						
							2018-09-06 17:22:53 +01:00  
				
					
						
							
							
								 
						
							
							
								4f8baab0c4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into develop  
							
							
							
						 
						
							2018-09-06 13:05:22 +01:00  
				
					
						
							
							
								 
						
							
							
								c127c8d042 
								
							
								 
							
						 
						
							
							
								
								Fix origin handling for pushed transactions  
							
							... 
							
							
							
							Use the actual origin for push transactions, rather than whatever the remote
server claimed. 
							
						 
						
							2018-09-05 13:08:07 +01:00  
				
					
						
							
							
								 
						
							
							
								77055dba92 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix tests on postgresql ( #3740 )  
							
							
							
						 
						
							2018-09-04 02:21:48 +10:00  
				
					
						
							
							
								 
						
							
							
								0b01281e77 
								
							
								 
							
						 
						
							
							
								
								move threepid checker to config, add missing yields  
							
							
							
						 
						
							2018-08-31 17:11:11 +01:00  
				
					
						
							
							
								 
						
							
							
								14e4d4f4bf 
								
									
								
							
								 
							
						 
						
							
							
								
								Port storage/ to Python 3 ( #3725 )  
							
							
							
						 
						
							2018-08-31 00:19:58 +10:00  
				
					
						
							
							
								 
						
							
							
								414fa36f3e 
								
							
								 
							
						 
						
							
							
								
								Fix up tests  
							
							
							
						 
						
							2018-08-28 17:21:05 +01:00  
				
					
						
							
							
								 
						
							
							
								05077e06fa 
								
							
								 
							
						 
						
							
							
								
								Change admin_uri to admin_contact in config and errors  
							
							
							
						 
						
							2018-08-24 16:51:27 +01:00  
				
					
						
							
							
								 
						
							
							
								4d664278af 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_state_handler  
							
							
							
						 
						
							2018-08-20 14:49:43 +01:00  
				
					
						
							
							
								 
						
							
							
								c334ca67bb 
								
									
								
							
								 
							
						 
						
							
							
								
								Integrate presence from hotfixes ( #3694 )  
							
							
							
						 
						
							2018-08-18 01:08:45 +10:00  
				
					
						
							
							
								 
						
							
							
								13ad9930c8 
								
							
								 
							
						 
						
							
							
								
								add new error type ResourceLimit  
							
							
							
						 
						
							2018-08-16 18:02:02 +01:00  
				
					
						
							
							
								 
						
							
							
								ab035bdeac 
								
							
								 
							
						 
						
							
							
								
								replace admin_email with admin_uri for greater flexibility  
							
							
							
						 
						
							2018-08-15 10:16:41 +01:00  
				
					
						
							
							
								 
						
							
							
								f4b49152e2 
								
							
								 
							
						 
						
							
							
								
								support admin_email config and pass through into blocking errors, return AuthError in all cases  
							
							
							
						 
						
							2018-08-13 21:09:47 +01:00  
				
					
						
							
							
								 
						
							
							
								ce7de9ae6b 
								
							
								 
							
						 
						
							
							
								
								Revert "support admin_email config and pass through into blocking errors, return AuthError in all cases"  
							
							... 
							
							
							
							This reverts commit 0d43f991a1 
							
						 
						
							2018-08-13 18:06:18 +01:00  
				
					
						
							
							
								 
						
							
							
								0d43f991a1 
								
							
								 
							
						 
						
							
							
								
								support admin_email config and pass through into blocking errors, return AuthError in all cases  
							
							
							
						 
						
							2018-08-13 18:00:23 +01:00  
				
					
						
							
							
								 
						
							
							
								99dd975dae 
								
									
								
							
								 
							
						 
						
							
							
								
								Run tests under PostgreSQL ( #3423 )  
							
							
							
						 
						
							2018-08-13 16:47:46 +10:00  
				
					
						
							
							
								 
						
							
							
								8b3d9b6b19 
								
							
								 
							
						 
						
							
							
								
								Run black.  
							
							
							
						 
						
							2018-08-10 23:54:09 +10:00  
				
					
						
							
							
								 
						
							
							
								3c0213a217 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3439  from vojeroen/send_sni_for_federation_requests  
							
							... 
							
							
							
							send SNI for federation requests 
							
						 
						
							2018-08-10 12:23:54 +01:00  
				
					
						
							
							
								 
						
							
							
								3e19beb941 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2018-08-09 14:58:49 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								2511f3f8a0 
								
									
								
							
								 
							
						 
						
							
							
								
								Test fixes for Python 3 ( #3647 )  
							
							
							
						 
						
							2018-08-09 12:22:01 +10:00  
				
					
						
							
							
								 
						
							
							
								5298d79fb5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into neilj/disable_hs  
							
							
							
						 
						
							2018-08-08 16:13:03 +00:00  
				
					
						
							
							
								 
						
							
							
								8521ae13e3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3654  from matrix-org/rav/room_versions  
							
							... 
							
							
							
							Support for room versioning 
							
						 
						
							2018-08-08 17:10:53 +01:00  
				
					
						
							
							
								 
						
							
							
								d2f3ef98ac 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into neilj/disable_hs  
							
							
							
						 
						
							2018-08-08 15:55:47 +00:00  
				
					
						
							
							
								 
						
							
							
								7f3d897e7a 
								
							
								 
							
						 
						
							
							
								
								mock config.max_mau_value  
							
							
							
						 
						
							2018-08-08 11:46:23 +01:00  
				
					
						
							
							
								 
						
							
							
								fbe255f9a4 
								
							
								 
							
						 
						
							
							
								
								add default mau_limits_reserved_threepids  
							
							
							
						 
						
							2018-08-06 23:24:54 +01:00  
				
					
						
							
							
								 
						
							
							
								42c6823827 
								
							
								 
							
						 
						
							
							
								
								disable HS from config  
							
							
							
						 
						
							2018-08-04 22:07:04 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								5593ff6773 
								
							
								 
							
						 
						
							
							
								
								fix (lots of) py3 test failures  
							
							
							
						 
						
							2018-08-03 14:59:17 +01:00  
				
					
						
							
							
								 
						
							
							
								da7785147d 
								
									
								
							
								 
							
						 
						
							
							
								
								Python 3: Convert some unicode/bytes uses ( #3569 )  
							
							
							
						 
						
							2018-08-02 00:54:06 +10:00  
				
					
						
							
							
								 
						
							
							
								7041cd872b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into send_sni_for_federation_requests  
							
							
							
						 
						
							2018-07-27 09:17:11 +01:00  
				
					
						
							
							
								 
						
							
							
								e1a237eaab 
								
									
								
							
								 
							
						 
						
							
							
								
								Admin API for creating new users ( #3415 )  
							
							
							
						 
						
							2018-07-20 22:41:13 +10:00  
				
					
						
							
							
								 
						
							
							
								505530f36a 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_requests  
							
							... 
							
							
							
							# Conflicts:
#	synapse/crypto/context_factory.py 
							
						 
						
							2018-07-14 20:24:46 +02:00  
				
					
						
							
							
								 
						
							
							
								3b391d9c45 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests  
							
							
							
						 
						
							2018-07-13 16:28:04 +01:00  
				
					
						
							
							
								 
						
							
							
								49af402019 
								
							
								 
							
						 
						
							
							
								
								run isort  
							
							
							
						 
						
							2018-07-09 16:09:20 +10:00  
				
					
						
							
							
								 
						
							
							
								3d605853c8 
								
							
								 
							
						 
						
							
							
								
								send SNI for federation requests  
							
							
							
						 
						
							2018-06-24 22:38:43 +02:00  
				
					
						
							
							
								 
						
							
							
								77ac14b960 
								
									
								
							
								 
							
						 
						
							
							
								
								Pass around the reactor explicitly ( #3385 )  
							
							
							
						 
						
							2018-06-22 09:37:10 +01:00  
				
					
						
							
							
								 
						
							
							
								a5e2941aad 
								
							
								 
							
						 
						
							
							
								
								Reject attempts to send event before privacy consent is given  
							
							... 
							
							
							
							Returns an M_CONSENT_NOT_GIVEN error (cf
https://github.com/matrix-org/matrix-doc/issues/1252 ) if consent is not yet
given. 
							
						 
						
							2018-05-22 12:00:47 +01:00  
				
					
						
							
							
								 
						
							
							
								d5dca9a04f 
								
							
								 
							
						 
						
							
							
								
								Move consent config parsing into ConsentConfig  
							
							... 
							
							
							
							turns out we need to reuse this, so it's better in the config class. 
							
						 
						
							2018-05-22 11:54:51 +01:00  
				
					
						
							
							
								 
						
							
							
								9ea219c514 
								
							
								 
							
						 
						
							
							
								
								Send users a server notice about consent  
							
							... 
							
							
							
							When a user first syncs, we will send them a server notice asking them to
consent to the privacy policy if they have not already done so. 
							
						 
						
							2018-05-22 11:54:51 +01:00  
				
					
						
							
							
								 
						
							
							
								9e2601f830 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3108  from NotAFile/py3-six-urlparse  
							
							... 
							
							
							
							Use six.moves.urlparse 
							
						 
						
							2018-04-30 00:33:05 +01:00  
				
					
						
							
							
								 
						
							
							
								2a3c33ff03 
								
							
								 
							
						 
						
							
							
								
								Use six.moves.urlparse  
							
							... 
							
							
							
							The imports were shuffled around a bunch in py3
Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-04-15 21:22:43 +02:00  
				
					
						
							
							
								 
						
							
							
								cb9cdfecd0 
								
							
								 
							
						 
						
							
							
								
								Add some more variables to the unittest config  
							
							... 
							
							
							
							These worked accidentally before (python2 doesn't complain if you
compare incompatible types) but under py3 this blows up spectacularly
Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-04-15 20:36:39 +02:00  
				
					
						
							
							
								 
						
							
							
								6168351877 
								
							
								 
							
						 
						
							
							
								
								Add b prefixes to some strings that are bytes in py3  
							
							... 
							
							
							
							This has no effect on python2
Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-04-04 13:48:51 +02:00  
				
					
						
							
							
								 
						
							
							
								d1f3490e75 
								
							
								 
							
						 
						
							
							
								
								Add tests for user directory search  
							
							
							
						 
						
							2018-01-27 17:21:57 +00:00