2c1fbea531 
								
							
								 
							
						 
						
							
							
								
								Fix up logcontexts  
							
							
							
						 
						
							2016-02-08 14:26:45 +00:00  
				
					
						
							
							
								 
						
							
							
								9cd80a7b5c 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							
							
						 
						
							2016-02-03 11:52:57 +00:00  
				
					
						
							
							
								 
						
							
							
								772b45c745 
								
							
								 
							
						 
						
							
							
								
								Remove unused method  
							
							
							
						 
						
							2016-02-03 11:43:26 +00:00  
				
					
						
							
							
								 
						
							
							
								6f52e90065 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_room_fix  
							
							
							
						 
						
							2016-02-03 11:06:29 +00:00  
				
					
						
							
							
								 
						
							
							
								d83d004ccd 
								
							
								 
							
						 
						
							
							
								
								Fix flake8 warnings for new flake8  
							
							
							
						 
						
							2016-02-02 17:18:50 +00:00  
				
					
						
							
							
								 
						
							
							
								8a391e33ae 
								
							
								 
							
						 
						
							
							
								
								s/get_room_changes_for_user/get_membership_changes_for_user/  
							
							
							
						 
						
							2016-02-02 16:12:10 +00:00  
				
					
						
							
							
								 
						
							
							
								65e92eca49 
								
							
								 
							
						 
						
							
							
								
								Change the way we do public room list fetching  
							
							
							
						 
						
							2016-02-02 15:21:10 +00:00  
				
					
						
							
							
								 
						
							
							
								b023995538 
								
							
								 
							
						 
						
							
							
								
								WARN if we get a topo token instead of stream.  
							
							
							
						 
						
							2016-02-02 14:11:14 +00:00  
				
					
						
							
							
								 
						
							
							
								89b40b225c 
								
							
								 
							
						 
						
							
							
								
								Order things correctly  
							
							
							
						 
						
							2016-02-01 16:32:46 +00:00  
				
					
						
							
							
								 
						
							
							
								4bf448be25 
								
							
								 
							
						 
						
							
							
								
								Switch over /events to use per room caches  
							
							
							
						 
						
							2016-02-01 16:26:51 +00:00  
				
					
						
							
							
								 
						
							
							
								da417aa56d 
								
							
								 
							
						 
						
							
							
								
								Allow non-guests to peek on rooms using /events  
							
							
							
						 
						
							2016-01-20 15:34:07 +00:00  
				
					
						
							
							
								 
						
							
							
								ac5a4477ad 
								
							
								 
							
						 
						
							
							
								
								Require unbanning before other membership changes  
							
							
							
						 
						
							2016-01-15 16:27:26 +00:00  
				
					
						
							
							
								 
						
							
							
								b5ce4f0427 
								
							
								 
							
						 
						
							
							
								
								Remove unused parameters  
							
							
							
						 
						
							2016-01-15 13:54:03 +00:00  
				
					
						
							
							
								 
						
							
							
								2978053d16 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'release-v0.12.1' into develop  
							
							
							
						 
						
							2016-01-14 15:04:08 +00:00  
				
					
						
							
							
								 
						
							
							
								49f33f6438 
								
							
								 
							
						 
						
							
							
								
								Add 'event' result to 'context' endpoint  
							
							... 
							
							
							
							... because the context isn't much use without the event. 
							
						 
						
							2016-01-13 16:42:14 +00:00  
				
					
						
							
							
								 
						
							
							
								93afb40cd4 
								
							
								 
							
						 
						
							
							
								
								Skip, rather than erroring, invalid guest requests  
							
							... 
							
							
							
							Erroring causes problems when people make illegal requests, because they
don't know what limit parameter they should pass.
This is definitely buggy. It leaks message counts for rooms people don't
have permission to see, via tokens. But apparently we already
consciously decided to allow that as a team, so this preserves that
behaviour. 
							
						 
						
							2016-01-13 16:41:42 +00:00  
				
					
						
							
							
								 
						
							
							
								2ef6de928d 
								
							
								 
							
						 
						
							
							
								
								Skip, rather than erroring, invalid guest requests  
							
							... 
							
							
							
							Erroring causes problems when people make illegal requests, because they
