Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							ddfcdd4778
							
						
					 | 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.0
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-19 17:15:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f0c5e5d9b
							
						
					 | 
					
						
						
							
							Merge pull request #1131 from matrix-org/matthew/e2e-notifs
						
						
						
						
						
						
						
						Notify on e2e events 
						
						
							
						
					 | 
					
						2016-09-19 10:50:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							49cf205dc7
							
						
					 | 
					
						
						
							
							_id field must uniquely identify different conditions
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-19 10:34:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							39af634dd2
							
						
					 | 
					
						
						
							
							Merge pull request #1130 from matrix-org/erikj/fix_pubroom_pag
						
						
						
						
						
						
						
						Handle fact that _generate_room_entry may not return a room entry 
						
						
							
						
					 | 
					
						2016-09-19 10:13:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
					 | 
					
						
						
						
						
							
						
						
							3f6ec271ba
							
						
					 | 
					
						
						
							
							proposal for notifying on e2e events
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-17 22:05:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d49e0bdfd
							
						
					 | 
					
						
						
							
							PEP8
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-17 18:09:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							81570abfb2
							
						
					 | 
					
						
						
							
							Handle fact that _generate_room_entry may not return a room entry
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-17 18:01:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							ddc89df89d
							
						
					 | 
					
						
						
							
							Enable guest access to POST /publicRooms
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-17 15:55:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb24aecf8c
							
						
					 | 
					
						
						
							
							Merge pull request #1129 from matrix-org/erikj/fix_pubroom_pag
						
						
						
						
						
						
						
						Fix and clean up publicRooms pagination 
						
						
							
						
					 | 
					
						2016-09-17 15:30:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							e1ba98d724
							
						
					 | 
					
						
						
							
							Merge pull request #1127 from matrix-org/dbkr/publicroom_search_case_insensitive
						
						
						
						
						
						
						
						Make public room search case insensitive 
						
						
							
						
					 | 
					
						2016-09-17 15:01:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							a298331de4
							
						
					 | 
					
						
						
							
							Spelling
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-17 14:59:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							71edaae981
							
						
					 | 
					
						
						
							
							Fix and clean up publicRooms pagination
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-17 14:46:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
					 | 
					
						
						
						
						
							
						
						
							64527f94cc
							
						
					 | 
					
						
						
							
							mention client_reader worker
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-17 14:15:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
					 | 
					
						
						
						
						
							
						
						
							883df2e983
							
						
					 | 
					
						
						
							
							fix logger for client_reader worker
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-17 14:12:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Baker
							
						 
					 | 
					
						
						
						
						
							
						
						
							5336acd46f
							
						
					 | 
					
						
						
							
							Make public room search case insensitive
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-16 19:02:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							fa9d2c7295
							
						
					 | 
					
						
						
							
							Update changelog
						
						
						
						
						
						
							
 v0.18.0-rc1
						
					 | 
					
						2016-09-16 17:44:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							19fe990476
							
						
					 | 
					
						
						
							
							Update changelog and bump version
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-16 17:30:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							995f2f032f
							
						
					 | 
					
						
						
							
							Fix public room pagination for client_reader app
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-16 14:48:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e1283c824
							
						
					 | 
					
						
						
							
							Merge pull request #1126 from matrix-org/erikj/public_room_cache
						
						
						
						
						
						
						
						Add very basic filter API to /publicRooms 
						
						
							
						
					 | 
					
						2016-09-16 13:17:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							a68807d426
							
						
					 | 
					
						
						
							
							Comment
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-16 11:36:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e67cabd7f
							
						
					 | 
					
						
						
							
							Make POST /publicRooms require auth
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-16 11:32:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							b7b62bf9ea
							
						
					 | 
					
						
						
							
							Comment
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-16 11:00:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							d84319ae10
							
						
					 | 
					
						
						
							
							Add remote reoom cache
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-16 10:31:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							23b6701a28
							
						
					 | 
					
						
						
							
							Support filtering remote room lists
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-16 10:24:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							e58a9d781c
							
						
					 | 
					
						
						
							
							Filter remote rooms lists locally
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-16 10:19:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							74d4cdee25
							
						
					 | 
					
						
						
							
							Don't cache searched in /publicRooms
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-16 09:05:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							418bcd4309
							
						
					 | 
					
						
						
							
							Add new storage function to slave store
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-16 08:37:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							098db4aa52
							
						
					 | 
					
						
						
							
							Add very basic filter API to /publicRooms
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-15 17:50:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							c33b25fd8d
							
						
					 | 
					
						
						
							
							Change the way we calculate new_limit in /publicRooms and add POST API
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-15 17:35:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							de4f798f01
							
						
					 | 
					
						
						
							
							Handling expiring stream extrems correctly.
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-15 17:34:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							ea6dc356b0
							
						
					 | 
					
						
						
							
							Merge pull request #1125 from matrix-org/erikj/public_room_cache
						
						
						
						
						
						
						
						Change get_pos_of_last_change to return upper bound 
						
						
							
						
					 | 
					
						2016-09-15 15:48:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							955f34d23e
							
						
					 | 
					
						
						
							
							Change get_pos_of_last_change to return upper bound
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-15 15:12:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							241d7d2d62
							
						
					 | 
					
						
						
							
							Merge pull request #1124 from matrix-org/erikj/enable_state_caching_workers
						
						
						
						
						
						
						
						Enable state caches on workers 
						
						
							
						
					 | 
					
						2016-09-15 15:01:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							1535f21eb5
							
						
					 | 
					
						
						
							
							Merge pull request #1123 from matrix-org/erikj/public_room_cache
						
						
						
						
						
						
						
						Use stream_change cache to make get_forward_extremeties_for_room cache more effective 
						
						
							
						
					 | 
					
						2016-09-15 14:50:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							4be85281f9
							
						
					 | 
					
						
						
							
							Enable state caches on workers
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-15 14:31:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							cb3edec6af
							
						
					 | 
					
						
						
							
							Use stream_change cache to make get_forward_extremeties_for_room cache more effective
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-15 14:28:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							923f77cff3
							
						
					 | 
					
						
						
							
							Merge pull request #1122 from matrix-org/erikj/public_room_cache
						
						
						
						
						
						
						
						Add cache to get_forward_extremeties_for_room 
						
						
							
						
					 | 
					
						2016-09-15 14:06:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							55e6fc917c
							
						
					 | 
					
						
						
							
							Add cache to get_forward_extremeties_for_room
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-15 14:04:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							68c1ed4d1a
							
						
					 | 
					
						
						
							
							Remove default public rooms limit
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-15 13:56:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							b82fa849c8
							
						
					 | 
					
						
						
							
							Merge pull request #1120 from matrix-org/erikj/push_invite_cache
						
						
						
						
						
						
						
						Ensure we don't mutate the cache of push rules 
						
						
							
						
					 | 
					
						2016-09-15 13:27:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							e457034e99
							
						
					 | 
					
						
						
							
							Merge pull request #1121 from matrix-org/erikj/public_room_paginate
						
						
						
						
						
						
						
						Add pagination support to publicRooms 
						
						
							
						
					 | 
					
						2016-09-15 13:27:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d98cf26be
							
						
					 | 
					
						
						
							
							By default limit /publicRooms to 100 entries
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-15 13:18:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							211786ecd6
							
						
					 | 
					
						
						
							
							Stream public room changes down replication
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-15 11:47:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							4fb65a1091
							
						
					 | 
					
						
						
							
							Base public room list off of public_rooms stream
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-15 11:27:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							5810cffd33
							
						
					 | 
					
						
						
							
							Pass since/from parameters over federation
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-15 10:36:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							f3eead0660
							
						
					 | 
					
						
						
							
							Allow paginating both forwards and backwards
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-15 10:15:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							4131381123
							
						
					 | 
					
						
						
							
							Remove support for aggregate room lists
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-15 09:28:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							6a5ded5988
							
						
					 | 
					
						
						
							
							Ensure we don't mutate the cache of push rules
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-15 09:16:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f181f361d
							
						
					 | 
					
						
						
							
							Accept optional token to public room list
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-15 09:08:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							c566f0ee17
							
						
					 | 
					
						
						
							
							Calculate the public room list from a stream_ordering
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-14 17:42:47 +01:00 | 
					
					
						
						
							
							
							
						
					 |