don't know what limit parameter they should pass.
This is definitely buggy. It leaks message counts for rooms people don't
have permission to see, via tokens. But apparently we already
consciously decided to allow that as a team, so this preserves that
behaviour. 
							
						 
						
							2016-01-05 18:12:37 +00:00  
				
					
						
							
							
								 
						
							
							
								cfd07aafff 
								
							
								 
							
						 
						
							
							
								
								Allow guests to upgrade their accounts  
							
							
							
						 
						
							2016-01-05 18:01:18 +00:00  
				
					
						
							
							
								 
						
							
							
								c3ea36304b 
								
							
								 
							
						 
						
							
							
								
								Use named args  
							
							
							
						 
						
							2016-01-05 12:57:45 +00:00  
				
					
						
							
							
								 
						
							
							
								1b5642604b 
								
							
								 
							
						 
						
							
							
								
								Support inviting 3pids in /createRoom  
							
							
							
						 
						
							2016-01-05 11:56:21 +00:00  
				
					
						
							
							
								 
						
							
							
								7f3148865c 
								
							
								 
							
						 
						
							
							
								
								Return room avatar URLs in /publicRooms  
							
							... 
							
							
							
							Spec: https://github.com/matrix-org/matrix-doc/pull/244 
Tests: https://github.com/matrix-org/sytest/pull/121  
							
						 
						
							2015-12-21 19:38:04 +00:00  
				
					
						
							
							
								 
						
							
							
								0311612ce9 
								
							
								 
							
						 
						
							
							
								
								Give the IS a bunch more 3pid invite context  
							
							... 
							
							
							
							This allows it to form richer emails 
							
						 
						
							2015-12-16 13:05:32 +00:00  
				
					
						
							
							
								 
						
							
							
								7d6b313312 
								
							
								 
							
						 
						
							
							
								
								Add caches for whether a room has been forgotten by a user  
							
							
							
						 
						
							2015-12-10 17:49:34 +00:00  
				
					
						
							
							
								 
						
							
							
								c30cdb0d68 
								
							
								 
							
						 
						
							
							
								
								Add comments  
							
							
							
						 
						
							2015-12-02 10:49:35 +00:00  
				
					
						
							
							
								 
						
							
							
								2a0ec3b89d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into markjh/edu_frequency  
							
							... 
							
							
							
							Conflicts:
	synapse/handlers/federation.py
	synapse/handlers/room.py 
							
						 
						
							2015-12-02 10:40:22 +00:00  
				
					
						
							
							
								 
						
							
							
								a9526831a4 
								
							
								 
							
						 
						
							
							
								
								Wrap calls to distributor.fire in appropriately named functions so that static analysis can work out want is calling what  
							
							
							
						 
						
							2015-12-01 20:53:04 +00:00  
				
					
						
							
							
								 
						
							
							
								3d3da2b460 
								
							
								 
							
						 
						
							
							
								
								Only fire user_joined_room on the distributor if the user has actually joined the room  
							
							
							
						 
						
							2015-12-01 16:03:08 +00:00  
				
					
						
							
							
								 
						
							
							
								ba26eb3d5d 
								
							
								 
							
						 
						
							
							
								
								Allow users to forget rooms  
							
							
							
						 
						
							2015-11-17 17:17:30 -05:00  
				
					
						
							
							
								 
						
							
							
								c0b3554401 
								
							
								 
							
						 
						
							
							
								
								Fix missing profile data in federation joins  
							
							... 
							
							
							
							There was a regression where we stopped including profile data in
initial joins for rooms joined over federation. 
							
						 
						
							2015-11-12 16:19:55 +00:00  
				
					
						
							
							
								 
						
							
							
								e93d550b79 
								
							
								 
							
						 
						
							
							
								
								Allow guests to access room context API  
							
							
							
						 
						
							2015-11-11 17:49:44 +00:00  
				
					
						
							
							
								 
						
							
							
								38d82edf0e 
								
							
								 
							
						 
						
							
							
								
								Allow guest users to join and message rooms  
							
							
							
						 
						
							2015-11-10 16:57:13 +00:00  
				
					
						
							
							
								 
						
							
							
								0d63dc3ec9 
								
							
								 
							
						 
						
							
							
								
								Get display name from identity server, not client  
							
							
							
						 
						
							2015-11-09 17:26:43 +00:00  
				
					
						
							
							
								 
						
							
							
								2cebe53545 
								
							
								 
							
						 
						
							
							
								
								Exchange 3pid invites for m.room.member invites  
							
							
							
						 
						
							2015-11-05 16:43:19 +00:00  
				
					
						
							
							
								 
						
							
							
								ca2f90742d 
								
							
								 
							
						 
						
							
							
								
								Open up /events to anonymous users for room events only  
							
							... 
							
							
							
							Squash-merge of PR #345  from daniel/anonymousevents 
							
						 
						
							2015-11-05 14:32:26 +00:00  
				
					
						
							
							
								 
						
							
							
								771ca56c88 
								
							
								 
							
						 
						
							
							
								
								Remove more unused parameters  
							
							
							
						 
						
							2015-11-02 15:31:57 +00:00  
				
					
						
							
							
								 
						
							
							
								56dbcd1524 
								
							
								 
							
						 
						
							
							
								
								Docs  
							
							
							
						 
						
							2015-10-28 14:05:50 +00:00  
				
					
						
							
							
								 
						
							
							
								5cb298c934 
								
							
								 
							
						 
						
							
							
								
								Add room context api  
							
							
							
						 
						
							2015-10-28 13:45:56 +00:00  
				
					
						
							
							
								 
						
							
							
								137fafce4e 
								
							
								 
							
						 
						
							
							
								
								Allow rejecting invites  
							
							... 
							
							
							
							This is done by using the same /leave flow as you would use if you had
already accepted the invite and wanted to leave. 
							
						 
						
							2015-10-20 11:58:58 +01:00  
				
					
						
							
							
								 
						
							
							
								b8dd5b1a2d 
								
							
								 
							
						 
						
							
							
								
								Verify third party ID server certificates  
							
							
							
						 
						
							2015-10-16 14:54:54 +01:00  
				
					
						
							
							
								 
						
							
							
								6ffbcf45c6 
								
							
								 
							
						 
						
							
							
								
								Use non-placeholder name for endpoint  
							
							
							
						 
						
							2015-10-15 13:12:52 +01:00  
				
					
						
							
							
								 
						
							
							
								643b5fcdc8 
								
							
								 
							
						 
						
							
							
								
								Look for keys on the right objects  
							
							
							
						 
						
							2015-10-15 13:10:30 +01:00  
				
					
						
							
							
								 
						
							
							
								14edea1aff 
								
							
								 
							
						 
						
							
							
								
								Move logic into handler  
							
							
							
						 
						
							2015-10-13 17:47:58 +01:00  
				
					
						
							
							
								 
						
							
							
								17dffef5ec 
								
							
								 
							
						 
						
							
							
								
								Move event contents into third_party_layout field  
							
							
							
						 
						
							2015-10-13 15:48:12 +01:00  
				
					
						
							
							
								 
						
							
							
								58e6a58eb7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into daniel/3pidinvites  
							
							
							
						 
						
							2015-10-05 10:33:41 -05:00  
				
					
						
							
							
								 
						
							
							
								40017a9a11 
								
							
								 
							
						 
						
							
							
								
								Add 'trusted_private_chat' to room creation presets  
							
							
							
						 
						
							2015-10-02 11:22:56 +01:00  
				
					
						
							
							
								 
						
							
							
								d5e081c7ae 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable  
							
							
							
						 
						
							2015-10-02 10:33:49 +01:00  
				
					
						
							
							
								 
						
							
							
								5b3e9713dd 
								
							
								 
							
						 
						
							
							
								
								Implement third party identifier invites  
							
							
							
						 
						
							2015-10-01 17:49:52 +01:00  
				
					
						
							
							
								 
						
							
							
								0ec78b360c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #287  from matrix-org/erikj/canonical_alias  
							
							... 
							
							
							
							Set m.room.canonical_alias on room creation. 
							
						 
						
							2015-09-30 17:14:55 +01:00  
				
					
						
							
							
								 
						
							
							
								ecd0c0dfc5 
								
							
								 
							
						 
						
							
							
								
								Remove double indentation  
							
							
							
						 
						
							2015-09-30 16:46:24 +01:00  
				
					
						
							
							
								 
						
							
							
								301141515a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #288  from matrix-org/markjh/unused_definitions  
							
							... 
							
							
							
							Remove some of the unused definitions from synapse 
							
						 
						
							2015-09-28 14:22:44 +01:00